diff --git a/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/config/MCRAccessKeyConfig.java b/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/config/MCRAccessKeyConfig.java index b4268e906c..408dc11327 100644 --- a/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/config/MCRAccessKeyConfig.java +++ b/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/config/MCRAccessKeyConfig.java @@ -98,8 +98,8 @@ public static Set getAllowedSessionPermissionTypes() { * * @return the secret processor class name */ - public static String getSecretProcessorClassName() { - return MCRConfiguration2.getStringOrThrow("MCR.ACL.AccessKey.Service.SecretProcessor.Class"); + public static String getSecretProcessorClassProperty() { + return "MCR.ACL.AccessKey.Service.SecretProcessor.Class"; } } diff --git a/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/service/MCRAccessKeyServiceFactory.java b/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/service/MCRAccessKeyServiceFactory.java index f0367bd96a..3b9650263d 100644 --- a/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/service/MCRAccessKeyServiceFactory.java +++ b/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/service/MCRAccessKeyServiceFactory.java @@ -133,7 +133,7 @@ private static MCRAccessKeyValidator createValidator() { private static MCRAccessKeySecretProcessor getSecretProcessor() { return MCRConfiguration2.getSingleInstanceOfOrThrow( - MCRAccessKeySecretProcessor.class, MCRAccessKeyConfig.getSecretProcessorClassName()); + MCRAccessKeySecretProcessor.class, MCRAccessKeyConfig.getSecretProcessorClassProperty()); } } diff --git a/mycore-acl/src/main/resources/components/acl/config/mycore.properties b/mycore-acl/src/main/resources/components/acl/config/mycore.properties index 3ab9a5e365..bb0b22b3ab 100644 --- a/mycore-acl/src/main/resources/components/acl/config/mycore.properties +++ b/mycore-acl/src/main/resources/components/acl/config/mycore.properties @@ -41,9 +41,9 @@ MCR.ACL.AccessKey.Strategy.AllowedSessionPermissionTypes=read # Value storage MCR.ACL.AccessKey.Secret.Storage.Mode=hash -#MCR.ACL.AccessKey.Service.SecretProcessor.Class=org.mycore.mcr.acl.accesskey.value.MCRAccessKeyPlainSecretProcessor -MCR.ACL.AccessKey.Service.SecretProcessor.Class=org.mycore.mcr.acl.accesskey.value.MCRAccessKeyHashSecretProcessor -#MCR.ACL.AccessKey.Service.SecretProcessor.Class=org.mycore.mcr.acl.accesskey.value.MCRAccessKeyCryptSecretProcessor +#MCR.ACL.AccessKey.Service.SecretProcessor.Class=org.mycore.mcr.acl.accesskey.service.processor.MCRAccessKeyPlainSecretProcessor +MCR.ACL.AccessKey.Service.SecretProcessor.Class=org.mycore.mcr.acl.accesskey.service.processor.MCRAccessKeyHashSecretProcessor +#MCR.ACL.AccessKey.Service.SecretProcessor.Class=org.mycore.mcr.acl.accesskey.service.processor.MCRAccessKeyCryptSecretProcessor # Hash settings