Skip to content

Commit da77fc1

Browse files
mattheusvmattheusv
committed
Patch trino plugin to work with version 443
1 parent 50ad9c1 commit da77fc1

File tree

10 files changed

+239
-147
lines changed

10 files changed

+239
-147
lines changed

‎agents-common/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@
128128
<version>${project.version}</version>
129129
</dependency>
130130
<dependency>
131+
<groupId>org.openjdk.nashorn</groupId>
132+
<artifactId>nashorn-core</artifactId>
133+
<version>15.4</version>
134+
</dependency> <dependency>
131135
<groupId>net.java.dev.jna</groupId>
132136
<artifactId>jna</artifactId>
133137
<version>${jna.version}</version>

‎agents-common/src/main/java/org/apache/ranger/plugin/util/NashornScriptEngineCreator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.slf4j.LoggerFactory;
2424

2525
import javax.script.ScriptEngine;
26-
import jdk.nashorn.api.scripting.ClassFilter;
27-
import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
26+
import org.openjdk.nashorn.api.scripting.ClassFilter;
27+
import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
2828

2929
public class NashornScriptEngineCreator implements ScriptEngineCreator {
3030
private static final Logger LOG = LoggerFactory.getLogger(NashornScriptEngineCreator.class);

‎distro/pom.xml

+36-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131
<descriptor>src/main/assembly/plugin-elasticsearch.xml</descriptor>
132132
<descriptor>src/main/assembly/plugin-schema-registry.xml</descriptor>
133133
<descriptor>src/main/assembly/plugin-presto.xml</descriptor>
134-
<descriptor>src/main/assembly/plugin-trino.xml</descriptor>
135134
<descriptor>src/main/assembly/sample-client.xml</descriptor>
136135
</descriptors>
137136
</configuration>
@@ -141,6 +140,41 @@
141140
</plugins>
142141
</build>
143142
</profile>
143+
144+
<profile>
145+
<id>ranger-jdk21</id>
146+
<activation>
147+
<jdk>21</jdk>
148+
</activation>
149+
<build>
150+
<plugins>
151+
<plugin>
152+
<artifactId>maven-assembly-plugin</artifactId>
153+
<version>${assembly.plugin.version}</version>
154+
<configuration>
155+
<finalName>ranger-${project.version}</finalName>
156+
<outputDirectory>../target</outputDirectory>
157+
</configuration>
158+
<executions>
159+
<execution>
160+
<goals>
161+
<goal>single</goal>
162+
</goals>
163+
<phase>package</phase>
164+
<configuration>
165+
<skipAssembly>false</skipAssembly>
166+
<descriptors>
167+
<descriptor>src/main/assembly/admin-web.xml</descriptor>
168+
<descriptor>src/main/assembly/solr_audit_conf.xml</descriptor>
169+
<descriptor>src/main/assembly/plugin-trino.xml</descriptor>
170+
</descriptors>
171+
</configuration>
172+
</execution>
173+
</executions>
174+
</plugin>
175+
</plugins>
176+
</build>
177+
</profile>
144178
<profile>
145179
<id>ranger-admin</id>
146180
<build>
@@ -716,6 +750,7 @@
716750
<descriptor>src/main/assembly/plugin-elasticsearch.xml</descriptor>
717751
<descriptor>src/main/assembly/plugin-schema-registry.xml</descriptor>
718752
<descriptor>src/main/assembly/plugin-presto.xml</descriptor>
753+
<descriptor>src/main/assembly/plugin-trino.xml</descriptor>
719754
</descriptors>
720755
</configuration>
721756
</execution>

‎plugin-nestedstructure/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
</properties>
3838

3939
<dependencies>
40+
<dependency>
41+
<groupId>org.openjdk.nashorn</groupId>
42+
<artifactId>nashorn-core</artifactId>
43+
<version>15.4</version>
44+
</dependency>
4045
<dependency>
4146
<groupId>org.apache.ranger</groupId>
4247
<artifactId>ranger-plugins-common</artifactId>
@@ -68,11 +73,6 @@
6873
<artifactId>json-path</artifactId>
6974
<version>2.4.0</version>
7075
</dependency>
71-
<dependency>
72-
<groupId>org.openjdk.nashorn</groupId>
73-
<artifactId>nashorn-core</artifactId>
74-
<version>15.4</version>
75-
</dependency>
7676
<dependency>
7777
<groupId>org.testng</groupId>
7878
<artifactId>testng</artifactId>

‎plugin-nestedstructure/src/main/java/org/apache/ranger/authorization/nestedstructure/authorizer/RecordFilterJavaScript.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
package org.apache.ranger.authorization.nestedstructure.authorizer;
2222

23-
import jdk.nashorn.api.scripting.ClassFilter;
24-
import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
23+
import org.openjdk.nashorn.api.scripting.ClassFilter;
24+
import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
2525
import org.slf4j.Logger;
2626
import org.slf4j.LoggerFactory;
2727

@@ -107,4 +107,4 @@ public static boolean filterRow(String user, String filterExpr, String jsonStrin
107107
}
108108
}
109109

110-
110+

‎plugin-trino/README.md

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
The Ranger Trino plugin at this branch was patched to work with trino 433. The
2+
base tag used to patch the plugin was `release-ranger-2.4.0`.
3+
4+
## How to build
5+
Ranger admin required PhatonJS to build properly. PhatonJS requires an older
6+
version of openssl to build with TLS support. Since we just need the Trino
7+
plugin we can disable the tls support by settings the evironment variable
8+
`OPENSSL_CONF` to `/dev/null`.
9+
10+
Make sure that you are using the Java version `21.0.1` and maven `3.9.6`.
11+
12+
```bash
13+
OPENSSL_CONF=/dev/null mvn clean compile package -B \
14+
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
15+
-Dmaven.test.skip=true -Drat.skip=true -Dpmd.skip=true -Dfindbugs.skip=true \
16+
-Dspotbugs.skip=true -Dcheckstyle.skip=true -P ranger-jdk21
17+
```

0 commit comments

Comments
 (0)