Skip to content

Commit

Permalink
createConfiguration is now part of the configurer, removing from factory
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Jul 27, 2023
1 parent 213c43e commit bcea745
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 114 deletions.
4 changes: 0 additions & 4 deletions ...evolveum/midpoint/authentication/impl/factory/module/AbstractCredentialModuleFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,6 @@ private String getCredentialAuthModuleIdentifier(AbstractCredentialAuthenticatio
protected abstract MA createEmptyModuleAuthentication(
MT moduleType, C configuration, AuthenticationSequenceModuleType sequenceModule);

@Deprecated
protected abstract C createConfiguration(MT moduleType, String prefixOfSequence, AuthenticationChannel authenticationChannel);

// protected abstract C createConfiguration();

protected abstract CA createModuleConfigurer(MT moduleType,
String sequenceSuffix,
Expand Down
10 changes: 0 additions & 10 deletions ...evolveum/midpoint/authentication/impl/factory/module/ArchetypeSelectionModuleFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,6 @@ protected ArchetypeSelectionModuleAuthentication createEmptyModuleAuthentication
return moduleAuthentication;
}

@Override
protected LoginFormModuleWebSecurityConfiguration createConfiguration(ArchetypeSelectionModuleType moduleType,
String prefixOfSequence,
AuthenticationChannel authenticationChannel) {
LoginFormModuleWebSecurityConfiguration configuration = LoginFormModuleWebSecurityConfiguration.build(moduleType,prefixOfSequence);
configuration.setSequenceSuffix(prefixOfSequence);
return configuration;
}


@Override
protected ArchetypeSelectionModuleWebSecurityConfigurer<LoginFormModuleWebSecurityConfiguration> createModule(LoginFormModuleWebSecurityConfiguration configuration) {
return getObjectObjectPostProcessor().postProcess(new ArchetypeSelectionModuleWebSecurityConfigurer<>(configuration));
Expand Down
8 changes: 0 additions & 8 deletions ...lveum/midpoint/authentication/impl/factory/module/AttributeVerificationModuleFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@ public boolean match(AbstractAuthenticationModuleType moduleType, Authentication
return moduleType instanceof AttributeVerificationAuthenticationModuleType;
}

@Override
protected LoginFormModuleWebSecurityConfiguration createConfiguration(
AttributeVerificationAuthenticationModuleType moduleType, String prefixOfSequence, AuthenticationChannel authenticationChannel) {
LoginFormModuleWebSecurityConfiguration configuration = LoginFormModuleWebSecurityConfiguration.build(moduleType,prefixOfSequence);
configuration.setSequenceSuffix(prefixOfSequence);
return configuration;
}

@Override
protected AttributeVerificationModuleWebSecurityConfigurer<LoginFormModuleWebSecurityConfiguration> createModule(
LoginFormModuleWebSecurityConfiguration configuration) {
Expand Down
7 changes: 0 additions & 7 deletions ...om/evolveum/midpoint/authentication/impl/factory/module/CorrelationModuleFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,6 @@ public boolean match(AbstractAuthenticationModuleType moduleType, Authentication
return moduleType instanceof CorrelationAuthenticationModuleType;
}

@Override
protected LoginFormModuleWebSecurityConfiguration createConfiguration(CorrelationAuthenticationModuleType moduleType, String prefixOfSequence, AuthenticationChannel authenticationChannel) {
LoginFormModuleWebSecurityConfiguration configuration = LoginFormModuleWebSecurityConfiguration.build(moduleType,prefixOfSequence);
configuration.setSequenceSuffix(prefixOfSequence);
return configuration;
}

@Override
protected CorrelationModuleWebSecurityConfigurer<LoginFormModuleWebSecurityConfiguration> createModule(
LoginFormModuleWebSecurityConfiguration configuration) {
Expand Down
7 changes: 0 additions & 7 deletions ...eum/midpoint/authentication/impl/factory/module/FocusIdentificationModuleFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ public boolean match(AbstractAuthenticationModuleType moduleType, Authentication
return moduleType instanceof FocusIdentificationAuthenticationModuleType;
}

@Override
protected LoginFormModuleWebSecurityConfiguration createConfiguration(FocusIdentificationAuthenticationModuleType moduleType, String prefixOfSequence, AuthenticationChannel authenticationChannel) {
LoginFormModuleWebSecurityConfiguration configuration = LoginFormModuleWebSecurityConfiguration.build(moduleType,prefixOfSequence);
configuration.setSequenceSuffix(prefixOfSequence);
return configuration;
}

@Override
protected FocusIdentificationModuleWebSecurityConfigurer<LoginFormModuleWebSecurityConfiguration> createModule(
LoginFormModuleWebSecurityConfiguration configuration) {
Expand Down
7 changes: 0 additions & 7 deletions ...veum/midpoint/authentication/impl/factory/module/HintAuthenticationModuleFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,6 @@ public boolean match(AbstractAuthenticationModuleType moduleType, Authentication
return moduleType instanceof HintAuthenticationModuleType;
}

@Override
protected LoginFormModuleWebSecurityConfiguration createConfiguration(HintAuthenticationModuleType moduleType, String prefixOfSequence, AuthenticationChannel authenticationChannel) {
LoginFormModuleWebSecurityConfiguration configuration = LoginFormModuleWebSecurityConfiguration.build(moduleType,prefixOfSequence);
configuration.setSequenceSuffix(prefixOfSequence);
return configuration;
}

@Override
protected HintModuleWebSecurityConfigurer<LoginFormModuleWebSecurityConfiguration> createModule(
LoginFormModuleWebSecurityConfiguration configuration) {
Expand Down
19 changes: 6 additions & 13 deletions ...java/com/evolveum/midpoint/authentication/impl/factory/module/HttpBasicModuleFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
*/
@Component
public class HttpBasicModuleFactory extends AbstractCredentialModuleFactory<
ModuleWebSecurityConfiguration,
HttpBasicModuleWebSecurityConfigurer<ModuleWebSecurityConfiguration>,
ModuleWebSecurityConfigurationImpl,
HttpBasicModuleWebSecurityConfigurer,
HttpBasicAuthenticationModuleType,
ModuleAuthenticationImpl> {

Expand All @@ -37,20 +37,13 @@ public boolean match(AbstractAuthenticationModuleType moduleType, Authentication
}

@Override
protected ModuleWebSecurityConfiguration createConfiguration(HttpBasicAuthenticationModuleType moduleType, String prefixOfSequence, AuthenticationChannel authenticationChannel) {
ModuleWebSecurityConfigurationImpl configuration = ModuleWebSecurityConfigurationImpl.build(moduleType,prefixOfSequence);
configuration.setSequenceSuffix(prefixOfSequence);
return configuration;
}

@Override
protected HttpBasicModuleWebSecurityConfigurer<ModuleWebSecurityConfiguration> createModule(ModuleWebSecurityConfiguration configuration) {
protected HttpBasicModuleWebSecurityConfigurer createModule(ModuleWebSecurityConfigurationImpl configuration) {
return getObjectObjectPostProcessor().postProcess(new HttpBasicModuleWebSecurityConfigurer(configuration));
}

@Override
protected HttpBasicModuleWebSecurityConfigurer<ModuleWebSecurityConfiguration> createModuleConfigurer(HttpBasicAuthenticationModuleType moduleType, String sequenceSuffix, AuthenticationChannel authenticationChannel, ObjectPostProcessor<Object> objectPostProcessor) {
return new HttpBasicModuleWebSecurityConfigurer<>(moduleType, sequenceSuffix, authenticationChannel, objectPostProcessor);
protected HttpBasicModuleWebSecurityConfigurer createModuleConfigurer(HttpBasicAuthenticationModuleType moduleType, String sequenceSuffix, AuthenticationChannel authenticationChannel, ObjectPostProcessor<Object> objectPostProcessor) {
return new HttpBasicModuleWebSecurityConfigurer(moduleType, sequenceSuffix, authenticationChannel, objectPostProcessor);
}

@Override
Expand All @@ -65,7 +58,7 @@ protected Class<? extends CredentialPolicyType> supportedClass() {

@Override
protected ModuleAuthenticationImpl createEmptyModuleAuthentication(HttpBasicAuthenticationModuleType moduleType,
ModuleWebSecurityConfiguration configuration, AuthenticationSequenceModuleType sequenceModule) {
ModuleWebSecurityConfigurationImpl configuration, AuthenticationSequenceModuleType sequenceModule) {
HttpModuleAuthentication moduleAuthentication = new HttpModuleAuthentication(AuthenticationModuleNameConstants.HTTP_BASIC, sequenceModule);
moduleAuthentication.setPrefix(configuration.getPrefixOfModule());
moduleAuthentication.setCredentialName(moduleType.getCredentialName());
Expand Down
21 changes: 7 additions & 14 deletions ...olveum/midpoint/authentication/impl/factory/module/HttpSecurityQuestionModuleFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
*/
@Component
public class HttpSecurityQuestionModuleFactory extends AbstractCredentialModuleFactory<
ModuleWebSecurityConfiguration,
HttpSecurityQuestionsModuleWebSecurityConfigurer<ModuleWebSecurityConfiguration>,
ModuleWebSecurityConfigurationImpl,
HttpSecurityQuestionsModuleWebSecurityConfigurer,
HttpSecQAuthenticationModuleType,
HttpModuleAuthentication> {

Expand All @@ -37,20 +37,13 @@ public boolean match(AbstractAuthenticationModuleType moduleType, Authentication
}

@Override
protected ModuleWebSecurityConfiguration createConfiguration(HttpSecQAuthenticationModuleType moduleType, String prefixOfSequence, AuthenticationChannel authenticationChannel) {
ModuleWebSecurityConfigurationImpl configuration = ModuleWebSecurityConfigurationImpl.build(moduleType,prefixOfSequence);
configuration.setSequenceSuffix(prefixOfSequence);
return configuration;
protected HttpSecurityQuestionsModuleWebSecurityConfigurer createModule(ModuleWebSecurityConfigurationImpl configuration) {
return getObjectObjectPostProcessor().postProcess(new HttpSecurityQuestionsModuleWebSecurityConfigurer(configuration));
}

@Override
protected HttpSecurityQuestionsModuleWebSecurityConfigurer<ModuleWebSecurityConfiguration> createModule(ModuleWebSecurityConfiguration configuration) {
return getObjectObjectPostProcessor().postProcess(new HttpSecurityQuestionsModuleWebSecurityConfigurer<>(configuration));
}

@Override
protected HttpSecurityQuestionsModuleWebSecurityConfigurer<ModuleWebSecurityConfiguration> createModuleConfigurer(HttpSecQAuthenticationModuleType moduleType, String sequenceSuffix, AuthenticationChannel authenticationChannel, ObjectPostProcessor<Object> objectPostProcessor) {
return new HttpSecurityQuestionsModuleWebSecurityConfigurer<>(moduleType, sequenceSuffix, authenticationChannel, objectPostProcessor);
protected HttpSecurityQuestionsModuleWebSecurityConfigurer createModuleConfigurer(HttpSecQAuthenticationModuleType moduleType, String sequenceSuffix, AuthenticationChannel authenticationChannel, ObjectPostProcessor<Object> objectPostProcessor) {
return new HttpSecurityQuestionsModuleWebSecurityConfigurer(moduleType, sequenceSuffix, authenticationChannel, objectPostProcessor);
}

@Override
Expand All @@ -65,7 +58,7 @@ protected Class<? extends CredentialPolicyType> supportedClass() {

@Override
protected HttpModuleAuthentication createEmptyModuleAuthentication(HttpSecQAuthenticationModuleType moduleType,
ModuleWebSecurityConfiguration configuration, AuthenticationSequenceModuleType sequenceModule) {
ModuleWebSecurityConfigurationImpl configuration, AuthenticationSequenceModuleType sequenceModule) {
HttpModuleAuthentication moduleAuthentication = new HttpModuleAuthentication(AuthenticationModuleNameConstants.SECURITY_QUESTIONS, sequenceModule);
moduleAuthentication.setPrefix(configuration.getPrefixOfModule());
moduleAuthentication.setCredentialName(moduleType.getCredentialName());
Expand Down
7 changes: 0 additions & 7 deletions .../com/evolveum/midpoint/authentication/impl/factory/module/LoginFormModuleFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ public boolean match(AbstractAuthenticationModuleType moduleType, Authentication
return moduleType instanceof LoginFormAuthenticationModuleType;
}

@Override
protected LoginFormModuleWebSecurityConfiguration createConfiguration(LoginFormAuthenticationModuleType moduleType, String prefixOfSequence, AuthenticationChannel authenticationChannel) {
LoginFormModuleWebSecurityConfiguration configuration = LoginFormModuleWebSecurityConfiguration.build(moduleType,prefixOfSequence);
configuration.setSequenceSuffix(prefixOfSequence);
return configuration;
}

@Override
protected LoginFormModuleWebSecurityConfigurer<LoginFormModuleWebSecurityConfiguration, LoginFormAuthenticationModuleType> createModule(LoginFormModuleWebSecurityConfiguration configuration) {
return getObjectObjectPostProcessor().postProcess(new LoginFormModuleWebSecurityConfigurer<>(configuration));
Expand Down
22 changes: 7 additions & 15 deletions ...java/com/evolveum/midpoint/authentication/impl/factory/module/MailNonceModuleFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
*/
@Component
public class MailNonceModuleFactory extends AbstractCredentialModuleFactory<
ModuleWebSecurityConfiguration,
MailNonceFormModuleWebSecurityConfigurer<ModuleWebSecurityConfiguration>,
ModuleWebSecurityConfigurationImpl,
MailNonceFormModuleWebSecurityConfigurer,
MailNonceAuthenticationModuleType,
MailNonceModuleAuthenticationImpl> {

Expand All @@ -36,21 +36,13 @@ public boolean match(AbstractAuthenticationModuleType moduleType, Authentication
}

@Override
protected ModuleWebSecurityConfiguration createConfiguration(MailNonceAuthenticationModuleType moduleType, String prefixOfSequence, AuthenticationChannel authenticationChannel) {
ModuleWebSecurityConfigurationImpl configuration = ModuleWebSecurityConfigurationImpl.build(moduleType,prefixOfSequence);
configuration.setSequenceSuffix(prefixOfSequence);
configuration.setSpecificLoginUrl(authenticationChannel.getSpecificLoginUrl());
return configuration;
protected MailNonceFormModuleWebSecurityConfigurer createModule(ModuleWebSecurityConfigurationImpl configuration) {
return getObjectObjectPostProcessor().postProcess(new MailNonceFormModuleWebSecurityConfigurer(configuration));
}

@Override
protected MailNonceFormModuleWebSecurityConfigurer<ModuleWebSecurityConfiguration> createModule(ModuleWebSecurityConfiguration configuration) {
return getObjectObjectPostProcessor().postProcess(new MailNonceFormModuleWebSecurityConfigurer<>(configuration));
}

@Override
protected MailNonceFormModuleWebSecurityConfigurer<ModuleWebSecurityConfiguration> createModuleConfigurer(MailNonceAuthenticationModuleType moduleType, String sequenceSuffix, AuthenticationChannel authenticationChannel, ObjectPostProcessor<Object> objectPostProcessor) {
return new MailNonceFormModuleWebSecurityConfigurer<>(moduleType, sequenceSuffix, authenticationChannel, objectPostProcessor);
protected MailNonceFormModuleWebSecurityConfigurer createModuleConfigurer(MailNonceAuthenticationModuleType moduleType, String sequenceSuffix, AuthenticationChannel authenticationChannel, ObjectPostProcessor<Object> objectPostProcessor) {
return new MailNonceFormModuleWebSecurityConfigurer(moduleType, sequenceSuffix, authenticationChannel, objectPostProcessor);
}

//TODO
Expand All @@ -66,7 +58,7 @@ protected Class<? extends CredentialPolicyType> supportedClass() {

@Override
protected MailNonceModuleAuthenticationImpl createEmptyModuleAuthentication(MailNonceAuthenticationModuleType moduleType,
ModuleWebSecurityConfiguration configuration, AuthenticationSequenceModuleType sequenceModule) {
ModuleWebSecurityConfigurationImpl configuration, AuthenticationSequenceModuleType sequenceModule) {
MailNonceModuleAuthenticationImpl moduleAuthentication = new MailNonceModuleAuthenticationImpl(sequenceModule);
moduleAuthentication.setPrefix(configuration.getPrefixOfModule());
moduleAuthentication.setCredentialName(moduleType.getCredentialName());
Expand Down
10 changes: 1 addition & 9 deletions ...olveum/midpoint/authentication/impl/factory/module/SecurityQuestionFormModuleFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,7 @@ public class SecurityQuestionFormModuleFactory extends AbstractCredentialModuleF
public boolean match(AbstractAuthenticationModuleType moduleType, AuthenticationChannel authenticationChannel) {
return moduleType instanceof SecurityQuestionsFormAuthenticationModuleType;
}

@Override
protected LoginFormModuleWebSecurityConfiguration createConfiguration(
SecurityQuestionsFormAuthenticationModuleType moduleType, String prefixOfSequence, AuthenticationChannel authenticationChannel) {
LoginFormModuleWebSecurityConfiguration configuration = LoginFormModuleWebSecurityConfiguration.build(moduleType,prefixOfSequence);
configuration.setSequenceSuffix(prefixOfSequence);
return configuration;
}


@Override
protected SecurityQuestionsFormModuleWebSecurityConfigurer<LoginFormModuleWebSecurityConfiguration> createModule(
LoginFormModuleWebSecurityConfiguration configuration) {
Expand Down
14 changes: 11 additions & 3 deletions .../midpoint/authentication/impl/module/configurer/HttpBasicModuleWebSecurityConfigurer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import com.evolveum.midpoint.authentication.impl.filter.SequenceAuditFilter;
import com.evolveum.midpoint.authentication.impl.filter.configurers.MidpointExceptionHandlingConfigurer;
import com.evolveum.midpoint.authentication.api.util.AuthUtil;
import com.evolveum.midpoint.authentication.api.ModuleWebSecurityConfiguration;

import com.evolveum.midpoint.authentication.impl.module.configuration.ModuleWebSecurityConfigurationImpl;
import com.evolveum.midpoint.xml.ns._public.common.common_3.HttpBasicAuthenticationModuleType;

import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -33,7 +33,7 @@
* @author skublik
*/

public class HttpBasicModuleWebSecurityConfigurer<C extends ModuleWebSecurityConfiguration> extends ModuleWebSecurityConfigurer<C, HttpBasicAuthenticationModuleType> {
public class HttpBasicModuleWebSecurityConfigurer extends ModuleWebSecurityConfigurer<ModuleWebSecurityConfigurationImpl, HttpBasicAuthenticationModuleType> {

@Autowired
private ModelService model;
Expand All @@ -47,7 +47,7 @@ public class HttpBasicModuleWebSecurityConfigurer<C extends ModuleWebSecurityCon
@Autowired
private TaskManager taskManager;

public HttpBasicModuleWebSecurityConfigurer(C configuration) {
public HttpBasicModuleWebSecurityConfigurer(ModuleWebSecurityConfigurationImpl configuration) {
super(configuration);
}

Expand All @@ -58,6 +58,14 @@ public HttpBasicModuleWebSecurityConfigurer(HttpBasicAuthenticationModuleType mo
super(module, sequenceSuffix, authenticationChannel, postProcessor);
}


@Override
protected ModuleWebSecurityConfigurationImpl buildConfiguration(HttpBasicAuthenticationModuleType moduleType, String sequenceSuffix, AuthenticationChannel authenticationChannel) {
ModuleWebSecurityConfigurationImpl configuration = ModuleWebSecurityConfigurationImpl.build(moduleType, sequenceSuffix);
configuration.setSequenceSuffix(sequenceSuffix);
return configuration;
}

@Override
protected void configure(HttpSecurity http) throws Exception {

Expand Down
13 changes: 10 additions & 3 deletions ...thentication/impl/module/configurer/HttpSecurityQuestionsModuleWebSecurityConfigurer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import com.evolveum.midpoint.authentication.impl.filter.SequenceAuditFilter;
import com.evolveum.midpoint.authentication.impl.filter.configurers.MidpointExceptionHandlingConfigurer;
import com.evolveum.midpoint.authentication.api.util.AuthUtil;
import com.evolveum.midpoint.authentication.api.ModuleWebSecurityConfiguration;

import com.evolveum.midpoint.authentication.impl.module.configuration.ModuleWebSecurityConfigurationImpl;
import com.evolveum.midpoint.xml.ns._public.common.common_3.HttpSecQAuthenticationModuleType;

import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -34,7 +34,7 @@
* @author skublik
*/

public class HttpSecurityQuestionsModuleWebSecurityConfigurer<C extends ModuleWebSecurityConfiguration> extends ModuleWebSecurityConfigurer<C, HttpSecQAuthenticationModuleType> {
public class HttpSecurityQuestionsModuleWebSecurityConfigurer extends ModuleWebSecurityConfigurer<ModuleWebSecurityConfigurationImpl, HttpSecQAuthenticationModuleType> {

@Autowired
private ModelService model;
Expand All @@ -48,7 +48,7 @@ public class HttpSecurityQuestionsModuleWebSecurityConfigurer<C extends ModuleWe
@Autowired
private TaskManager taskManager;

public HttpSecurityQuestionsModuleWebSecurityConfigurer(C configuration) {
public HttpSecurityQuestionsModuleWebSecurityConfigurer(ModuleWebSecurityConfigurationImpl configuration) {
super(configuration);
}

Expand All @@ -59,6 +59,13 @@ public HttpSecurityQuestionsModuleWebSecurityConfigurer(HttpSecQAuthenticationMo
super(moduleType, suffix, authenticationChannel, postProcessor);
}

@Override
protected ModuleWebSecurityConfigurationImpl buildConfiguration(HttpSecQAuthenticationModuleType moduleType, String sequenceSuffix, AuthenticationChannel authenticationChannel) {
ModuleWebSecurityConfigurationImpl configuration = ModuleWebSecurityConfigurationImpl.build(moduleType, sequenceSuffix);
configuration.setSequenceSuffix(sequenceSuffix);
return configuration;
}

@Override
protected void configure(HttpSecurity http) throws Exception {

Expand Down

0 comments on commit bcea745

Please sign in to comment.