Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00
Code Issues Packages Projects Releases Activity

fix authentication bug in BasicSecurityContext

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-02-02 10:28:32 +01:00
parent 97e9a92a81
commit dc07d4aaa8
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scm-webapp/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
View File

@@ -46,6 +46,7 @@ import sonia.scm.group.Group;
import sonia.scm.group.GroupManager;
import sonia.scm.user.User;
import sonia.scm.user.UserManager;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
@@ -126,7 +127,7 @@ public class BasicSecurityContext implements WebSecurityContext
{
User dbUser = userManager.get(username);
if ((dbUser != null) && dbUser.copyProperties(user, false))
if ((dbUser != null) && user.copyProperties(dbUser, false))
{
userManager.modify(dbUser);
}
@@ -256,19 +257,28 @@ public class BasicSecurityContext implements WebSecurityContext
{
StringBuilder msg = new StringBuilder("user ");
msg.append(user.getName()).append(" is member of ");
msg.append(user.getName());
Iterator<String> groupIt = groups.iterator();
while (groupIt.hasNext())
if (Util.isNotEmpty(groups))
{
msg.append(groupIt.next());
msg.append(" is member of ");
if (groupIt.hasNext())
Iterator<String> groupIt = groups.iterator();
while (groupIt.hasNext())
{
msg.append(", ");
msg.append(groupIt.next());
if (groupIt.hasNext())
{
msg.append(", ");
}
}
}
else
{
msg.append(" is not a memeber of a group");
}
logger.debug(msg.toString());
}