From f7971ca3239a9615753e3805f33f60f3259a1b80 Mon Sep 17 00:00:00 2001
From: Nils Schwabe
Date: Mon, 5 May 2014 14:37:33 +0200
Subject: Removed todo from LDAPUser

---
 .../java/org/openslx/imagemaster/db/LdapUser.java    | 20 ++++++--------------
 .../openslx/imagemaster/session/Authenticator.java   |  2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'src/main/java/org/openslx')

diff --git a/src/main/java/org/openslx/imagemaster/db/LdapUser.java b/src/main/java/org/openslx/imagemaster/db/LdapUser.java
index a38b805..a887640 100644
--- a/src/main/java/org/openslx/imagemaster/db/LdapUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/LdapUser.java
@@ -2,18 +2,12 @@ package org.openslx.imagemaster.db;
 
 import java.io.File;
 import java.io.IOException;
-import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
-import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
 
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
 
 import org.apache.directory.api.ldap.model.cursor.CursorException;
 import org.apache.directory.api.ldap.model.cursor.EntryCursor;
@@ -54,7 +48,7 @@ public class LdapUser extends User
 	 * Query LDAP for user with given login
 	 * 
 	 * @param login Login of user in the form "user@organization.com"
-	 * @return instance of LDAPUser for matching entry from LDAP
+	 * @return instance of LDAPUser for matching entry from LDAP or null if sth went wrong
 	 */
 	public static LdapUser forLogin( final String login, final String password ) throws AuthenticationException
 	{
@@ -68,18 +62,16 @@ public class LdapUser extends User
 		try {
 			LdapConnectionConfig config = new LdapConnectionConfig();
 
-			// TODO: Load from configuration file
-
 			String ldapHost = Globals.getPropertyString( PropString.LDAPHOST );
-			log.info( "Setting host... " + ldapHost );
+			log.debug( "Setting host... " + ldapHost );
 			config.setLdapHost( ldapHost );
 			
 			boolean useSsl = Globals.getPropertyBool( PropBool.LDAPSSL );
-			log.info( "Setting use ssl... " + useSsl);
+			log.debug( "Setting use ssl... " + useSsl);
 			config.setUseSsl( useSsl );
 			
 			int ldapPort = Globals.getPropertyInt( PropInt.LDAPPORT );
-			log.info( "Setting port... " + ldapPort );
+			log.debug( "Setting port... " + ldapPort );
 			config.setLdapPort( ldapPort );
 
 			// load keystore ...
@@ -96,11 +88,11 @@ public class LdapUser extends User
 
 			connection = new LdapNetworkConnection( config );
 		
-			log.info( "Trying to bind..." );
+			log.debug( "Trying to bind..." );
 			String bind = Globals.getPropertyString( PropString.LDAPBINDQUERY ).replace( "%", login );
 			connection.bind( bind, password );
 			//connection.bind();
-			log.info( "Bind successful" );
+			log.debug( "Bind successful" );
 			
 			
 			// make search query
diff --git a/src/main/java/org/openslx/imagemaster/session/Authenticator.java b/src/main/java/org/openslx/imagemaster/session/Authenticator.java
index aaaa7d7..9924caf 100644
--- a/src/main/java/org/openslx/imagemaster/session/Authenticator.java
+++ b/src/main/java/org/openslx/imagemaster/session/Authenticator.java
@@ -30,7 +30,7 @@ public class Authenticator
 		LdapUser user = LdapUser.forLogin( username, password ); // throws exception if credentials are invalid
 		if ( user == null ) {
 			log.debug( "Login failed: " + username );
-			throw new AuthenticationException( AuthenticationError.INVALID_CREDENTIALS, "Invalid username or password!" );
+			throw new AuthenticationException( AuthenticationError.GENERIC_ERROR, "Could not login because of a weird error." );
 		}
 		log.debug( "Login succesful: " + username );
 
-- 
cgit v1.2.3-55-g7522