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/19 10:01:20 UTC
git commit: [KARAF-2980]strip off tabs/spaces around role|group names
(cherry picked from commit a27ef6cd32d84a999bbe601b835192fde4516dca)
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 64278398a -> f6aca0c29
[KARAF-2980]strip off tabs/spaces around role|group names
(cherry picked from commit a27ef6cd32d84a999bbe601b835192fde4516dca)
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f6aca0c2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f6aca0c2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f6aca0c2
Branch: refs/heads/karaf-3.0.x
Commit: f6aca0c295323aa4824db0f07b766a659b85c73b
Parents: 6427839
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu May 15 18:41:36 2014 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Mon May 19 11:02:36 2014 +0800
----------------------------------------------------------------------
.../jaas/modules/properties/PropertiesLoginModule.java | 10 +++++-----
.../jaas/modules/publickey/PublickeyLoginModule.java | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f6aca0c2/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
index c11d54a..45c36f8 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
@@ -149,19 +149,19 @@ public class PropertiesLoginModule extends AbstractKarafLoginModule {
principals = new HashSet<Principal>();
principals.add(new UserPrincipal(user));
for (int i = 1; i < infos.length; i++) {
- if (infos[i].startsWith(PropertiesBackingEngine.GROUP_PREFIX)) {
+ if (infos[i].trim().startsWith(PropertiesBackingEngine.GROUP_PREFIX)) {
// it's a group reference
- principals.add(new GroupPrincipal(infos[i].substring(PropertiesBackingEngine.GROUP_PREFIX.length())));
- String groupInfo = (String) users.get(infos[i]);
+ principals.add(new GroupPrincipal(infos[i].trim().substring(PropertiesBackingEngine.GROUP_PREFIX.length())));
+ String groupInfo = (String) users.get(infos[i].trim());
if (groupInfo != null) {
String[] roles = groupInfo.split(",");
for (int j = 1; j < roles.length; j++) {
- principals.add(new RolePrincipal(roles[j]));
+ principals.add(new RolePrincipal(roles[j].trim()));
}
}
} else {
// it's an user reference
- principals.add(new RolePrincipal(infos[i]));
+ principals.add(new RolePrincipal(infos[i].trim()));
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/f6aca0c2/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
index 54ff0a5..310e39b 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
@@ -122,19 +122,19 @@ public class PublickeyLoginModule extends AbstractKarafLoginModule {
principals = new HashSet<Principal>();
principals.add(new UserPrincipal(user));
for (int i = 1; i < infos.length; i++) {
- if (infos[i].startsWith(PropertiesBackingEngine.GROUP_PREFIX)) {
+ if (infos[i].trim().startsWith(PropertiesBackingEngine.GROUP_PREFIX)) {
// it's a group reference
- principals.add(new GroupPrincipal(infos[i].substring(PropertiesBackingEngine.GROUP_PREFIX.length())));
- String groupInfo = (String) users.get(infos[i]);
+ principals.add(new GroupPrincipal(infos[i].trim().substring(PropertiesBackingEngine.GROUP_PREFIX.length())));
+ String groupInfo = (String) users.get(infos[i].trim());
if (groupInfo != null) {
String[] roles = groupInfo.split(",");
for (int j = 1; j < roles.length; j++) {
- principals.add(new RolePrincipal(roles[j]));
+ principals.add(new RolePrincipal(roles[j].trim()));
}
}
} else {
// it's an user reference
- principals.add(new RolePrincipal(infos[i]));
+ principals.add(new RolePrincipal(infos[i].trim()));
}
}