Author: dcosse Date: 2014-06-18 12:38:34 +0200 (Wed, 18 Jun 2014) New Revision: 212 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/212 Log: ajout d'une dependance a postgresql + ajout d'un retour d'exception si la connexion au LDAP echoue a cause d'un utilisateur inconnu Modified: trunk/faxtomail-service/pom.xml trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-06-18 08:26:11 UTC (rev 211) +++ trunk/faxtomail-service/pom.xml 2014-06-18 10:38:34 UTC (rev 212) @@ -155,6 +155,11 @@ <groupId>com.unboundid</groupId> <artifactId>unboundid-ldapsdk</artifactId> </dependency> + + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> </dependencies> <build> Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-18 08:26:11 UTC (rev 211) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-18 10:38:34 UTC (rev 212) @@ -24,8 +24,6 @@ * #L% */ -import java.util.ArrayList; -import java.util.Collection; import java.util.List; import org.apache.commons.lang3.ArrayUtils; @@ -154,7 +152,7 @@ */ public FaxToMailUser authenticateUser(String login, String password) throws AuthenticationException { - FaxToMailUser result = null; + FaxToMailUser result; try { // first connexion to get full user login @@ -220,7 +218,7 @@ */ public FaxToMailUser getUserFromPrincipal(String principal) throws AuthenticationException { - FaxToMailUser result = null; + FaxToMailUser result; try { // first connexion to get full user login @@ -246,15 +244,18 @@ throw new AuthenticationException("Utilisateur inconnu : " + principal); } - // update in database - FaxToMailUser user = updateUserFormLdap(searchEntry, login); - getPersistenceContext().commit(); + if( searchEntry != null ) { + // update in database + FaxToMailUser user = updateUserFormLdap(searchEntry, login); + getPersistenceContext().commit(); - // return copy without sensible informations - Binder<FaxToMailUser, FaxToMailUser> faxToMailUserBinder = BinderFactory.newBinder(FaxToMailUser.class); - result = new FaxToMailUserImpl(); - faxToMailUserBinder.copyExcluding(user, result); - + // return copy without sensible informations + Binder<FaxToMailUser, FaxToMailUser> faxToMailUserBinder = BinderFactory.newBinder(FaxToMailUser.class); + result = new FaxToMailUserImpl(); + faxToMailUserBinder.copyExcluding(user, result); + } else { + throw new AuthenticationException("Utilisateur inconnu : " + principal); + } } catch (LDAPException ex) { if (log.isWarnEnabled()) { log.warn("Can't login to ldap", ex); @@ -274,7 +275,7 @@ */ protected FaxToMailUser updateUserFormLdap(SearchResultEntry searchEntry, String login) throws LDAPSearchException { - FaxToMailUser user = null; + FaxToMailUser user; // create or FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao();