[jboss-cvs] Picketbox SVN: r154 - trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2011-01-13 14:36:54 -0500 (Thu, 13 Jan 2011)
New Revision: 154

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java
Log:
SECURITY-552: tweaking parse option

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java	2011-01-13 19:16:36 UTC (rev 153)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java	2011-01-13 19:36:54 UTC (rev 154)
@@ -253,6 +253,8 @@
          try
          {
             String username = getUsername();
+            if (trace)
+               log.trace("Binding username: " + username);
             createLdapInitContext(username, null);
             defaultRole();
          }
@@ -680,9 +682,13 @@
          int beginIndex = 0;
          if (usernameBeginString != null && !usernameBeginString.equals(""))
             beginIndex = username.indexOf(usernameBeginString) + usernameBeginString.length();
+         if (beginIndex == -1) // not allowed. reset
+            beginIndex = 0;
          int endIndex = username.length();
          if (usernameEndString != null && !usernameEndString.equals(""))
-            endIndex = username.indexOf(usernameEndString);
+            endIndex = username.substring(beginIndex).indexOf(usernameEndString);
+         if (endIndex == -1) // not allowed. reset
+            endIndex = username.length();
          username = username.substring(beginIndex, endIndex);
       }
       return username;