Repository: karaf Updated Branches: refs/heads/karaf-2.x 397477b9d -> 2a25ee3df
[KARAF-3022]RBAC - support the JMX operation match starts with a wildcard Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2a25ee3d Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2a25ee3d Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2a25ee3d Branch: refs/heads/karaf-2.x Commit: 2a25ee3dfed970bfb253011dddc9e693e8bc82a2 Parents: 397477b Author: Freeman Fang <[email protected]> Authored: Fri Jun 6 15:57:04 2014 +0800 Committer: Freeman Fang <[email protected]> Committed: Fri Jun 6 15:57:04 2014 +0800 ---------------------------------------------------------------------- .../management/tools/ACLConfigurationParser.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/2a25ee3d/management/server/src/main/java/org/apache/karaf/management/tools/ACLConfigurationParser.java ---------------------------------------------------------------------- diff --git a/management/server/src/main/java/org/apache/karaf/management/tools/ACLConfigurationParser.java b/management/server/src/main/java/org/apache/karaf/management/tools/ACLConfigurationParser.java index ab291e2..7d63f0e 100644 --- a/management/server/src/main/java/org/apache/karaf/management/tools/ACLConfigurationParser.java +++ b/management/server/src/main/java/org/apache/karaf/management/tools/ACLConfigurationParser.java @@ -283,12 +283,21 @@ public class ACLConfigurationParser { for (Enumeration<String> e = properties.keys(); e.hasMoreElements(); ) { String key = e.nextElement(); if (key.endsWith("*")) { - String str = key.substring(0, key.length() - 1); - if (str.startsWith("*")) { - str = str.substring(1); + String prefix = key.substring(0, key.length() - 1); + if (methodName.startsWith(prefix)) { + wildcardRules.put(prefix, properties.get(key).toString()); } - if (methodName.contains(str)) { - wildcardRules.put(str, properties.get(key).toString()); + } + if (key.startsWith("*")) { + String suffix = key.substring(1); + if (methodName.endsWith(suffix)) { + wildcardRules.put(suffix, properties.get(key).toString()); + } + } + if (key.startsWith("*") && key.endsWith("*") && key.length() > 1) { + String middle = key.substring(1, key.length() - 1); + if (methodName.contains(middle)) { + wildcardRules.put(middle, properties.get(key).toString()); } } }
