Patch trino plugin to work with version 443

gympass · Mar 26, 2024 · da77fc1 · da77fc1
1 parent 50ad9c1
commit da77fc1
Show file tree

Hide file tree

Showing 10 changed files with 239 additions and 147 deletions.
diff --git a/agents-common/pom.xml b/agents-common/pom.xml
@@ -128,6 +128,10 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.openjdk.nashorn</groupId>
+            <artifactId>nashorn-core</artifactId>
+            <version>15.4</version>
+        </dependency>        <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
             <version>${jna.version}</version>

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/NashornScriptEngineCreator.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/NashornScriptEngineCreator.java
@@ -23,8 +23,8 @@
 import org.slf4j.LoggerFactory;
 
 import javax.script.ScriptEngine;
-import jdk.nashorn.api.scripting.ClassFilter;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.ClassFilter;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 
 public class NashornScriptEngineCreator implements ScriptEngineCreator {
     private static final Logger LOG = LoggerFactory.getLogger(NashornScriptEngineCreator.class);

diff --git a/distro/pom.xml b/distro/pom.xml
@@ -131,7 +131,6 @@
                                         <descriptor>src/main/assembly/plugin-elasticsearch.xml</descriptor>
                                         <descriptor>src/main/assembly/plugin-schema-registry.xml</descriptor>
                                         <descriptor>src/main/assembly/plugin-presto.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-trino.xml</descriptor>
                                         <descriptor>src/main/assembly/sample-client.xml</descriptor>
                                     </descriptors>
                                 </configuration>
@@ -141,6 +140,41 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>ranger-jdk21</id>
+            <activation>
+                <jdk>21</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>${assembly.plugin.version}</version>
+                        <configuration>
+                            <finalName>ranger-${project.version}</finalName>
+                            <outputDirectory>../target</outputDirectory>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <phase>package</phase>
+                                <configuration>
+                                    <skipAssembly>false</skipAssembly>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/admin-web.xml</descriptor>
+                                        <descriptor>src/main/assembly/solr_audit_conf.xml</descriptor>
+                                        <descriptor>src/main/assembly/plugin-trino.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>ranger-admin</id>
             <build>
@@ -716,6 +750,7 @@
                                         <descriptor>src/main/assembly/plugin-elasticsearch.xml</descriptor>
                                         <descriptor>src/main/assembly/plugin-schema-registry.xml</descriptor>
                                         <descriptor>src/main/assembly/plugin-presto.xml</descriptor>
+                                        <descriptor>src/main/assembly/plugin-trino.xml</descriptor>
                                     </descriptors>
                                 </configuration>
                             </execution>

diff --git a/plugin-nestedstructure/pom.xml b/plugin-nestedstructure/pom.xml
@@ -37,6 +37,11 @@
     </properties>
 
         <dependencies>
+            <dependency>
+                <groupId>org.openjdk.nashorn</groupId>
+                <artifactId>nashorn-core</artifactId>
+                <version>15.4</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.ranger</groupId>
                 <artifactId>ranger-plugins-common</artifactId>
@@ -68,11 +73,6 @@
                 <artifactId>json-path</artifactId>
                 <version>2.4.0</version>
             </dependency>
-            <dependency>
-                <groupId>org.openjdk.nashorn</groupId>
-                <artifactId>nashorn-core</artifactId>
-                <version>15.4</version>
-            </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>

diff --git a/...va/org/apache/ranger/authorization/nestedstructure/authorizer/RecordFilterJavaScript.java b/...va/org/apache/ranger/authorization/nestedstructure/authorizer/RecordFilterJavaScript.java
@@ -20,8 +20,8 @@
 
 package org.apache.ranger.authorization.nestedstructure.authorizer;
 
-import jdk.nashorn.api.scripting.ClassFilter;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.ClassFilter;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -107,4 +107,4 @@ public static boolean filterRow(String user, String filterExpr, String jsonStrin
     }
 }
 
-
+
diff --git a/plugin-trino/README.md b/plugin-trino/README.md
@@ -0,0 +1,17 @@
+The Ranger Trino plugin at this branch was patched to work with trino 433. The
+base tag used to patch the plugin was `release-ranger-2.4.0`.
+
+## How to build
+Ranger admin required PhatonJS to build properly. PhatonJS requires an older
+version of openssl to build with TLS support. Since we just need the Trino
+plugin we can disable the tls support by settings the evironment variable
+`OPENSSL_CONF` to `/dev/null`.
+
+Make sure that you are using the Java version `21.0.1` and maven `3.9.6`.
+
+```bash
+OPENSSL_CONF=/dev/null mvn clean compile package -B \
+    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+    -Dmaven.test.skip=true -Drat.skip=true -Dpmd.skip=true -Dfindbugs.skip=true \
+    -Dspotbugs.skip=true -Dcheckstyle.skip=true -P ranger-jdk21
+```