Skip to content

WIP: [WFCORE-7335] Block deployments if the security manager subsyste… #6498

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −6
Draft

WIP: [WFCORE-7335] Block deployments if the security manager subsyste… #6498

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions ...ger/src/main/java/org/wildfly/extension/security/manager/SecurityManagerSubsystemAdd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.List;

import org.jboss.as.controller.AbstractBoottimeAddStepHandler;
import org.jboss.as.controller.ExpressionResolver;
import org.jboss.as.controller.OperationContext;
import org.jboss.as.controller.OperationFailedException;
import org.jboss.as.controller.PathAddress;
Expand Down Expand Up @@ -62,14 +63,21 @@ protected void performBoottime(final OperationContext context, final ModelNode o
final ModelNode node = Resource.Tools.readModel(resource);
// get the minimum set of deployment permissions.
final ModelNode deploymentPermissionsModel = node.get(DEPLOYMENT_PERMISSIONS_PATH.getKeyValuePair());
final ModelNode minimumPermissionsNode = MINIMUM_PERMISSIONS.resolveModelAttribute(context, deploymentPermissionsModel);
final List<PermissionFactory> minimumSet = this.retrievePermissionSet(DeferredPermissionFactory.Type.MINIMUM_SET, context, minimumPermissionsNode);

// get the maximum set of deployment permissions.
ModelNode maximumPermissionsNode = MAXIMUM_PERMISSIONS.resolveModelAttribute(context, deploymentPermissionsModel);
ModelNode minimumPermissionsNode = null;
ModelNode maximumPermissionsNode = null;
try {
minimumPermissionsNode = MINIMUM_PERMISSIONS.resolveModelAttribute(context, deploymentPermissionsModel);
maximumPermissionsNode = MAXIMUM_PERMISSIONS.resolveModelAttribute(context, deploymentPermissionsModel);
} catch (ExpressionResolver.ExpressionResolutionUserException ex) {
// TODO: better exception choice ?
throw (System.getSecurityManager() != null) ? new RuntimeException(ex) : ex;
}
if (!maximumPermissionsNode.isDefined())
maximumPermissionsNode = DEFAULT_MAXIMUM_SET;
final List<PermissionFactory> maximumSet = this.retrievePermissionSet(DeferredPermissionFactory.Type.MAXIMUM_SET, context, maximumPermissionsNode);
final List<PermissionFactory> minimumSet = this
.retrievePermissionSet(DeferredPermissionFactory.Type.MINIMUM_SET, context, minimumPermissionsNode);
final List<PermissionFactory> maximumSet = this
.retrievePermissionSet(DeferredPermissionFactory.Type.MAXIMUM_SET, context, maximumPermissionsNode);

// validate the configured permissions - the minimum set must be implied by the maximum set.
final FactoryPermissionCollection maxPermissionCollection = new FactoryPermissionCollection(maximumSet.toArray(new PermissionFactory[maximumSet.size()]));
Expand Down
Loading