jerqi commented on code in PR #9018: URL: https://github.com/apache/gravitino/pull/9018#discussion_r2549040231
########## server/src/main/java/org/apache/gravitino/server/web/filter/authorization/AssociateTagAuthorizationExecutor.java: ########## @@ -0,0 +1,118 @@ +/* + * 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. + */ + +package org.apache.gravitino.server.web.filter.authorization; + +import static org.apache.gravitino.server.web.filter.ParameterUtil.buildNameIdentifierForBatchAuthorization; +import static org.apache.gravitino.server.web.filter.ParameterUtil.extractFromParameters; + +import com.google.common.base.Preconditions; +import java.lang.reflect.Parameter; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import org.apache.gravitino.Entity; +import org.apache.gravitino.NameIdentifier; +import org.apache.gravitino.authorization.AuthorizationRequestContext; +import org.apache.gravitino.dto.requests.TagsAssociateRequest; +import org.apache.gravitino.server.authorization.expression.AuthorizationExpressionEvaluator; +import org.apache.gravitino.server.web.rest.MetadataObjectTagOperations; + +/** + * Metadata object authorization for {@link + * MetadataObjectTagOperations#associateTagsForObject(String, String, String, TagsAssociateRequest)} + */ +public class AssociateTagAuthorizationExecutor implements AuthorizationExecutor { + + private final Parameter[] parameters; + private final Object[] args; + private final Map<Entity.EntityType, NameIdentifier> metadataContext; + private final AuthorizationExpressionEvaluator authorizationExpressionEvaluator; + private final Map<String, Object> pathParams; + private final String entityType; + + public AssociateTagAuthorizationExecutor( + Parameter[] parameters, + Object[] args, + Map<Entity.EntityType, NameIdentifier> metadataContext, + AuthorizationExpressionEvaluator authorizationExpressionEvaluator, + Map<String, Object> pathParams, + String entityType) { + this.parameters = parameters; + this.args = args; + this.metadataContext = metadataContext; + this.authorizationExpressionEvaluator = authorizationExpressionEvaluator; + this.pathParams = pathParams; + this.entityType = entityType; + } + + @Override + public boolean execute() throws Exception { + Object request = extractFromParameters(parameters, args); + if (request == null) { + return false; + } + + AuthorizationRequestContext context = new AuthorizationRequestContext(); + Entity.EntityType targetType = + Entity.EntityType.TAG; // Tags are the only supported batch target here + Preconditions.checkArgument(request instanceof TagsAssociateRequest); + TagsAssociateRequest tagsAssociateRequest = (TagsAssociateRequest) request; + tagsAssociateRequest.validate(); + // Authorize both 'tagsToAdd' and 'tagsToRemove' fields. + return authorizeTag(tagsAssociateRequest.getTagsToAdd(), context, targetType) + && authorizeTag(tagsAssociateRequest.getTagsToRemove(), context, targetType); + } + + /** + * Performs batch authorization for a given field (e.g., "tagsToAdd" or "tagsToRemove") containing + * an array of tag names. + * + * @param tagNames tagNames + * @param context The shared authorization request context. + * @param targetType The entity type being authorized (expected to be TAG). + * @return {@code true} if all tags in the field pass authorization; {@code false} otherwise. + */ + private boolean authorizeTag( + String[] tagNames, AuthorizationRequestContext context, Entity.EntityType targetType) { + + // Treat null or empty arrays as no-op (implicitly authorized) + if (tagNames == null) { + return true; + } + + for (String tagName : tagNames) { Review Comment: After the request's validation, we don't need check null value here. You can simplify the code. ########## server/src/main/java/org/apache/gravitino/server/web/filter/authorization/AssociateTagAuthorizationExecutor.java: ########## @@ -0,0 +1,118 @@ +/* + * 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. + */ + +package org.apache.gravitino.server.web.filter.authorization; + +import static org.apache.gravitino.server.web.filter.ParameterUtil.buildNameIdentifierForBatchAuthorization; +import static org.apache.gravitino.server.web.filter.ParameterUtil.extractFromParameters; + +import com.google.common.base.Preconditions; +import java.lang.reflect.Parameter; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import org.apache.gravitino.Entity; +import org.apache.gravitino.NameIdentifier; +import org.apache.gravitino.authorization.AuthorizationRequestContext; +import org.apache.gravitino.dto.requests.TagsAssociateRequest; +import org.apache.gravitino.server.authorization.expression.AuthorizationExpressionEvaluator; +import org.apache.gravitino.server.web.rest.MetadataObjectTagOperations; + +/** + * Metadata object authorization for {@link + * MetadataObjectTagOperations#associateTagsForObject(String, String, String, TagsAssociateRequest)} + */ +public class AssociateTagAuthorizationExecutor implements AuthorizationExecutor { + + private final Parameter[] parameters; + private final Object[] args; + private final Map<Entity.EntityType, NameIdentifier> metadataContext; + private final AuthorizationExpressionEvaluator authorizationExpressionEvaluator; + private final Map<String, Object> pathParams; + private final String entityType; + + public AssociateTagAuthorizationExecutor( + Parameter[] parameters, + Object[] args, + Map<Entity.EntityType, NameIdentifier> metadataContext, + AuthorizationExpressionEvaluator authorizationExpressionEvaluator, + Map<String, Object> pathParams, + String entityType) { + this.parameters = parameters; + this.args = args; + this.metadataContext = metadataContext; + this.authorizationExpressionEvaluator = authorizationExpressionEvaluator; + this.pathParams = pathParams; + this.entityType = entityType; + } + + @Override + public boolean execute() throws Exception { + Object request = extractFromParameters(parameters, args); + if (request == null) { + return false; + } + + AuthorizationRequestContext context = new AuthorizationRequestContext(); + Entity.EntityType targetType = + Entity.EntityType.TAG; // Tags are the only supported batch target here + Preconditions.checkArgument(request instanceof TagsAssociateRequest); + TagsAssociateRequest tagsAssociateRequest = (TagsAssociateRequest) request; + tagsAssociateRequest.validate(); + // Authorize both 'tagsToAdd' and 'tagsToRemove' fields. + return authorizeTag(tagsAssociateRequest.getTagsToAdd(), context, targetType) + && authorizeTag(tagsAssociateRequest.getTagsToRemove(), context, targetType); + } + + /** + * Performs batch authorization for a given field (e.g., "tagsToAdd" or "tagsToRemove") containing + * an array of tag names. + * + * @param tagNames tagNames + * @param context The shared authorization request context. + * @param targetType The entity type being authorized (expected to be TAG). + * @return {@code true} if all tags in the field pass authorization; {@code false} otherwise. + */ + private boolean authorizeTag( + String[] tagNames, AuthorizationRequestContext context, Entity.EntityType targetType) { + + // Treat null or empty arrays as no-op (implicitly authorized) + if (tagNames == null) { Review Comment: After the request's validation, we don't need check null value here. You can simplify the code -- 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]
