Alter test security policy to work with Gradle elastic#31496

alpar-t · Sep 5, 2018 · 792457a · 792457a
1 parent 7f77dea
commit 792457a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -105,8 +105,6 @@ class BuildPlugin implements Plugin<Project> {
         configureDependenciesInfo(project)
     }
 
-<<<<<<< HEAD
-=======
     static void setupSeed(Project project) {
         if (project.rootProject.ext.has('testSeed')) {
             /* Skip this if we've already pinned the testSeed. It is important
@@ -126,7 +124,6 @@ class BuildPlugin implements Plugin<Project> {
             project.ext.testSeed = testSeed
         }
     }
->>>>>>> Remove randomizedtesting plugin  #31496
 
     /** Performs checks on the build environment and prints information about the build environment. */
     static void globalBuildInfo(Project project) {
@@ -846,6 +843,8 @@ class BuildPlugin implements Plugin<Project> {
             } else {
                 systemProperty 'runtime.java', project.ext.runtimeJavaVersion.getMajorVersion()
             }
+            // TODO: equivalent for idea
+            systemProperty "gradle.user.home", project.gradle.gradleUserHomeDir
             // TODO: remove setting logging level via system property
             systemProperty 'tests.logger.level', 'WARN'
             for (Map.Entry<String, String> property : System.properties.entrySet()) {

diff --git a/server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy b/server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
@@ -86,3 +86,12 @@ grant codeBase "${codebase.httpasyncclient}" {
   // rest client uses system properties which gets the default proxy
   permission java.net.NetPermission "getProxySelector";
 };
+
+grant codeBase "file:${gradle.user.home}/-" {
+    permission java.security.AllPermission;
+};
+
+grant codeBase "file:~/.gradle/caches/-" {
+    permission java.security.AllPermission;
+};
+