Abyss-lord commented on code in PR #7349:
URL: https://github.com/apache/gravitino/pull/7349#discussion_r2144087782
##########
server-common/src/main/java/org/apache/gravitino/server/authorization/jcasbin/JcasbinAuthorizer.java:
##########
@@ -104,7 +104,18 @@ public void close() throws IOException {}
private boolean authorizeInternal(
Principal principal, String metalake, MetadataObject metadataObject,
String privilege) {
String username = principal.getName();
- return loadPrivilegeAndAuthorize(username, metalake, metadataObject,
privilege);
+ try {
+ return loadPrivilegeAndAuthorize(username, metalake, metadataObject,
privilege);
+ } catch (IOException e) {
+ LOG.error(
+ "Failed to authorize user {} on {} with privilege {}: {}",
+ username,
+ metadataObject,
+ privilege,
+ e.getMessage(),
+ e);
Review Comment:
Fix
##########
server-common/src/main/java/org/apache/gravitino/server/authorization/MetadataIdConverter.java:
##########
@@ -17,15 +17,159 @@
package org.apache.gravitino.server.authorization;
+import static
org.apache.gravitino.catalog.CapabilityHelpers.applyCaseSensitive;
+import static org.apache.gravitino.catalog.CapabilityHelpers.getCapability;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+import org.apache.gravitino.Entity;
+import org.apache.gravitino.EntityStore;
+import org.apache.gravitino.GravitinoEnv;
+import org.apache.gravitino.HasIdentifier;
import org.apache.gravitino.MetadataObject;
+import org.apache.gravitino.NameIdentifier;
+import org.apache.gravitino.catalog.CatalogManager;
+import org.apache.gravitino.connector.capability.Capability;
+import org.apache.gravitino.meta.BaseMetalake;
+import org.apache.gravitino.meta.CatalogEntity;
+import org.apache.gravitino.meta.ColumnEntity;
+import org.apache.gravitino.meta.FilesetEntity;
+import org.apache.gravitino.meta.ModelEntity;
+import org.apache.gravitino.meta.ModelVersionEntity;
+import org.apache.gravitino.meta.RoleEntity;
+import org.apache.gravitino.meta.SchemaEntity;
+import org.apache.gravitino.meta.TableEntity;
+import org.apache.gravitino.meta.TagEntity;
+import org.apache.gravitino.meta.TopicEntity;
+import org.apache.gravitino.meta.UserEntity;
/** It is used to convert MetadataObject to MetadataId */
public class MetadataIdConverter {
+ private static final Pattern DOT_PATTERN = Pattern.compile("\\.");
+ // Maps metadata type to entity type
+ private static final Map<MetadataObject.Type, Entity.EntityType>
METADATA_TYPE_MAP =
+ ImmutableMap.of(
+ MetadataObject.Type.METALAKE, Entity.EntityType.METALAKE,
+ MetadataObject.Type.CATALOG, Entity.EntityType.CATALOG,
+ MetadataObject.Type.SCHEMA, Entity.EntityType.SCHEMA,
+ MetadataObject.Type.TABLE, Entity.EntityType.TABLE,
+ MetadataObject.Type.MODEL, Entity.EntityType.MODEL,
+ MetadataObject.Type.FILESET, Entity.EntityType.FILESET,
+ MetadataObject.Type.TOPIC, Entity.EntityType.TOPIC,
+ MetadataObject.Type.COLUMN, Entity.EntityType.COLUMN,
+ MetadataObject.Type.ROLE, Entity.EntityType.ROLE);
+ // Maps metadata type to capability scope
+ private static final Map<MetadataObject.Type, Capability.Scope>
METADATA_SCOPE_MAP =
+ ImmutableMap.of(
+ MetadataObject.Type.SCHEMA, Capability.Scope.SCHEMA,
+ MetadataObject.Type.TABLE, Capability.Scope.TABLE,
+ MetadataObject.Type.MODEL, Capability.Scope.MODEL,
+ MetadataObject.Type.FILESET, Capability.Scope.FILESET,
+ MetadataObject.Type.TOPIC, Capability.Scope.TOPIC,
+ MetadataObject.Type.COLUMN, Capability.Scope.COLUMN);
+ // Maps entity type to entity class.
+ private static final Map<Entity.EntityType, Class<?>> ENTITY_CLASS_MAP;
+
+ static {
+ Map<Entity.EntityType, Class<?>> map = new
EnumMap<>(Entity.EntityType.class);
+ map.put(Entity.EntityType.METALAKE, BaseMetalake.class);
+ map.put(Entity.EntityType.CATALOG, CatalogEntity.class);
+ map.put(Entity.EntityType.SCHEMA, SchemaEntity.class);
+ map.put(Entity.EntityType.TABLE, TableEntity.class);
+ map.put(Entity.EntityType.FILESET, FilesetEntity.class);
+ map.put(Entity.EntityType.MODEL, ModelEntity.class);
+ map.put(Entity.EntityType.TOPIC, TopicEntity.class);
+ map.put(Entity.EntityType.TAG, TagEntity.class);
+ map.put(Entity.EntityType.MODEL_VERSION, ModelVersionEntity.class);
+ map.put(Entity.EntityType.COLUMN, ColumnEntity.class);
+ map.put(Entity.EntityType.USER, UserEntity.class);
+ map.put(Entity.EntityType.GROUP, Entity.class);
+ map.put(Entity.EntityType.ROLE, RoleEntity.class);
+ ENTITY_CLASS_MAP = Collections.unmodifiableMap(map);
Review Comment:
Fix
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
