Skip to content

Commit 809554d

Browse files
committed
LDAP working - MVC needs fixing
1 parent 0559311 commit 809554d

File tree

10 files changed

+142
-111
lines changed

10 files changed

+142
-111
lines changed

spring-security-mvc-ldap/pom.xml

Lines changed: 57 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,16 @@
77

88
<name>spring-security-mvc-ldap</name>
99
<packaging>war</packaging>
10+
11+
<parent>
12+
<groupId>org.springframework.boot</groupId>
13+
<artifactId>spring-boot-starter-parent</artifactId>
14+
<version>1.1.1.RELEASE</version>
15+
</parent>
1016

1117
<dependencies>
1218

1319
<!-- Spring Security -->
14-
1520
<dependency>
1621
<groupId>org.springframework.security</groupId>
1722
<artifactId>spring-security-web</artifactId>
@@ -30,10 +35,10 @@
3035
<artifactId>spring-core</artifactId>
3136
<version>${org.springframework.version}</version>
3237
<exclusions>
33-
<exclusion>
34-
<artifactId>commons-logging</artifactId>
35-
<groupId>commons-logging</groupId>
36-
</exclusion>
38+
<exclusion>
39+
<artifactId>commons-logging</artifactId>
40+
<groupId>commons-logging</groupId>
41+
</exclusion>
3742
</exclusions>
3843
</dependency>
3944
<dependency>
@@ -78,6 +83,52 @@
7883
<version>${org.springframework.version}</version>
7984
</dependency>
8085

86+
87+
88+
89+
<dependency>
90+
<groupId>org.springframework.boot</groupId>
91+
<artifactId>spring-boot-starter-web</artifactId>
92+
<version>1.1.1.RELEASE</version>
93+
</dependency>
94+
95+
<dependency>
96+
<groupId>org.springframework.security</groupId>
97+
<artifactId>spring-security-ldap</artifactId>
98+
<version>3.2.4.RELEASE</version>
99+
</dependency>
100+
101+
<dependency>
102+
<groupId>org.springframework.ldap</groupId>
103+
<artifactId>spring-ldap-core</artifactId>
104+
<version>2.0.2.RELEASE</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.springframework.ldap</groupId>
108+
<artifactId>spring-ldap-core-tiger</artifactId>
109+
<version>2.0.2.RELEASE</version>
110+
</dependency>
111+
112+
<dependency>
113+
<!-- Is the ApacheDS server; as noted above, 1.5.6 and 1.5.7 don't work -->
114+
<groupId>org.apache.directory.server</groupId>
115+
<artifactId>apacheds-server-jndi</artifactId>
116+
<version>1.5.5</version>
117+
</dependency>
118+
<dependency>
119+
<!-- Required by ApacheDS, but not listed in its POM -->
120+
<groupId>commons-collections</groupId>
121+
<artifactId>commons-collections</artifactId>
122+
<version>3.2.1</version>
123+
</dependency>
124+
<dependency>
125+
<groupId>org.apache.mina</groupId>
126+
<artifactId>mina-core</artifactId>
127+
<version>2.0.7</version>
128+
</dependency>
129+
130+
131+
81132
<!-- web -->
82133

83134
<dependency>
@@ -126,7 +177,7 @@
126177
<artifactId>log4j-over-slf4j</artifactId>
127178
<version>${org.slf4j.version}</version>
128179
</dependency>
129-
180+
130181
<!-- test scoped -->
131182

132183
<dependency>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package org.baeldung.controller;
2+
3+
import org.springframework.stereotype.Controller;
4+
import org.springframework.web.bind.annotation.RequestMapping;
5+
import org.springframework.web.bind.annotation.ResponseBody;
6+
7+
@Controller
8+
public class HomeController {
9+
10+
@RequestMapping("/homepage.html")
11+
public @ResponseBody String index() {
12+
return "homepage";
13+
}
14+
}
15+

spring-security-mvc-ldap/src/main/java/org/baeldung/security/basic/MyBasicAuthenticationEntryPoint.java

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package org.baeldung.spring;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
5+
import org.springframework.context.annotation.ComponentScan;
6+
import org.springframework.context.annotation.Configuration;
7+
8+
@Configuration
9+
@ComponentScan
10+
@EnableAutoConfiguration
11+
public class Application {
12+
13+
public static void main(String[] args) {
14+
SpringApplication.run(Application.class, args);
15+
}
16+
17+
}

spring-security-mvc-ldap/src/main/java/org/baeldung/spring/MvcConfig.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

spring-security-mvc-ldap/src/main/java/org/baeldung/spring/SecSecurityConfig.java

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package org.baeldung.spring;
2+
3+
import org.springframework.context.annotation.Configuration;
4+
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
5+
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
6+
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
7+
8+
@Configuration
9+
@EnableWebMvcSecurity
10+
public class SecurityConfig extends WebSecurityConfigurerAdapter {
11+
12+
@Override
13+
protected void configure(AuthenticationManagerBuilder auth)
14+
throws Exception {
15+
16+
auth.ldapAuthentication()
17+
.userSearchBase("ou=people")
18+
.userSearchFilter("(uid={0})")
19+
.groupSearchBase("ou=groups")
20+
.groupSearchFilter("member={0}")
21+
.contextSource()
22+
.root("dc=baeldung,dc=com")
23+
.ldif("classpath:users.ldif");
24+
25+
}
26+
27+
28+
29+
}

spring-security-mvc-ldap/src/main/java/org/baeldung/spring/WebConfig.java

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
dn: ou=people,dc=baeldung,dc=com
2+
objectclass: top
3+
objectclass: organizationalUnit
4+
ou: people
5+
6+
dn: uid=baeldung,ou=people,dc=baeldung,dc=com
7+
objectclass: top
8+
objectclass: person
9+
objectclass: organizationalPerson
10+
objectclass: inetOrgPerson
11+
cn: David Lightman
12+
sn: Lightman
13+
uid: baeldung
14+
userPassword: password

spring-security-mvc-ldap/src/main/resources/webSecurityConfig.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<http-basic entry-point-ref="myBasicAuthenticationEntryPoint" />
1414

1515
</http>
16+
<!--
17+
<authentication-manager />
18+
1619
1720
<authentication-manager>
1821
<authentication-provider>
@@ -21,5 +24,11 @@
2124
</user-service>
2225
</authentication-provider>
2326
</authentication-manager>
24-
27+
-->
28+
29+
<authentication-manager alias="authenticationManager">
30+
<authentication-provider user-service-ref="securityConfig">
31+
</authentication-provider>
32+
</authentication-manager>
33+
2534
</beans:beans>

0 commit comments

Comments
 (0)