Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,24 @@ public AuthorizingAnnotationHandler(Class<? extends Annotation> 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({})}.
* <p/>
* 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<String> WARNED = ConcurrentHashMap.newKeySet();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
* <p/>
* 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
Expand Down
49 changes: 19 additions & 30 deletions core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -51,8 +50,6 @@
import org.junit.jupiter.api.parallel.ResourceAccessMode;
import org.junit.jupiter.api.parallel.ResourceLock;



/**
* Simple test case for AuthorizingRealm.
* <p/>
Expand Down Expand Up @@ -139,10 +136,10 @@ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)

Principal principal = new UsernamePrincipal("blah");
PrincipalCollection pCollection = ImmutablePrincipalCollection.ofSinglePrincipal(principal, "nullAuthzRealm");
List<Permission> permList = new ArrayList<Permission>();
List<Permission> permList = new ArrayList<>();
permList.add(new WildcardPermission("stringPerm1"));
permList.add(new WildcardPermission("stringPerm2"));
List<String> roleList = new ArrayList<String>();
List<String> roleList = new ArrayList<>();
roleList.add("role1");
roleList.add("role2");

Expand Down Expand Up @@ -212,17 +209,14 @@ void testRealmWithRolePermissionResolver() {
"testRealmWithRolePermissionResolver");

AuthorizingRealm realm = new AllowAllRealm();
realm.setRolePermissionResolver(new RolePermissionResolver() {
@Override
public Collection<Permission> resolvePermissionsInRole(String roleString) {
Collection<Permission> permissions = new HashSet<Permission>();
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<Permission> 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();
Expand All @@ -239,19 +233,14 @@ void testRealmWithEmptyOrNullPermissions() {
"testRealmWithRolePermissionResolver");

AuthorizingRealm realm = new AllowAllRealm();
realm.setRolePermissionResolver(new RolePermissionResolver() {
@Override
public Collection<Permission> resolvePermissionsInRole(String roleString) {
Collection<Permission> permissions = new HashSet<Permission>();
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;
realm.setRolePermissionResolver(roleString -> {
Collection<Permission> 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());
Expand All @@ -262,7 +251,7 @@ public Collection<Permission> resolvePermissionsInRole(String roleString) {
authorizationInfo.addStringPermission("\t");
authorizationInfo.addStringPermission(null);
Collection<Permission> permissions = realm.getPermissions(authorizationInfo);
assertThat(permissions).hasSize(4);
assertThat(permissions).hasSize(3);
}

private void assertArrayEquals(boolean[] expected, boolean[] actual) {
Expand Down Expand Up @@ -290,13 +279,13 @@ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)

@Override
protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
Set<String> roles = new HashSet<String>();
Set<String> roles = new HashSet<>();
roles.add(ROLE);
return new SimpleAuthorizationInfo(roles);
}

protected AuthenticationInfo buildAuthenticationInfo(Object principal, Object credentials) {
Collection<Object> principals = new ArrayList<Object>(3);
Collection<Object> principals = new ArrayList<>(3);
principals.add(new UserIdPrincipal(USER_ID));
principals.add(new UsernamePrincipal(USERNAME));
principals.add(USER_ID + USERNAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import static org.awaitility.Awaitility.await;

@SuppressWarnings("checkstyle:MagicNumber")
public class ExecutorServiceSessionValidationSchedulerTest {
public class ExecutorServiceSessionValidationSchedulerIT {

ExecutorServiceSessionValidationScheduler executorServiceSessionValidationScheduler;
DefaultSessionManager defaultSessionManager;
Expand Down
Loading