From 983d362eca91c32fcb3f7374ae7010ca8982ec9e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 24 Jun 2011 09:24:48 +0200
Subject: [PATCH] fix support for trusted domains, see #28

---
 .../auth/ActiveDirectoryAuthenticationHandler.java          | 6 ++++--
 .../src/main/resources/META-INF/scm/plugin.xml              | 1 +
 .../java/sonia/scm/web/security/BasicSecurityContext.java   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryAuthenticationHandler.java b/plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryAuthenticationHandler.java
index 8c0a715013..cf5ecfd612 100644
--- a/plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryAuthenticationHandler.java
+++ b/plugins/scm-activedirectory-auth-plugin/src/main/java/sonia/scm/activedirectory/auth/ActiveDirectoryAuthenticationHandler.java
@@ -278,10 +278,10 @@ public class ActiveDirectoryAuthenticationHandler
 
     if (index > 0)
     {
-      String domain = username.substring(0, index);
+      String domain = username.substring(0, index).toUpperCase();
 
       username = username.substring(index + 1);
-      add = domainMap.get(domain.toUpperCase());
+      add = domainMap.get(domain);
 
       if (add != null)
       {
@@ -456,6 +456,8 @@ public class ActiveDirectoryAuthenticationHandler
 
           if (Util.isNotEmpty(cn) && Util.isNotEmpty(dn))
           {
+            cn = cn.toUpperCase();
+
             if (logger.isInfoEnabled())
             {
               logger.info("found domain: {}, {}, {}", new Object[] { cn, dn,
diff --git a/plugins/scm-activedirectory-auth-plugin/src/main/resources/META-INF/scm/plugin.xml b/plugins/scm-activedirectory-auth-plugin/src/main/resources/META-INF/scm/plugin.xml
index 921bd41c82..e81c3284f8 100644
--- a/plugins/scm-activedirectory-auth-plugin/src/main/resources/META-INF/scm/plugin.xml
+++ b/plugins/scm-activedirectory-auth-plugin/src/main/resources/META-INF/scm/plugin.xml
@@ -48,6 +48,7 @@
     <os>
       <name>windows</name>
     </os>
+    <min-version>1.5</min-version>
   </conditions>
   
 </plugin>
diff --git a/scm-webapp/src/main/java/sonia/scm/web/security/BasicSecurityContext.java b/scm-webapp/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
index 733eefe0f7..1cbf49d620 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/security/BasicSecurityContext.java
@@ -125,7 +125,7 @@ public class BasicSecurityContext implements WebSecurityContext
 
       try
       {
-        User dbUser = userManager.get(username);
+        User dbUser = userManager.get(user.getName());
 
         if ((dbUser != null) && user.copyProperties(dbUser, false))
         {