dombizita commented on code in PR #6860:
URL: https://github.com/apache/ozone/pull/6860#discussion_r1672385301
##########
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/TestOzoneConfiguration.java:
##########
@@ -151,6 +152,67 @@ public void getConfigurationObject() {
assertEquals(Duration.ofSeconds(3), configuration.getDuration());
}
+ @Test
+ public void testRestrictedComplianceModeWithOzoneConf() {
+ Configuration config = new Configuration();
+ config.set("ozone.security.crypto.compliance.mode", "restricted");
+ OzoneConfiguration ozoneConfig = new OzoneConfiguration(config);
+
+ // Set it to an allowed config value
+ ozoneConfig.set("hdds.x509.signature.algorithm", "SHA512withDCA");
+ ozoneConfig.set("hdds.x509.signature.algorithm.restricted.whitelist",
"SHA512withRSA,SHA512withDCA");
+
+ assertEquals("restricted",
ozoneConfig.get("ozone.security.crypto.compliance.mode"));
+ assertEquals("SHA512withRSA,SHA512withDCA",
ozoneConfig.get("hdds.x509.signature.algorithm.restricted.whitelist"));
+ assertEquals("SHA512withDCA",
ozoneConfig.get("hdds.x509.signature.algorithm"));
+
+ // Set it to a disallowed config value
+ ozoneConfig.set("hdds.x509.signature.algorithm", "SHA256withRSA");
+
+ assertThrows(ConfigurationException.class, () ->
ozoneConfig.get("hdds.x509.signature.algorithm"));
+
+ // Check it with a Hadoop Configuration
+ Configuration hadoopConfig =
+ LegacyHadoopConfigurationSource.asHadoopConfiguration(ozoneConfig);
+ assertThrows(ConfigurationException.class, () ->
hadoopConfig.get("hdds.x509.signature.algorithm"));
+ }
+
+ @Test
+ public void testRestrictedComplianceModeWithLegacyHadoopConf() {
+ Configuration config = new Configuration();
+ config.addResource("ozone-default.xml");
+ config.set("ozone.security.crypto.compliance.mode", "restricted");
+ LegacyHadoopConfigurationSource legacyHadoopConf = new
LegacyHadoopConfigurationSource(config);
+
+ // Set it to an allowed config value
+ legacyHadoopConf.set("hdds.x509.signature.algorithm", "SHA512withDCA");
+ legacyHadoopConf.set("hdds.x509.signature.algorithm.restricted.whitelist",
"SHA512withRSA,SHA512withDCA");
+
+ assertEquals("restricted",
legacyHadoopConf.get("ozone.security.crypto.compliance.mode"));
+ assertEquals("SHA512withRSA,SHA512withDCA",
+
legacyHadoopConf.get("hdds.x509.signature.algorithm.restricted.whitelist"));
+ assertEquals("SHA512withDCA",
legacyHadoopConf.get("hdds.x509.signature.algorithm"));
+
+ // Set it to a disallowed config value
+ legacyHadoopConf.set("hdds.x509.signature.algorithm", "SHA256withRSA");
+
+ assertThrows(ConfigurationException.class, () ->
legacyHadoopConf.get("hdds.x509.signature.algorithm"));
+
+ // Check it with a Hadoop Configuration
+ Configuration legacyConf =
LegacyHadoopConfigurationSource.asHadoopConfiguration(legacyHadoopConf);
+ assertThrows(ConfigurationException.class, () ->
legacyConf.get("hdds.x509.signature.algorithm"));
Review Comment:
Thanks for you comment! I realised from this, that with the latest changes
when we are initialising LegacyHadoopConfigurationSource with a Configuration
we are creating a Configuration (with an anonymus inner class) that will have
the modified getProps() method, so that will also have the compliance check. Do
you think this is a problem?
--
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]
