[trino] Update spi to v406

Incorporate following changes Remove deprecated checkCanCreateSchema trinodb/trino#15618 trinodb/trino@0fac087 Disallow multiple masks on a given column trinodb/trino#15680 trinodb/trino@bdd1cb5
utk-spartan · Mar 8, 2023 · 726b548 · 726b548
1 parent f02fd91
commit 726b548
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/...main/java/org/apache/ranger/authorization/trino/authorizer/RangerSystemAccessControl.java b/...main/java/org/apache/ranger/authorization/trino/authorizer/RangerSystemAccessControl.java
@@ -186,7 +186,8 @@ public List<ViewExpression> getRowFilters(SystemSecurityContext context, Catalog
             .orElse(Collections.emptyList());
   }
 
-  private Optional<ViewExpression> getColumnMask(SystemSecurityContext context, CatalogSchemaTableName tableName, String columnName, Type type) {
+  @Override
+  public Optional<ViewExpression> getColumnMask(SystemSecurityContext context, CatalogSchemaTableName tableName, String columnName, Type type) {
     RangerTrinoAccessRequest request = createAccessRequest(
       createResource(tableName.getCatalogName(), tableName.getSchemaTableName().getSchemaName(),
         tableName.getSchemaTableName().getTableName(), Optional.of(columnName)),
@@ -234,10 +235,11 @@ private Optional<ViewExpression> getColumnMask(SystemSecurityContext context, Ca
     return Optional.ofNullable(viewExpression);
   }
 
+  @Deprecated
   @Override
   public List<ViewExpression> getColumnMasks(SystemSecurityContext context, CatalogSchemaTableName tableName, String columnName, Type type)
   {
-    // TODO{utk}: add implementation for multiple column masks
+    // TODO{utk}: remove, marked as deprecated, Trino no longer supports multiple masks as of v406
     return getColumnMask(context, tableName, columnName, type)
             .map(Collections::singletonList)
             .orElse(Collections.emptyList());
@@ -352,14 +354,6 @@ public void checkCanShowCreateSchema(SystemSecurityContext context, CatalogSchem
    * Create schema is evaluated on the level of the Catalog. This means that it is assumed you have permission
    * to create a schema when you have create rights on the catalog level
    */
-
-  @Deprecated
-  @Override
-  public void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaName schema) {
-    // TODO{utk}: remove this method, marked as deprecated
-    checkCanCreateSchema(context, schema, new HashMap<String, Object>());
-  }
-
   @Override
   public void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaName schema, Map<String, Object> properties) {
     if (!hasPermission(createResource(schema.getCatalogName()), context, TrinoAccessType.CREATE)) {

diff --git a/pom.xml b/pom.xml
@@ -169,7 +169,7 @@
         <noggit.version>0.8</noggit.version>
         <owasp-java-html-sanitizer.version>r239</owasp-java-html-sanitizer.version>
         <paranamer.version>2.3</paranamer.version>
-        <trino.version>405</trino.version>
+        <trino.version>406</trino.version>
         <poi.version>4.1.2</poi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <protobuf-java.version>2.5.0</protobuf-java.version>

diff --git a/...main/java/org/apache/ranger/authorization/trino/authorizer/RangerSystemAccessControl.java b/...main/java/org/apache/ranger/authorization/trino/authorizer/RangerSystemAccessControl.java
@@ -96,17 +96,6 @@ public Set<String> filterCatalogs(SystemSecurityContext context, Set<String> cat
     return filteredCatalogs;
   }
 
-  @Deprecated
-  @Override
-  public void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaName schema) {
-    try {
-      activatePluginClassLoader();
-      systemAccessControlImpl.checkCanCreateSchema(context, schema);
-    } finally {
-      deactivatePluginClassLoader();
-    }
-  }
-
   @Override
   public void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaName schema, Map<String, Object> properties) {
     try {
@@ -530,6 +519,20 @@ public List<ViewExpression> getRowFilters(SystemSecurityContext context, Catalog
   }
 
 
+  @Override
+  public Optional<ViewExpression> getColumnMask(SystemSecurityContext context, CatalogSchemaTableName tableName, String columnName, Type type) {
+    Optional<ViewExpression> viewExpression;
+    try {
+      activatePluginClassLoader();
+      viewExpression = systemAccessControlImpl.getColumnMask(context, tableName, columnName, type);
+    } finally {
+      deactivatePluginClassLoader();
+    }
+    return viewExpression;
+  }
+
+
+  @Deprecated
   @Override
   public List<ViewExpression> getColumnMasks(SystemSecurityContext context, CatalogSchemaTableName tableName, String columnName, Type type) {
     List<ViewExpression> viewExpression;