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

fix support for trusted domains, see #28

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-06-24 09:24:48 +02:00
parent cc161e7fd3
commit 983d362eca
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryAuthenticationHandler.java
View File

@@ -278,10 +278,10 @@ public class ActiveDirectoryAuthenticationHandler
if (index > 0) if (index > 0)
{ {
String domain = username.substring(0, index); String domain = username.substring(0, index).toUpperCase();
username = username.substring(index + 1); username = username.substring(index + 1);
add = domainMap.get(domain.toUpperCase()); add = domainMap.get(domain);
if (add != null) if (add != null)
{ {
@@ -456,6 +456,8 @@ public class ActiveDirectoryAuthenticationHandler
if (Util.isNotEmpty(cn) && Util.isNotEmpty(dn)) if (Util.isNotEmpty(cn) && Util.isNotEmpty(dn))
{ {
cn = cn.toUpperCase();
if (logger.isInfoEnabled()) if (logger.isInfoEnabled())
{ {
logger.info("found domain: {}, {}, {}", new Object[] { cn, dn, logger.info("found domain: {}, {}, {}", new Object[] { cn, dn,

1
plugins/scm-activedirectory-auth-plugin/src/main/resources/META-INF/scm/plugin.xml
View File

@@ -48,6 +48,7 @@
<os> <os>
<name>windows</name> <name>windows</name>
</os> </os>
<min-version>1.5</min-version>
</conditions> </conditions>
</plugin> </plugin>

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

@@ -125,7 +125,7 @@ public class BasicSecurityContext implements WebSecurityContext
try try
{ {
User dbUser = userManager.get(username); User dbUser = userManager.get(user.getName());
if ((dbUser != null) && user.copyProperties(dbUser, false)) if ((dbUser != null) && user.copyProperties(dbUser, false))
{ {