Add trino v360 support

.github/workflows/semgrep.yml

@@ -0,0 +1,18 @@
+name: Security
+on:
+  pull_request: {}
+  push:
+    branches: ['ranger-2.1-rzp']
+  schedule:
+    - cron: '30 20 * * *'
+jobs:
+  security-sast:
+    uses: razorpay/security-action/.github/workflows/semgrep.yml@master
+    secrets:
+      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
+  security-statuscheck:
+    needs: [security-sast]
+    if: always()
+    uses: razorpay/security-action/.github/workflows/[email protected]
+    with:
+      WORKFLOW_RESULT: ${{ needs.security-sast.result == 'success' && needs.security-sast.result != 'cancelled' || 'false' }}

README.txt

@@ -22,6 +22,40 @@ Apache Ranger is currently NOT setup to use pull requests to take in the changes
 Please use the apache review board to submit your code changes for review and commit. https://reviews.apache.org
 Also create a jira to go along with the review and mention it in the review board review. https://issues.apache.org/jira/browse/RANGER
 
+
+
+#### For compiling ranger
+mvn compile package assembly:assembly -DskipJSTests -DskipTests -Drat.skip=true -Dmaven.artifact.threads=20 --batch-mode -Pranger-hive-plugin  
+mvn compile package assembly:assembly -DskipJSTests -DskipTests -Drat.skip=true -Dmaven.artifact.threads=20 --batch-mode -Pranger-presto-plugin  
+mvn compile package assembly:assembly -DskipJSTests -DskipTests -Drat.skip=true -Dmaven.artifact.threads=20 --batch-mode -Pranger-trino-plugin  
+-- for ranger admin compile
+mvn compile package assembly:assembly -DskipJSTests -DskipTests -Drat.skip=true -Dmaven.artifact.threads=20 --batch-mode -Pall  
+
+----NOTE: for version >=2.1.x , assembly:assembly phase is part of package and will error out if explicitly run with package  
+
+--- Note: Check `distro` module, it is responsible for creating plugin `tar.gz` it needs to run at the end of all modules. It can be configured to selectively build certain plugins.
+
+Updated Build Process
+====================
+Note:
+
+As this repo was changed from original fork to build 'ranger-<version>-trino-plugin.tar.gz' which depends on JDK11. You might encounter error in the build process for 'hive-agent' module. Ranger uses hive version 3.1.2 which still requires JDK8 while building so to avoid this error please use this instruction. You can use original build process on JDK8 to seperately build the 'ranger-<version>hive-plugin.tar.gz'.
+
+Additionally please refer this JIRA ticket 
+https://issues.apache.org/jira/browse/RANGER-3182
+
+1. Check out the code from GIT repository
+
+2. On the root folder, please execute the following Maven command:
+
+   $ mvn clean compile package assembly:assembly install -pl '!hive-agent'
+
+3. After the above build command execution, you should see the following TAR files in the target folder:
+
+
+   ranger-<version>-trino-plugin.tar.gz
+along with other plugins.
+
 Build Process
 =============
 
@@ -102,4 +136,3 @@ Installation Process
 
    If the install.sh file does not exists, 
        Execute ./enable-<component>-plugin.sh
-

agents-common/scripts/enable-agent.sh

@@ -212,7 +212,7 @@ elif [ "${HCOMPONENT_NAME}" = "kylin" ]; then
     HCOMPONENT_LIB_DIR=${HCOMPONENT_INSTALL_DIR}/tomcat/webapps/kylin/WEB-INF/lib
 elif [ "${HCOMPONENT_NAME}" = "elasticsearch" ]; then
     HCOMPONENT_LIB_DIR=${HCOMPONENT_INSTALL_DIR}/plugins
-elif [ "${HCOMPONENT_NAME}" = "presto" ]; then
+elif [ "${HCOMPONENT_NAME}" = "trino" ]; then
     HCOMPONENT_LIB_DIR=${HCOMPONENT_INSTALL_DIR}/plugin/ranger
     if [ ! -d "${HCOMPONENT_LIB_DIR}" ]; then
         echo "INFO: Creating ${HCOMPONENT_LIB_DIR}"
@@ -246,7 +246,7 @@ elif [ "${HCOMPONENT_NAME}" = "elasticsearch" ]; then
 	echo "INFO: Changing ownership of $HCOMPONENT_CONF_DIR to $CFG_OWNER_INF"
 	chown $CFG_OWNER_INF $HCOMPONENT_CONF_DIR
     fi
-elif [ "${HCOMPONENT_NAME}" = "presto" ]; then
+elif [ "${HCOMPONENT_NAME}" = "trino" ]; then
     HCOMPONENT_CONF_DIR=${HCOMPONENT_INSTALL_DIR}/etc
 fi
 
@@ -781,7 +781,7 @@ then
 	fi
 fi
 
-if [ "${HCOMPONENT_NAME}" = "presto" ]
+if [ "${HCOMPONENT_NAME}" = "trino" ]
 then
 	if [ "${action}" = "enable" ]
 	then
@@ -804,7 +804,7 @@ then
 	echo "Add or Update properties file: [${fn}] ... "
 	addOrUpdatePropertyToFile access-control.name $controlName ${fn}
 	echo "Linking config files"
-	cd ${HCOMPONENT_LIB_DIR}/ranger-presto-plugin-impl/
+	cd ${HCOMPONENT_LIB_DIR}/ranger-trino-plugin-impl/
 	ln -sf ${HCOMPONENT_CONF_DIR} conf
 fi
 

agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java

@@ -49,7 +49,7 @@ public class EmbeddedServiceDefsUtil {
 
 
 	// following servicedef list should be reviewed/updated whenever a new embedded service-def is added
-	public static final String DEFAULT_BOOTSTRAP_SERVICEDEF_LIST = "tag,hdfs,hbase,hive,kms,knox,storm,yarn,kafka,solr,atlas,nifi,nifi-registry,sqoop,kylin,elasticsearch,presto,ozone,kudu,schema-registry";
+	public static final String DEFAULT_BOOTSTRAP_SERVICEDEF_LIST = "tag,hdfs,hbase,hive,kms,knox,storm,yarn,kafka,solr,atlas,nifi,nifi-registry,sqoop,kylin,elasticsearch,trino,ozone,kudu,schema-registry";
 	private static final String PROPERTY_SUPPORTED_SERVICE_DEFS = "ranger.supportedcomponents";
 	private Set<String> supportedServiceDefs;
 	public static final String EMBEDDED_SERVICEDEF_TAG_NAME  = "tag";
@@ -71,7 +71,7 @@ public class EmbeddedServiceDefsUtil {
 	public static final String EMBEDDED_SERVICEDEF_KYLIN_NAME  = "kylin";
 	public static final String EMBEDDED_SERVICEDEF_ABFS_NAME  = "abfs";
 	public static final String EMBEDDED_SERVICEDEF_ELASTICSEARCH_NAME = "elasticsearch";
-	public static final String EMBEDDED_SERVICEDEF_PRESTO_NAME  = "presto";
+	public static final String EMBEDDED_SERVICEDEF_TRINO_NAME  = "trino";
 	public static final String EMBEDDED_SERVICEDEF_OZONE_NAME  = "ozone";
 	public static final String EMBEDDED_SERVICEDEF_KUDU_NAME  = "kudu";
 
@@ -89,7 +89,7 @@ public class EmbeddedServiceDefsUtil {
 	public static final String SCHEMA_REGISTRY_IMPL_CLASS_NAME  = "org.apache.ranger.services.schemaregistry.RangerServiceSchemaRegistry";
 	public static final String NIFI_IMPL_CLASS_NAME  = "org.apache.ranger.services.nifi.RangerServiceNiFi";
 	public static final String ATLAS_IMPL_CLASS_NAME  = "org.apache.ranger.services.atlas.RangerServiceAtlas";
-	public static final String PRESTO_IMPL_CLASS_NAME  = "org.apache.ranger.services.presto.RangerServicePresto";
+	public static final String TRINO_IMPL_CLASS_NAME  = "org.apache.ranger.services.trino.RangerServiceTrino";
 	public static final String OZONE_IMPL_CLASS_NAME  = "org.apache.ranger.services.ozone.RangerServiceOzone";
 	public static final String KUDU_IMPL_CLASS_NAME  = "org.apache.ranger.services.kudu.RangerServiceKudu";
 
@@ -114,7 +114,7 @@ public class EmbeddedServiceDefsUtil {
 	private RangerServiceDef kylinServiceDef;
 	private RangerServiceDef abfsServiceDef;
 	private RangerServiceDef elasticsearchServiceDef;
-	private RangerServiceDef prestoServiceDef;
+	private RangerServiceDef trinoServiceDef;
 	private RangerServiceDef ozoneServiceDef;
 	private RangerServiceDef kuduServiceDef;
 
@@ -164,7 +164,7 @@ public void init(ServiceStore store) {
 			kylinServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_KYLIN_NAME);
 			abfsServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_ABFS_NAME);
 			elasticsearchServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_ELASTICSEARCH_NAME);
-			prestoServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_PRESTO_NAME);
+			trinoServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_TRINO_NAME);
 			ozoneServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_OZONE_NAME);
 			kuduServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_KUDU_NAME);
 
@@ -246,7 +246,7 @@ public long getElasticsearchServiceDefId() {
 
 	public long getAbfsServiceDefId() { return getId(abfsServiceDef); }
 
-	public long getPrestoServiceDefId() { return getId(prestoServiceDef); }
+	public long getTrinoServiceDefId() { return getId(trinoServiceDef); }
 
 	public long getOzoneServiceDefId() { return getId(ozoneServiceDef); }
 

agents-common/src/main/resources/log4j.properties

@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Root logger option
+log4j.rootLogger=INFO, stdout
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{10}:%L - %m

agents-common/src/main/resources/service-defs/ranger-servicedef-presto.json → agents-common/src/main/resources/service-defs/ranger-servicedef-trino.json

@@ -1,10 +1,10 @@
 {
   "id": 17,
-  "name": "presto",
-  "displayName": "presto",
-  "implClass": "org.apache.ranger.services.presto.RangerServicePresto",
-  "label": "Presto",
-  "description": "Presto",
+  "name": "trino",
+  "displayName": "trino",
+  "implClass": "org.apache.ranger.services.trino.RangerServiceTrino",
+  "label": "Trino",
+  "description": "Trino",
   "guid": "379a9fe5-1b6e-4091-a584-4890e245e6c1",
   "resources": [
     {
@@ -26,8 +26,8 @@
       "validationRegEx": "",
       "validationMessage": "",
       "uiHint": "",
-      "label": "Presto Catalog",
-      "description": "Presto Catalog"
+      "label": "Trino Catalog",
+      "description": "Trino Catalog"
     },
     {
       "itemId": 2,
@@ -48,8 +48,8 @@
       "validationRegEx": "",
       "validationMessage": "",
       "uiHint": "",
-      "label": "Presto Schema",
-      "description": "Presto Schema"
+      "label": "Trino Schema",
+      "description": "Trino Schema"
     },
     {
       "itemId": 3,
@@ -70,8 +70,8 @@
       "validationRegEx": "",
       "validationMessage": "",
       "uiHint": "",
-      "label": "Presto Table",
-      "description": "Presto Table"
+      "label": "Trino Table",
+      "description": "Trino Table"
     },
     {
       "itemId": 4,
@@ -91,12 +91,12 @@
       "validationRegEx": "",
       "validationMessage": "",
       "uiHint": "",
-      "label": "Presto Column",
-      "description": "Presto Column"
+      "label": "Trino Column",
+      "description": "Trino Column"
     },
     {
       "itemId": 5,
-      "name": "prestouser",
+      "name": "trinouser",
       "type": "string",
       "level": 10,
       "parent": "",
@@ -112,8 +112,8 @@
       "validationRegEx": "",
       "validationMessage": "",
       "uiHint": "",
-      "label": "Presto User",
-      "description": "Presto User",
+      "label": "Trino User",
+      "description": "Trino User",
       "accessTypeRestrictions": ["impersonate"]
     },
     {
@@ -135,7 +135,7 @@
       "validationMessage": "",
       "uiHint": "",
       "label": "System Property",
-      "description": "Presto System Property",
+      "description": "Trino System Property",
       "accessTypeRestrictions": ["alter"]
     },
     {
@@ -157,7 +157,7 @@
       "validationMessage": "",
       "uiHint": "",
       "label": "Catalog Session Property",
-      "description": "Presto Catalog Session Property",
+      "description": "Trino Catalog Session Property",
       "accessTypeRestrictions": ["alter"]
     },
     {
@@ -178,8 +178,8 @@
       "validationRegEx": "",
       "validationMessage": "",
       "uiHint": "",
-      "label": "Presto Function",
-      "description": "Presto Function",
+      "label": "Trino Function",
+      "description": "Trino Function",
       "accessTypeRestrictions": ["execute", "grant"]
     },
     {
@@ -315,7 +315,7 @@
       "validationRegEx": "",
       "validationMessage": "",
       "uiHint": "",
-      "defaultValue": "io.prestosql.jdbc.PrestoDriver"
+      "defaultValue": "io.trino.jdbc.TrinoDriver"
     },
     {
       "itemId": 4,

distro/pom.xml

@@ -52,15 +52,7 @@
                                 <configuration>
                                     <skipAssembly>false</skipAssembly>
                                     <descriptors>
-                                        <descriptor>src/main/assembly/hdfs-agent.xml</descriptor>
                                         <descriptor>src/main/assembly/hive-agent.xml</descriptor>
-                                        <descriptor>src/main/assembly/hbase-agent.xml</descriptor>
-                                        <descriptor>src/main/assembly/knox-agent.xml</descriptor>
-                                        <descriptor>src/main/assembly/storm-agent.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-kafka.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-yarn.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-ozone.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-solr.xml</descriptor>
                                         <descriptor>src/main/assembly/admin-web.xml</descriptor>
                                         <descriptor>src/main/assembly/solr_audit_conf.xml</descriptor>
                                         <descriptor>src/main/assembly/usersync.xml</descriptor>
@@ -69,12 +61,7 @@
                                         <descriptor>src/main/assembly/kms.xml</descriptor>
                                         <descriptor>src/main/assembly/ranger-tools.xml</descriptor>
                                         <descriptor>src/main/assembly/ranger-src.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-atlas.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-sqoop.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-kylin.xml</descriptor>
-                                        <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>
@@ -525,7 +512,7 @@
             </build>
         </profile>
         <profile>
-            <id>ranger-presto-plugin</id>
+            <id>ranger-trino-plugin</id>
             <build>
                 <plugins>
                     <plugin>
@@ -544,7 +531,7 @@
                                 <configuration>
                                     <skipAssembly>false</skipAssembly>
                                     <descriptors>
-                                        <descriptor>src/main/assembly/plugin-presto.xml</descriptor>
+                                        <descriptor>src/main/assembly/plugin-trino.xml</descriptor>
                                     </descriptors>
                                 </configuration>
                             </execution>
@@ -607,15 +594,7 @@
                                 <configuration>
                                     <skipAssembly>false</skipAssembly>
                                     <descriptors>
-                                        <descriptor>src/main/assembly/hdfs-agent.xml</descriptor>
                                         <descriptor>src/main/assembly/hive-agent.xml</descriptor>
-                                        <descriptor>src/main/assembly/hbase-agent.xml</descriptor>
-                                        <descriptor>src/main/assembly/knox-agent.xml</descriptor>
-                                        <descriptor>src/main/assembly/storm-agent.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-kafka.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-yarn.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-ozone.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-solr.xml</descriptor>
                                         <descriptor>src/main/assembly/admin-web.xml</descriptor>
                                         <descriptor>src/main/assembly/solr_audit_conf.xml</descriptor>
                                         <descriptor>src/main/assembly/usersync.xml</descriptor>
@@ -624,12 +603,7 @@
                                         <descriptor>src/main/assembly/kms.xml</descriptor>
                                         <descriptor>src/main/assembly/ranger-tools.xml</descriptor>
                                         <descriptor>src/main/assembly/ranger-src.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-atlas.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-sqoop.xml</descriptor>
-                                        <descriptor>src/main/assembly/plugin-kylin.xml</descriptor>
-                                        <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>
@@ -641,11 +615,4 @@
     </profiles>
 
     <!--Add a dependency here to ensure this module is the final one built-->
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.ranger</groupId>
-            <artifactId>ranger-elasticsearch-plugin-shim</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
 </project>