You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/12/17 09:06:58 UTC
[3/6] isis git commit: ISIS-981: if no security manager is configured
(specifically this means,
if running in the fixtures during bootstrapping) then ALLOW the interaction,
rather than VETO it as previously.
ISIS-981: if no security manager is configured (specifically this means, if running in the fixtures during bootstrapping) then ALLOW the interaction, rather than VETO it as previously.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0417a915
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0417a915
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0417a915
Branch: refs/heads/master
Commit: 0417a9155516fe3852e5c41634ed3150c25c4d38
Parents: 649f168
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Dec 17 00:40:35 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Dec 17 00:40:35 2014 +0000
----------------------------------------------------------------------
.../isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0417a915/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
----------------------------------------------------------------------
diff --git a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
index 5241d18..0f27fbe 100644
--- a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
+++ b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
@@ -238,8 +238,9 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
private boolean isPermitted(Identifier identifier, String qualifier) {
RealmSecurityManager securityManager = getSecurityManager();
if(securityManager == null) {
- // cannot do permission checking if no security manager
- return false;
+ // since a security manager will always be present for regular web requests, presumably the user
+ // is running in fixtures during bootstrapping. We therefore permit the interaction.
+ return true;
}
String permission = asPermissionsString(identifier) + ":" + qualifier;