diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java index d67551bd43c4716339e12b3b8fdda6ea30e051ff..47ec7823d9a0c15505715fb7db10125d42cbbb35 100644 --- a/src/main/java/de/thm/arsnova/controller/LoginController.java +++ b/src/main/java/de/thm/arsnova/controller/LoginController.java @@ -175,11 +175,13 @@ public class LoginController extends AbstractController { Authentication token = new UsernamePasswordAuthenticationToken(user, password, getAuthorities()); try { - ldapAuthenticationProvider.authenticate(token); + Authentication auth = ldapAuthenticationProvider.authenticate(token); + LOGGER.info("LDAPLOGIN: {}", auth.isAuthenticated()); return new RedirectView(referer + "#auth/checkLogin"); } catch (AuthenticationException e) { - e.printStackTrace(); + LOGGER.info("No LDAP login: {}", e); + return new RedirectView("/login.html"); } } return null; diff --git a/src/main/resources/test.ldif b/src/main/resources/test.ldif index f0a60c365b38d3589649a507818bac4b8701500d..54bc2b1fbbf12326ce0a581f33b83524600afaf6 100644 --- a/src/main/resources/test.ldif +++ b/src/main/resources/test.ldif @@ -3,7 +3,11 @@ objectclass: organization objectclass: top o: Dummy Organisation -dn: uid=ptsr00, dc=example, dc=com +dn: ou=people, dc=example, dc=com +objectclass: organizationalunit +ou: people + +dn: uid=ptsr00, ou=people, dc=example, dc=com objectclass: person objectclass: organizationalperson objectclass: inetorgperson @@ -12,7 +16,7 @@ sn: Tester givenName: Patrick userPassword:: VGVzdA== -dn: uid=ptsr01, dc=example, dc=com +dn: uid=ptsr01, ou=people, dc=example, dc=com objectclass: person objectclass: organizationalperson objectclass: inetorgperson diff --git a/src/main/webapp/WEB-INF/spring/spring-security.xml b/src/main/webapp/WEB-INF/spring/spring-security.xml index 44b2648515a434a9c73771a10598ce7f3c932e19..1419851821e20e47bc85fa3a44cdc925c4c2aec4 100644 --- a/src/main/webapp/WEB-INF/spring/spring-security.xml +++ b/src/main/webapp/WEB-INF/spring/spring-security.xml @@ -30,7 +30,7 @@ <!-- ######################### LDAP ############################# --> <!-- <security:ldap-server url="${security.ldap.url}" /> --> - <security:ldap-server ldif="classpath:/test.ldif" /> + <security:ldap-server ldif="classpath:/test.ldif" root="dc=example,dc=com" /> <bean id="loginUrlAuthenticationEntryPoint" class="org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint"> diff --git a/src/main/webapp/arsnova.properties.example b/src/main/webapp/arsnova.properties.example index 8d6516561529b73c3586f8f0b666e9a4f6b8f5a0..4e4a13edb3a7208c75d1bcb1c08f0edddbfa01fb 100644 --- a/src/main/webapp/arsnova.properties.example +++ b/src/main/webapp/arsnova.properties.example @@ -10,7 +10,7 @@ security.twitter.secret=mC0HOvxiEgqwdDWCcDoy3q75nUQPu1bYRp1ncHWGd0 security.google.key=110959746118.apps.googleusercontent.com security.google.secret=CkzUJZswY8rjWCCYnHVovyGA -security.ldap.url=ldap://example.com:389/dc=example,dc=com +security.ldap.url=ldap://example.com:33389/dc=example,dc=com security.ldap.user-search-filter=(uid={0}) security.ldap.user-search-base="ou=people"