fapifta commented on code in PR #6860: URL: https://github.com/apache/ozone/pull/6860#discussion_r1675998670
########## hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/DelegatingProperties.java: ########## @@ -0,0 +1,173 @@ +/* + * 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.hdds.conf; + +import org.apache.hadoop.ozone.OzoneConfigKeys; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_CRYPTO_COMPLIANCE_MODE_UNRESTRICTED; + +/** + * Delegating properties helper class. + */ +public class DelegatingProperties extends Properties { + private final Properties properties; + private final String complianceMode; + private final boolean checkCompliance; + private final Properties cryptoProperties; + + public DelegatingProperties(Properties properties, String complianceMode, Properties cryptoProperties) { + this.properties = properties; + this.complianceMode = complianceMode; + this.checkCompliance = !complianceMode.equals(OZONE_SECURITY_CRYPTO_COMPLIANCE_MODE_UNRESTRICTED); + this.cryptoProperties = cryptoProperties; + } + + public String checkCompliance(String config, String value) { + // Don't check the ozone.security.crypto.compliance.mode config, even though it's tagged as a crypto config + if (checkCompliance && cryptoProperties.containsKey(config) && + !config.equals(OzoneConfigKeys.OZONE_SECURITY_CRYPTO_COMPLIANCE_MODE)) { + + String whitelistConfig = config + "." + complianceMode + ".whitelist"; + String whitelistValue = properties.getProperty(whitelistConfig, ""); + + if (whitelistValue != null) { + String[] whitelistOptions = whitelistValue.split(","); Review Comment: Yes, this looks good. Thank you for the update! -- 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]
