From b303238c80818ffe85a92280177a8abc207ea147 Mon Sep 17 00:00:00 2001 From: lprimak Date: Thu, 12 Nov 2026 14:06:09 -0600 Subject: [PATCH 1/2] enh: enforce strict handling of empty authorization configurations by default --- .../aop/AuthorizingAnnotationHandler.java | 18 ++++++++++-------- .../authz/permission/WildcardPermission.java | 4 ++-- .../shiro/realm/AuthorizingRealmTest.java | 4 +--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/org/apache/shiro/authz/aop/AuthorizingAnnotationHandler.java b/core/src/main/java/org/apache/shiro/authz/aop/AuthorizingAnnotationHandler.java index 8d89bf9a9c..2d57846b1a 100644 --- a/core/src/main/java/org/apache/shiro/authz/aop/AuthorizingAnnotationHandler.java +++ b/core/src/main/java/org/apache/shiro/authz/aop/AuthorizingAnnotationHandler.java @@ -68,22 +68,24 @@ public AuthorizingAnnotationHandler(Class annotationClass) * What to do with authorization configuration that names no permissions or roles, such as the {@code perms} and * {@code roles} filters without arguments, or {@code @RequiresPermissions({})}. *

- * Such configuration performs no check, which is almost always a mistake. By default a warning is logged and the - * previous behavior is kept. If the {@value #STRICT_PROPERTY} system property is {@code true}, the - * configuration is rejected with a {@link ConfigurationException} when the integration reads it at startup. + * Such configuration performs no check, which is almost always a mistake. By default the configuration is + * rejected with a {@link ConfigurationException} when the integration reads it at startup. If the + * {@value #STRICT_PROPERTY} system property is {@code false}, a warning is logged and the legacy behavior is kept. * - * @since 3.0.2 + * @since 3.0.2 (opt-in), strict by default since 3.1 */ public static final class AuthorizationConfigPolicy { /** - * System property that, when {@code true}, makes empty authorization configuration fail at startup - * instead of only logging a warning. Also enables strict {@link org.apache.shiro.authz.permission.WildcardPermission} - * parsing, rejecting empty or blank permission parts and subparts, including trailing separators. + * System property controlling strict authorization configuration. Defaults to {@code true} when absent, + * making empty authorization configuration fail at startup and making strict + * {@link org.apache.shiro.authz.permission.WildcardPermission} parsing reject empty or blank permission parts + * and subparts, including trailing separators. Set it to {@code false} to only log a warning and keep the + * legacy behavior. */ private static final String STRICT_PROPERTY = "shiro.authz.strictConfig"; @Getter @Setter // Setter is for testing only, to avoid having to set a system property in the test JVM. - private static boolean strictParsing = Boolean.getBoolean(STRICT_PROPERTY); + private static boolean strictParsing = !"false".equalsIgnoreCase(System.getProperty(STRICT_PROPERTY)); private static final Logger LOGGER = LoggerFactory.getLogger(AuthorizingAnnotationHandler.class); private static final Set WARNED = ConcurrentHashMap.newKeySet(); diff --git a/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermission.java b/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermission.java index d9180da512..9c704e8f55 100644 --- a/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermission.java +++ b/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermission.java @@ -112,8 +112,8 @@ * syntax, not literal data. Use {@link #fromLiteralParts(String...)} for both grants and checks built from data. * This factory rejects reserved characters instead of escaping them. *

- * Setting {@code -Dshiro.authz.strictConfig=true} rejects empty or blank parts and subparts, including trailing - * separators such as {@code newsletter:edit:}. Without it, legacy parsing is preserved, including discarding trailing + * Empty or blank parts and subparts, including trailing separators such as {@code newsletter:edit:}, are rejected + * by default. Setting {@code -Dshiro.authz.strictConfig=false} preserves legacy parsing, including discarding trailing * separators, which can broaden a grant. Intentionally omitted parts and explicit wildcards remain supported. * * @since 0.9 diff --git a/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java b/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java index dd62ee7e30..1dbfa07b6d 100644 --- a/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java +++ b/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java @@ -246,8 +246,6 @@ public Collection resolvePermissionsInRole(String roleString) { if (roleString.equals(ROLE)) { permissions.add(new WildcardPermission(ROLE + ":perm1")); permissions.add(new WildcardPermission(ROLE + ":perm2")); - permissions.add(new WildcardPermission(ROLE + ": ")); - permissions.add(new WildcardPermission(ROLE + ":\t")); permissions.add(new WildcardPermission("other:*:foo")); } return permissions; @@ -262,7 +260,7 @@ public Collection resolvePermissionsInRole(String roleString) { authorizationInfo.addStringPermission("\t"); authorizationInfo.addStringPermission(null); Collection permissions = realm.getPermissions(authorizationInfo); - assertThat(permissions).hasSize(4); + assertThat(permissions).hasSize(3); } private void assertArrayEquals(boolean[] expected, boolean[] actual) { From bf7885b0eda8c50aa2835345ad0fda4d8edd6218 Mon Sep 17 00:00:00 2001 From: lprimak Date: Thu, 12 Nov 2026 14:09:56 -0600 Subject: [PATCH 2/2] chore: modernize core/.../AuthorizingRealmTest and move slow ExecutorServiceSessionValidationSchedulerTest into IT --- .../shiro/realm/AuthorizingRealmTest.java | 45 ++++++++----------- ...rServiceSessionValidationSchedulerIT.java} | 2 +- 2 files changed, 19 insertions(+), 28 deletions(-) rename core/src/test/java/org/apache/shiro/session/mgt/{ExecutorServiceSessionValidationSchedulerTest.java => ExecutorServiceSessionValidationSchedulerIT.java} (98%) diff --git a/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java b/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java index 1dbfa07b6d..1a2025526f 100644 --- a/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java +++ b/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java @@ -40,7 +40,6 @@ import org.apache.shiro.authz.Permission; import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.authz.UnauthorizedException; -import org.apache.shiro.authz.permission.RolePermissionResolver; import org.apache.shiro.authz.permission.WildcardPermission; import org.apache.shiro.authz.permission.WildcardPermissionResolver; import org.apache.shiro.subject.ImmutablePrincipalCollection; @@ -51,8 +50,6 @@ import org.junit.jupiter.api.parallel.ResourceAccessMode; import org.junit.jupiter.api.parallel.ResourceLock; - - /** * Simple test case for AuthorizingRealm. *

@@ -139,10 +136,10 @@ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) Principal principal = new UsernamePrincipal("blah"); PrincipalCollection pCollection = ImmutablePrincipalCollection.ofSinglePrincipal(principal, "nullAuthzRealm"); - List permList = new ArrayList(); + List permList = new ArrayList<>(); permList.add(new WildcardPermission("stringPerm1")); permList.add(new WildcardPermission("stringPerm2")); - List roleList = new ArrayList(); + List roleList = new ArrayList<>(); roleList.add("role1"); roleList.add("role2"); @@ -212,17 +209,14 @@ void testRealmWithRolePermissionResolver() { "testRealmWithRolePermissionResolver"); AuthorizingRealm realm = new AllowAllRealm(); - realm.setRolePermissionResolver(new RolePermissionResolver() { - @Override - public Collection resolvePermissionsInRole(String roleString) { - Collection permissions = new HashSet(); - if (roleString.equals(ROLE)) { - permissions.add(new WildcardPermission(ROLE + ":perm1")); - permissions.add(new WildcardPermission(ROLE + ":perm2")); - permissions.add(new WildcardPermission("other:*:foo")); - } - return permissions; + realm.setRolePermissionResolver(roleString -> { + Collection permissions = new HashSet<>(); + if (roleString.equals(ROLE)) { + permissions.add(new WildcardPermission(ROLE + ":perm1")); + permissions.add(new WildcardPermission(ROLE + ":perm2")); + permissions.add(new WildcardPermission("other:*:foo")); } + return permissions; }); assertThat(realm.hasRole(pCollection, ROLE)).isTrue(); @@ -239,17 +233,14 @@ void testRealmWithEmptyOrNullPermissions() { "testRealmWithRolePermissionResolver"); AuthorizingRealm realm = new AllowAllRealm(); - realm.setRolePermissionResolver(new RolePermissionResolver() { - @Override - public Collection resolvePermissionsInRole(String roleString) { - Collection permissions = new HashSet(); - if (roleString.equals(ROLE)) { - permissions.add(new WildcardPermission(ROLE + ":perm1")); - permissions.add(new WildcardPermission(ROLE + ":perm2")); - permissions.add(new WildcardPermission("other:*:foo")); - } - return permissions; + realm.setRolePermissionResolver(roleString -> { + Collection permissions = new HashSet<>(); + if (roleString.equals(ROLE)) { + permissions.add(new WildcardPermission(ROLE + ":perm1")); + permissions.add(new WildcardPermission(ROLE + ":perm2")); + permissions.add(new WildcardPermission("other:*:foo")); } + return permissions; }); realm.setPermissionResolver(new WildcardPermissionResolver()); @@ -288,13 +279,13 @@ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - Set roles = new HashSet(); + Set roles = new HashSet<>(); roles.add(ROLE); return new SimpleAuthorizationInfo(roles); } protected AuthenticationInfo buildAuthenticationInfo(Object principal, Object credentials) { - Collection principals = new ArrayList(3); + Collection principals = new ArrayList<>(3); principals.add(new UserIdPrincipal(USER_ID)); principals.add(new UsernamePrincipal(USERNAME)); principals.add(USER_ID + USERNAME); diff --git a/core/src/test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerTest.java b/core/src/test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerIT.java similarity index 98% rename from core/src/test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerTest.java rename to core/src/test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerIT.java index 67cf39ba1a..d34597a831 100644 --- a/core/src/test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerTest.java +++ b/core/src/test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerIT.java @@ -28,7 +28,7 @@ import static org.awaitility.Awaitility.await; @SuppressWarnings("checkstyle:MagicNumber") -public class ExecutorServiceSessionValidationSchedulerTest { +public class ExecutorServiceSessionValidationSchedulerIT { ExecutorServiceSessionValidationScheduler executorServiceSessionValidationScheduler; DefaultSessionManager defaultSessionManager;