diff options
| author | Nils Schwabe | 2014-04-28 18:18:59 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-04-28 18:18:59 +0200 |
| commit | 287ad92152c530b400a5405a4672a41d92e4d368 (patch) | |
| tree | 42dcb2c698672ae371d70a81ea5c49f3280db9c6 /src/main/java/org/openslx/imagemaster/db/LdapUser.java | |
| parent | Add remove image from process list (when user gets deleted after timeout) (diff) | |
| download | masterserver-287ad92152c530b400a5405a4672a41d92e4d368.tar.gz masterserver-287ad92152c530b400a5405a4672a41d92e4d368.tar.xz masterserver-287ad92152c530b400a5405a4672a41d92e4d368.zip | |
Add ftp users and images in processing list are remembered
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/LdapUser.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/db/LdapUser.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/LdapUser.java b/src/main/java/org/openslx/imagemaster/db/LdapUser.java index 08eb127..deb30f3 100644 --- a/src/main/java/org/openslx/imagemaster/db/LdapUser.java +++ b/src/main/java/org/openslx/imagemaster/db/LdapUser.java @@ -80,7 +80,6 @@ public class LdapUser extends User String[] temp = login.split( "@" ); if ( temp.length != 2 ) throw new AuthenticationException( AuthenticationError.GENERIC_ERROR, "Login must be in form user@organization.com" ); - username = temp[0]; LdapConnectionConfig ldapConfig = new LdapConnectionConfig(); ldapConfig.setTrustManagers( new MyTrustManager() ); @@ -93,7 +92,8 @@ public class LdapUser extends User // bind connection try { if ( connection.connect() ) { - String name = Globals.getPropertyString( PropString.LDAPBINDQUERY ).replace( "%", username ); + String name = Globals.getPropertyString( PropString.LDAPBINDQUERY ).replace( "%", login ).replace( "@", "\\40" ); + log.info( "Bind with: " + name ); connection.bind( name, password ); } } catch ( LdapException e1 ) { @@ -124,11 +124,11 @@ public class LdapUser extends User // make search query try { EntryCursor cursor = connection.search( Globals.getPropertyString( Globals.PropString.LDAPSEARCHBASEDN ), - Globals.getPropertyString( Globals.PropString.LDAPSEARCHFILTER ).replace( "%", username ), SearchScope.SUBTREE ); + Globals.getPropertyString( Globals.PropString.LDAPSEARCHFILTER ).replace( "%", login ), SearchScope.SUBTREE ); // only use the first result cursor.next(); Entry entry = cursor.get(); - username = entry.get( "uid" ).getString(); + username = entry.get( "cn" ).getString(); organization = "Test Organization"; // will be filled with bwIDM LDAP server firstName = entry.get( "givenName" ).getString(); lastName = entry.get( "sn" ).getString(); |