From c67e45126d11e38ae872df9daed748db32595d36 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Fri, 28 Jun 2013 14:33:23 +0200
Subject: [PATCH] Some simple modifications to work with embedded LDAP server
---
.../java/de/thm/arsnova/controller/LoginController.java | 6 ++++--
src/main/resources/test.ldif | 8 ++++++--
src/main/webapp/WEB-INF/spring/spring-security.xml | 2 +-
src/main/webapp/arsnova.properties.example | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index d67551bd4..47ec7823d 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 f0a60c365..54bc2b1fb 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 44b264851..141985182 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 8d6516561..4e4a13edb 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"
--
GitLab