You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2013/12/05 20:40:14 UTC

svn commit: r1548255 - /karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java

Author: janstey
Date: Thu Dec  5 19:40:14 2013
New Revision: 1548255

URL: http://svn.apache.org/r1548255
Log:
KARAF-2607 - PropertiesBackingEngine allows duplicate roles to be assigned to user

Modified:
    karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java

Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java?rev=1548255&r1=1548254&r2=1548255&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java Thu Dec  5 19:40:14 2013
@@ -152,6 +152,11 @@ public class PropertiesBackingEngine imp
     public void addRole(String username, String role) {
         String userInfos = (String) users.get(username);
         if (userInfos != null) {
+            for (RolePrincipal rp : listRoles(username)) {
+                if (role.equals(rp.getName())) {
+                    return; 
+                }
+            }
             String newUserInfos = userInfos + "," + role;
             users.put(username, newUserInfos);
         }