Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WFLY-7254] pattern-filter disappears if predefined-filter is used for configurable-sasl-server-factory in Elytron subsystem #253

Merged
merged 1 commit into from Oct 14, 2016
Merged

[WFLY-7254] pattern-filter disappears if predefined-filter is used for configurable-sasl-server-factory in Elytron subsystem #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/main/java/org/wildfly/extension/elytron/SaslServerDefinitions.java
View file
Open in desktop
Expand Up @@ -32,6 +32,7 @@
import static org.wildfly.extension.elytron.ElytronExtension.asStringIfDefined;
import static org.wildfly.extension.elytron.ElytronExtension.getRequiredService;
import static org.wildfly.extension.elytron.SecurityActions.doPrivileged;
import static org.wildfly.extension.elytron._private.ElytronSubsystemMessages.ROOT_LOGGER;

import java.security.PrivilegedExceptionAction;
import java.security.Provider;
Expand Down Expand Up @@ -62,6 +63,7 @@
import org.jboss.as.controller.SimpleResourceDefinition;
import org.jboss.as.controller.capability.RuntimeCapability;
import org.jboss.as.controller.operations.validation.EnumValidator;
import org.jboss.as.controller.operations.validation.ObjectTypeValidator;
import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.as.controller.registry.ManagementResourceRegistration;
import org.jboss.as.controller.registry.OperationEntry;
Expand Down Expand Up @@ -179,8 +181,26 @@ class SaslServerDefinitions {

static final ObjectListAttributeDefinition CONFIGURED_FILTERS = new ObjectListAttributeDefinition.Builder(ElytronDescriptionConstants.FILTERS, CONFIGURED_FILTER)
.setAllowNull(true)
.setValidator(new FiltersValidator())
.build();

private static class FiltersValidator extends ObjectTypeValidator {

private FiltersValidator() {
super(true, PREDEFINED_FILTER, PATTERN_FILTER, ENABLING);
}

@Override
public void validateParameter(final String parameterName, final ModelNode value) throws OperationFailedException {
super.validateParameter(parameterName, value);

if (value.hasDefined(ElytronDescriptionConstants.PREDEFINED_FILTER)
&& value.hasDefined(ElytronDescriptionConstants.PATTERN_FILTER)) {
throw ROOT_LOGGER.invalidDefinition(ElytronDescriptionConstants.FILTERS);
}
}
}

private static final AggregateComponentDefinition<SaslServerFactory> AGGREGATE_SASL_SERVER_FACTORY = AggregateComponentDefinition.create(SaslServerFactory.class,
ElytronDescriptionConstants.AGGREGATE_SASL_SERVER_FACTORY, ElytronDescriptionConstants.SASL_SERVER_FACTORIES, SASL_SERVER_FACTORY_RUNTIME_CAPABILITY,
(SaslServerFactory[] n) -> new AggregateSaslServerFactory(n));
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/wildfly/extension/elytron/_private/ElytronSubsystemMessages.java
View file
Open in desktop
Expand Up @@ -271,4 +271,7 @@ public interface ElytronSubsystemMessages extends BasicLogger {

@Message(id = 1013, value = "Pattern [%s] requires a capture group")
OperationFailedException patternRequiresCaptureGroup(final String pattern);

@Message(id = 1014, value = "Invalid [%s] definition.")
OperationFailedException invalidDefinition(final String property);
}