You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2014/05/26 07:51:02 UTC

git commit: [KARAF-3001]RBAC - MBean Server RBAC guard should support wildcard role

Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x f1f2f1b5c -> cc031a963


[KARAF-3001]RBAC - MBean Server RBAC guard should support wildcard role


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cc031a96
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cc031a96
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cc031a96

Branch: refs/heads/karaf-2.x
Commit: cc031a963d9f642cae789ad4efc4c5a86b819b4e
Parents: f1f2f1b
Author: Freeman Fang <fr...@gmail.com>
Authored: Mon May 26 13:50:45 2014 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Mon May 26 13:50:45 2014 +0800

----------------------------------------------------------------------
 .../org/apache/karaf/management/KarafMBeanServerGuard.java     | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/cc031a96/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
----------------------------------------------------------------------
diff --git a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
index 3c5cb1f..109a3f9 100644
--- a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
+++ b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
@@ -47,6 +47,8 @@ import org.osgi.service.cm.ConfigurationAdmin;
 public class KarafMBeanServerGuard implements InvocationHandler {
 
     private static final String JMX_ACL_PID_PREFIX = "jmx.acl";
+    
+    private static final String ROLE_WILDCARD = "*";
 
     private ConfigurationAdmin configAdmin;
 
@@ -313,6 +315,10 @@ public class KarafMBeanServerGuard implements InvocationHandler {
     }
 
     static boolean currentUserHasRole(String requestedRole) {
+        if (ROLE_WILDCARD.equals(requestedRole)) {
+            return true;
+        }
+        
         String clazz;
         String role;
         int index = requestedRole.indexOf(':');