ashishkumar50 commented on code in PR #5069: URL: https://github.com/apache/ozone/pull/5069#discussion_r1264306698
########## hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneAuthorizerFactory.java: ########## @@ -0,0 +1,112 @@ +/* + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.security.acl; + +import org.apache.hadoop.hdds.conf.ConfigurationSource; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.ozone.om.KeyManager; +import org.apache.hadoop.ozone.om.OmSnapshot; +import org.apache.hadoop.ozone.om.OzoneManager; +import org.apache.hadoop.ozone.om.PrefixManager; + +import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS; +import static org.apache.hadoop.util.ReflectionUtils.newInstance; + +/** + * Creates {@link IAccessAuthorizer} instances based on configuration. + */ +public final class OzoneAuthorizerFactory { + + private OzoneAuthorizerFactory() { + // no instances + } + + /** + * @return authorizer instance for {@link OzoneManager} + */ + public static IAccessAuthorizer forOM(OzoneManager om) { + return create(om, om.getKeyManager(), om.getPrefixManager()); + } + + /** + * @return authorizer instance for {@link OmSnapshot}, may be new instance, + * or existing one, depending on configuration + */ + public static IAccessAuthorizer forSnapshot( + OzoneManager om, KeyManager keyManager, PrefixManager prefixManager + ) { + return om.getAccessAuthorizer().isNative() + ? create(om, keyManager, prefixManager) + : om.getAccessAuthorizer(); + } + + /** + * Creates new instance (except for {@link OzoneAccessAuthorizer}, + * which is a no-op authorizer. + */ + private static IAccessAuthorizer create( + OzoneManager om, KeyManager km, PrefixManager pm + ) { + if (!om.getAclsEnabled()) { + return OzoneAccessAuthorizer.get(); + } + + final OzoneConfiguration conf = om.getConfiguration(); + final Class<? extends IAccessAuthorizer> clazz = authorizerClass(conf); + + if (OzoneAccessAuthorizer.class == clazz) { + return OzoneAccessAuthorizer.get(); + } + + if (OzoneNativeAuthorizer.class == clazz) { + final OzoneNativeAuthorizer authorizer = new OzoneNativeAuthorizer(); + return configure(authorizer, om, km, pm); + } + + final IAccessAuthorizer authorizer = newInstance(clazz, conf); + return authorizer instanceof OzoneNativeAuthorizer Review Comment: I think this can be avoided here as already at L76 it will return `OzoneNativeAuthorizer`, instead we can directly return newInstance without configure. ########## hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataReader.java: ########## @@ -91,50 +88,19 @@ public OmMetadataReader(KeyManager keyManager, Logger log, AuditLogger audit, OmMetadataReaderMetrics omMetadataReaderMetrics, - boolean bNeedAccessAuthInitialization) { + IAccessAuthorizer accessAuthorizer) { this.keyManager = keyManager; this.bucketManager = ozoneManager.getBucketManager(); this.volumeManager = ozoneManager.getVolumeManager(); this.prefixManager = prefixManager; - OzoneConfiguration configuration = ozoneManager.getConfiguration(); this.ozoneManager = ozoneManager; this.isAclEnabled = ozoneManager.getAclsEnabled(); this.log = log; this.audit = audit; - boolean allowListAllVolumes = ozoneManager.getAllowListAllVolumes(); this.metrics = omMetadataReaderMetrics; this.perfMetrics = ozoneManager.getPerfMetrics(); - if (isAclEnabled) { - Class<? extends IAccessAuthorizer> clazz = configuration.getClass( - OZONE_ACL_AUTHORIZER_CLASS, OzoneAccessAuthorizer.class, - IAccessAuthorizer.class); - if (bNeedAccessAuthInitialization || - clazz.getSimpleName().equals( - OzoneNativeAuthorizer.class.getSimpleName())) { - // In case of NativeAuthorizer always re-initialize - accessAuthorizer = getACLAuthorizerInstance(configuration, clazz); Review Comment: We can delete unused method `getACLAuthorizerInstance` as well. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
