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-8973] Added missing access constraints to the elytron integrati… #10233

Merged
merged 1 commit into from Jun 23, 2017
Merged

[WFLY-8973] Added missing access constraints to the elytron integrati… #10233

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
1 change: 1 addition & 0 deletions security/subsystem/src/main/java/org/jboss/as/security/Constants.java
View file
Open in desktop
Expand Up @@ -129,4 +129,5 @@ public interface Constants {
String ELYTRON_KEY_MANAGER = "elytron-key-manager";
String ELYTRON_TRUST_MANAGER = "elytron-trust-manager";
String LEGACY_JSSE_CONFIG = "legacy-jsse-config";
String ELYTRON_SECURITY = "elytron-security";
}
10 changes: 9 additions & 1 deletion security/subsystem/src/main/java/org/jboss/as/security/elytron/BasicResourceDefinition.java
View file
Open in desktop
Expand Up @@ -22,10 +22,15 @@
import org.jboss.as.controller.RestartParentWriteAttributeHandler;
import org.jboss.as.controller.ServiceRemoveStepHandler;
import org.jboss.as.controller.SimpleResourceDefinition;
import org.jboss.as.controller.access.constraint.ApplicationTypeConfig;
import org.jboss.as.controller.access.constraint.SensitivityClassification;
import org.jboss.as.controller.access.management.ApplicationTypeAccessConstraintDefinition;
import org.jboss.as.controller.access.management.SensitiveTargetAccessConstraintDefinition;
import org.jboss.as.controller.capability.RuntimeCapability;
import org.jboss.as.controller.descriptions.ResourceDescriptionResolver;
import org.jboss.as.controller.registry.ManagementResourceRegistration;
import org.jboss.as.controller.registry.OperationEntry;
import org.jboss.as.security.Constants;
import org.jboss.as.security.SecurityExtension;
import org.jboss.msc.service.ServiceName;

Expand All @@ -47,7 +52,10 @@ class BasicResourceDefinition extends SimpleResourceDefinition {
.setRemoveHandler(new ServiceRemoveStepHandler(add, runtimeCapabilities))
.setAddRestartLevel(OperationEntry.Flag.RESTART_RESOURCE_SERVICES)
.setRemoveRestartLevel(OperationEntry.Flag.RESTART_RESOURCE_SERVICES)
.setCapabilities(runtimeCapabilities));
.setCapabilities(runtimeCapabilities)
.addAccessConstraints(new SensitiveTargetAccessConstraintDefinition(new SensitivityClassification(SecurityExtension.SUBSYSTEM_NAME, Constants.ELYTRON_SECURITY, true, true, true)),
new ApplicationTypeAccessConstraintDefinition(new ApplicationTypeConfig(SecurityExtension.SUBSYSTEM_NAME, Constants.ELYTRON_SECURITY, false))));


this.pathKey = pathKey;
this.firstCapability = runtimeCapabilities[0];
Expand Down
3 changes: 3 additions & 0 deletions ...em/src/main/java/org/jboss/as/security/elytron/ElytronIntegrationResourceDefinitions.java
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@
import org.jboss.as.controller.ResourceDefinition;
import org.jboss.as.controller.SimpleAttributeDefinition;
import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
import org.jboss.as.controller.access.management.SensitiveTargetAccessConstraintDefinition;
import org.jboss.as.controller.operations.validation.StringLengthValidator;
import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.as.security.Constants;
Expand All @@ -60,13 +61,15 @@ public class ElytronIntegrationResourceDefinitions {
.setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
.setValidator(new StringLengthValidator(1))
.setAllowExpression(false)
.setAccessConstraints(SensitiveTargetAccessConstraintDefinition.SECURITY_DOMAIN_REF)
.build();

public static final SimpleAttributeDefinition LEGACY_JSSE_CONFIG =
new SimpleAttributeDefinitionBuilder(Constants.LEGACY_JSSE_CONFIG, ModelType.STRING, false)
.setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
.setValidator(new StringLengthValidator(1))
.setAllowExpression(false)
.setAccessConstraints(SensitiveTargetAccessConstraintDefinition.SECURITY_DOMAIN_REF)
.build();

/**
Expand Down