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/07/18 07:27:41 UTC
[52/52] git commit: ISIS-840: fix perm group stuff for IsisPermission
ISIS-840: fix perm group stuff for IsisPermission
Also (commented out) updates to the todoapp example.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2772d876
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2772d876
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2772d876
Branch: refs/heads/master
Commit: 2772d87671fdea08428f00d6823e264c9c44406e
Parents: 41cbf8d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 17 13:42:09 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 17 13:48:33 2014 +0100
----------------------------------------------------------------------
.../shiro/authorization/IsisPermission.java | 28 +++++++++++++++-----
.../IsisPermissionTest_equals.java | 19 +++++++++++++
.../webapp/src/main/resources/webapp/realm1.ini | 26 ++++++++++++++++++
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 10 +++++++
4 files changed, 76 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2772d876/core/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
----------------------------------------------------------------------
diff --git a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
index 5a546ff..81afdd2 100644
--- a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
+++ b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
@@ -22,12 +22,10 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.authz.permission.WildcardPermission;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.authz.permission.WildcardPermission;
public class IsisPermission extends WildcardPermission {
@@ -42,7 +40,7 @@ public class IsisPermission extends WildcardPermission {
IsisPermission.VETOING_PERMISSIONS.get().clear();
}
- public static boolean isVetoed(String permissionGroup, Permission p) {
+ static boolean isVetoed(String permissionGroup, Permission p) {
if(permissionGroup == null) {
return false;
}
@@ -58,7 +56,7 @@ public class IsisPermission extends WildcardPermission {
return false;
}
- public static void addVeto(IsisPermission vetoingPermission) {
+ static void addVeto(IsisPermission vetoingPermission) {
String permissionGroup = vetoingPermission.getPermissionGroup();
List<IsisPermission> vetoingPermissions = IsisPermission.VETOING_PERMISSIONS.get().get(permissionGroup);
if(vetoingPermissions == null) {
@@ -111,7 +109,23 @@ public class IsisPermission extends WildcardPermission {
String getPermissionGroup() {
return permissionGroup;
}
-
+
+
+ @Override
+ public boolean equals(Object other) {
+ if (other instanceof IsisPermission) {
+ IsisPermission ip = (IsisPermission) other;
+ return permissionGroup.equals(ip.getPermissionGroup()) && super.equals(other);
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ // good enough
+ return super.hashCode();
+ }
+
@Override
public String toString() {
return (veto?"!":"") + (permissionGroup != null? permissionGroup + "/": "") + super.toString();
http://git-wip-us.apache.org/repos/asf/isis/blob/2772d876/core/security-shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
----------------------------------------------------------------------
diff --git a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
new file mode 100644
index 0000000..e4194fe
--- /dev/null
+++ b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
@@ -0,0 +1,19 @@
+package org.apache.isis.security.shiro.authorization;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+
+public class IsisPermissionTest_equals {
+
+ @Test
+ public void differentByPermGroup() throws Exception {
+ final IsisPermission perm1 = new IsisPermission("adm/*");
+ final IsisPermission perm2 = new IsisPermission("aba/*");
+
+ Assert.assertThat(perm1.equals(perm2), is(false));
+ }
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/2772d876/example/application/todoapp/webapp/src/main/resources/webapp/realm1.ini
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/resources/webapp/realm1.ini b/example/application/todoapp/webapp/src/main/resources/webapp/realm1.ini
index 13246ad..311694b 100644
--- a/example/application/todoapp/webapp/src/main/resources/webapp/realm1.ini
+++ b/example/application/todoapp/webapp/src/main/resources/webapp/realm1.ini
@@ -38,6 +38,18 @@ bob = pass, user_role, self-install_role
+#
+# some additional users/roles
+# require IsisPermissionResolver to be configured in shiro.ini, and
+# require additional role/perms to be configured below in [roles]
+#
+
+# # fred should have access to everything except the analysis features
+# fred = pass,isisperms_all_but_analysis_role
+# # bill should have access to everything (the admin role 'trumps' the vetos)
+# bill = pass,isisperms_all_but_analysis_role,isisperms_admin_role
+
+
# -----------------------------------------------------------------------------
# Roles with assigned permissions
#
@@ -66,3 +78,17 @@ analysis_role = *:ToDoItemAnalysis:*:*,\
self-install_role = *:ToDoItemsFixturesService:installFixtures:*
admin_role = *
+
+
+
+#
+# some additional role/perms
+# require IsisPermissionResolver to be configured in shiro.ini
+#
+
+# isisperms_all_but_analysis_role = aba/*,\
+# !aba/*:ToDoItemAnalysis:*,\
+# !aba/*:ToDoItemsByCategoryViewModel:*:*,\
+# !aba/*:ToDoItemsByDateRangeViewModel:*:*
+# isisperms_admin_role = adm/*
+
http://git-wip-us.apache.org/repos/asf/isis/blob/2772d876/example/application/todoapp/webapp/src/main/webapp/WEB-INF/shiro.ini
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/shiro.ini b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/shiro.ini
index 2263069..8c5f7d3 100644
--- a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/shiro.ini
+++ b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/shiro.ini
@@ -84,6 +84,16 @@ securityManager.realms = $realm1,$realm2
+#######
+# optional, configure realm(s) to use Isis' extended permission syntax
+# (see webapp/realm1.ini for usage)
+#######
+
+# permissionResolver = org.apache.isis.security.shiro.authorization.IsisPermissionResolver
+# realm1.permissionResolver = $permissionResolver
+# realm2.permissionResolver = $permissionResolver
+
+
# -----------------------------------------------------------------------------
# Users and their assigned roles
# -----------------------------------------------------------------------------