Skip to content

Commit 8533312

Browse files
committed
Fix SAML 2.0 Javaconfig Sample
Issue gh-9362
1 parent 56db058 commit 8533312

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2login.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apply plugin: 'io.spring.convention.spring-sample-war'
33
dependencies {
44
compile project(':spring-security-saml2-service-provider')
55
compile project(':spring-security-config')
6+
compile slf4jDependencies
67

78
testCompile 'org.springframework:spring-test'
89
}

samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
public class MessageSecurityWebApplicationInitializer extends
2929
AbstractSecurityWebApplicationInitializer {
3030

31+
public MessageSecurityWebApplicationInitializer() {
32+
super(SecurityConfig.class);
33+
}
34+
3135
@Override
3236
protected boolean enableHttpSessionEventPublisher() {
3337
return true;

samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.opensaml.security.x509.X509Support;
2222

2323
import org.springframework.context.annotation.Bean;
24+
import org.springframework.security.config.Customizer;
2425
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
2526
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
2627
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -52,9 +53,7 @@ protected void configure(HttpSecurity http) throws Exception {
5253
.authorizeRequests((authz) -> authz
5354
.anyRequest().authenticated()
5455
)
55-
.saml2Login((saml2) -> saml2
56-
.loginProcessingUrl("/sample/jc/saml2/sso/{registrationId}")
57-
);
56+
.saml2Login(Customizer.withDefaults());
5857
// @formatter:on
5958
}
6059

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<root level="WARN">
9+
<appender-ref ref="STDOUT" />
10+
</root>
11+
12+
</configuration>

0 commit comments

Comments
 (0)