diff options
author | Nils Schwabe | 2014-04-23 15:00:19 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-04-23 15:00:19 +0200 |
commit | ed9dca193a8ad68681393ea79c96bc84b6444639 (patch) | |
tree | 9533c1764de6864b8f8087995799d059072daf2c /src/main/java/org/openslx/imagemaster/db/LdapUser.java | |
parent | Fixed something (diff) | |
download | masterserver-ed9dca193a8ad68681393ea79c96bc84b6444639.tar.gz masterserver-ed9dca193a8ad68681393ea79c96bc84b6444639.tar.xz masterserver-ed9dca193a8ad68681393ea79c96bc84b6444639.zip |
Fix some issues with FtpCredentialsScheduler
Add some options to config file
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/LdapUser.java')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/db/LdapUser.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/LdapUser.java b/src/main/java/org/openslx/imagemaster/db/LdapUser.java index 1124696..0a18565 100644 --- a/src/main/java/org/openslx/imagemaster/db/LdapUser.java +++ b/src/main/java/org/openslx/imagemaster/db/LdapUser.java @@ -15,6 +15,8 @@ import org.apache.directory.ldap.client.api.LdapConnectionConfig; import org.apache.directory.ldap.client.api.LdapNetworkConnection; import org.apache.log4j.Logger; import org.openslx.imagemaster.Globals; +import org.openslx.imagemaster.Globals.PropBool; +import org.openslx.imagemaster.Globals.PropString; import org.openslx.imagemaster.session.User; import org.openslx.imagemaster.thrift.iface.AuthenticationError; import org.openslx.imagemaster.thrift.iface.AuthenticationException; @@ -73,16 +75,16 @@ public class LdapUser extends User LdapConnectionConfig ldapConfig = new LdapConnectionConfig(); ldapConfig.setTrustManagers(new MyTrustManager()); - ldapConfig.setLdapPort(Integer.valueOf(Globals.properties.getProperty(Globals.ldapPort))); - ldapConfig.setLdapHost(Globals.properties.getProperty(Globals.ldapHost)); - ldapConfig.setUseSsl(Boolean.valueOf(Globals.properties.getProperty(Globals.ldapSsl))); + ldapConfig.setLdapPort(Globals.getPropertyInt( Globals.PropInt.LDAPPORT )); + ldapConfig.setLdapHost(Globals.getPropertyString( Globals.PropString.LDAPHOST )); + ldapConfig.setUseSsl(Globals.getPropertyBool( PropBool.LDAPSSL )); LdapNetworkConnection connection = new LdapNetworkConnection( ldapConfig ); // bind connection try { if ( connection.connect() ) { - String name = Globals.properties.getProperty(Globals.ldapBindQuery).replace("%", username); + String name = Globals.getPropertyString( PropString.LDAPBINDQUERY ).replace("%", username); connection.bind(name, password); } } catch (LdapException e1) { @@ -112,8 +114,8 @@ public class LdapUser extends User // make search query try { - EntryCursor cursor = connection.search(Globals.properties.getProperty(Globals.ldapSearchBaseDn), - Globals.properties.getProperty(Globals.ldapSearchFilter).replace("%", username), SearchScope.SUBTREE); + EntryCursor cursor = connection.search(Globals.getPropertyString( Globals.PropString.LDAPSEARCHBASEDN ), + Globals.getPropertyString( Globals.PropString.LDAPSEARCHFILTER ).replace("%", username), SearchScope.SUBTREE); // only use the first result cursor.next(); Entry entry = cursor.get(); |