Use hadoop patcher for hdfs-fixture too

Author: ldematte

distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java

@@ -38,6 +38,7 @@
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.jdk.JarHell;
+import org.elasticsearch.jdk.RuntimeVersionFeature;
 import org.elasticsearch.plugin.scanner.ClassReaders;
 import org.elasticsearch.plugin.scanner.NamedComponentScanner;
 import org.elasticsearch.plugins.Platforms;
@@ -922,10 +923,12 @@ void jarHellCheck(PluginDescriptor candidateInfo, Path candidateDir, Path plugin
      */
     private PluginDescriptor installPlugin(InstallablePlugin descriptor, Path tmpRoot, List<Path> deleteOnFailure) throws Exception {
         final PluginDescriptor info = loadPluginInfo(tmpRoot);
-        PluginPolicyInfo pluginPolicy = PolicyUtil.getPluginPolicyInfo(tmpRoot, env.tmpDir());
-        if (pluginPolicy != null) {
-            Set<String> permissions = PluginSecurity.getPermissionDescriptions(pluginPolicy, env.tmpDir());
-            PluginSecurity.confirmPolicyExceptions(terminal, permissions, batch);
+        if (RuntimeVersionFeature.isSecurityManagerAvailable()) {
+            PluginPolicyInfo pluginPolicy = PolicyUtil.getPluginPolicyInfo(tmpRoot, env.tmpDir());
+            if (pluginPolicy != null) {
+                Set<String> permissions = PluginSecurity.getPermissionDescriptions(pluginPolicy, env.tmpDir());
+                PluginSecurity.confirmPolicyExceptions(terminal, permissions, batch);
+            }
         }
 
         // Validate that the downloaded plugin's ID matches what we expect from the descriptor. The

plugins/repository-hdfs/hadoop-client-api/build.gradle

@@ -2,32 +2,26 @@ import org.gradle.api.file.ArchiveOperations
 
 apply plugin: 'elasticsearch.java'
 
-sourceSets {
-  patcher
-}
-
 configurations {
   thejar {
     canBeResolved = true
   }
+  patcher
 }
 
 dependencies {
   thejar("org.apache.hadoop:hadoop-client-api:${project.parent.versions.hadoop}") {
     transitive = false
   }
-
-  patcherImplementation 'org.ow2.asm:asm:9.7.1'
-  patcherImplementation 'org.ow2.asm:asm-tree:9.7.1'
+  patcher(project(':plugins:repository-hdfs:hadoop-common-patcher'))
 }
 
 def outputDir = layout.buildDirectory.dir("patched-classes")
 
 def patchTask = tasks.register("patchClasses", JavaExec) {
   inputs.files(configurations.thejar).withPathSensitivity(PathSensitivity.RELATIVE)
-  inputs.files(sourceSets.patcher.output).withPathSensitivity(PathSensitivity.RELATIVE)
   outputs.dir(outputDir)
-  classpath = sourceSets.patcher.runtimeClasspath
+  classpath = configurations.patcher
   mainClass = 'org.elasticsearch.hdfs.patch.HdfsClassPatcher'
   def thejar = configurations.thejar
   doFirst {

plugins/repository-hdfs/hadoop-common-patcher/build.gradle

@@ -0,0 +1,9 @@
+import org.gradle.api.file.ArchiveOperations
+
+apply plugin: 'elasticsearch.java'
+
+dependencies {
+  implementation 'org.ow2.asm:asm:9.7.1'
+  implementation 'org.ow2.asm:asm-tree:9.7.1'
+}
+

…csearch/hdfs/patch/HdfsClassPatcher.java …csearch/hdfs/patch/HdfsClassPatcher.javaplugins/repository-hdfs/hadoop-client-api/src/patcher/java/org/elasticsearch/hdfs/patch/HdfsClassPatcher.java renamed to plugins/repository-hdfs/hadoop-common-patcher/src/main/java/org/elasticsearch/hdfs/patch/HdfsClassPatcher.java plugins/repository-hdfs/hadoop-client-api/src/patcher/java/org/elasticsearch/hdfs/patch/HdfsClassPatcher.java renamed to plugins/repository-hdfs/hadoop-common-patcher/src/main/java/org/elasticsearch/hdfs/patch/HdfsClassPatcher.java

@@ -41,18 +41,17 @@ public static void main(String[] args) throws Exception {
         try (JarFile jarFile = new JarFile(new File(jarPath))) {
             for (var patcher : patchers.entrySet()) {
                 JarEntry jarEntry = jarFile.getJarEntry(patcher.getKey());
-                if (jarEntry == null) {
-                    throw new IllegalArgumentException("path [" + patcher.getKey() + "] not found in [" + jarPath + "]");
-                }
-                byte[] classToPatch = jarFile.getInputStream(jarEntry).readAllBytes();
+                if (jarEntry != null) {
+                    byte[] classToPatch = jarFile.getInputStream(jarEntry).readAllBytes();
 
-                ClassReader classReader = new ClassReader(classToPatch);
-                ClassWriter classWriter = new ClassWriter(classReader, 0);
-                classReader.accept(patcher.getValue().apply(classWriter), 0);
+                    ClassReader classReader = new ClassReader(classToPatch);
+                    ClassWriter classWriter = new ClassWriter(classReader, 0);
+                    classReader.accept(patcher.getValue().apply(classWriter), 0);
 
-                Path outputFile = outputDir.resolve(patcher.getKey());
-                Files.createDirectories(outputFile.getParent());
-                Files.write(outputFile, classWriter.toByteArray());
+                    Path outputFile = outputDir.resolve(patcher.getKey());
+                    Files.createDirectories(outputFile.getParent());
+                    Files.write(outputFile, classWriter.toByteArray());
+                }
             }
         }
     }

…search/hdfs/patch/MethodReplacement.java …search/hdfs/patch/MethodReplacement.javaplugins/repository-hdfs/hadoop-client-api/src/patcher/java/org/elasticsearch/hdfs/patch/MethodReplacement.java renamed to plugins/repository-hdfs/hadoop-common-patcher/src/main/java/org/elasticsearch/hdfs/patch/MethodReplacement.java plugins/repository-hdfs/hadoop-client-api/src/patcher/java/org/elasticsearch/hdfs/patch/MethodReplacement.java renamed to plugins/repository-hdfs/hadoop-common-patcher/src/main/java/org/elasticsearch/hdfs/patch/MethodReplacement.java

@@ -16,6 +16,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 configurations {
   hdfs2
   hdfs3
+  patcher
   consumable("shadowedHdfs2")
 }
 
@@ -85,6 +86,21 @@ dependencies {
     exclude group: "org.apache.geronimo.specs", module: "geronimo-jcache_1.0_spec"
     exclude group: "org.xerial.snappy", module: "snappy-java"
   }
+
+  patcher(project(':plugins:repository-hdfs:hadoop-common-patcher'))
+}
+
+def outputDir = layout.buildDirectory.dir("patched-classes")
+
+def patchTask = tasks.register("patchClasses", JavaExec) {
+  inputs.files(configurations.hdfs2).withPathSensitivity(PathSensitivity.RELATIVE)
+  outputs.dir(outputDir)
+  classpath = configurations.patcher
+  mainClass = 'org.elasticsearch.hdfs.patch.HdfsClassPatcher'
+  def jarToPatch = configurations.hdfs2.getFiles().find { f -> f.getName().endsWith("hadoop-common-2.8.5.jar")}
+  doFirst {
+    args(jarToPatch, outputDir.get().asFile)
+  }
 }
 
 tasks.named("shadowJar").configure {
@@ -104,6 +120,7 @@ def hdfs2Jar = tasks.register("hdfs2jar", ShadowJar) {
   }
   archiveClassifier.set("hdfs2")
   from sourceSets.main.output
+  from patchTask
   configurations.add(project.configurations.hdfs2)
 }