From 1bb263182ed84a9a83e631e057d882e9f042a08f Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Thu, 6 Apr 2023 07:30:54 +0100 Subject: [PATCH] Fix win auth example - Relates #165 --- .../src/main/java/demo/app/WebSecurityConfig.java | 2 +- .../sec-server-win-auth/src/main/resources/application.yml | 6 +++--- .../src/main/resources/templates/hello.html | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java b/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java index 7df0d82..eed0e0a 100644 --- a/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java +++ b/spring-security-kerberos-samples/sec-server-win-auth/src/main/java/demo/app/WebSecurityConfig.java @@ -97,7 +97,7 @@ public class WebSecurityConfig { return new SpnegoEntryPoint("/login"); } - @Bean + // @Bean public SpnegoAuthenticationProcessingFilter spnegoAuthenticationProcessingFilter( AuthenticationManager authenticationManager) { SpnegoAuthenticationProcessingFilter filter = new SpnegoAuthenticationProcessingFilter(); diff --git a/spring-security-kerberos-samples/sec-server-win-auth/src/main/resources/application.yml b/spring-security-kerberos-samples/sec-server-win-auth/src/main/resources/application.yml index e2dee48..9cef550 100644 --- a/spring-security-kerberos-samples/sec-server-win-auth/src/main/resources/application.yml +++ b/spring-security-kerberos-samples/sec-server-win-auth/src/main/resources/application.yml @@ -1,9 +1,9 @@ server: port: 8080 app: - ad-domain: EXAMPLE.ORG - ad-server: ldap://WIN-EKBO0EQ7TS7.example.org/ - service-principal: HTTP/neo.example.org@EXAMPLE.ORG + ad-domain: example.org + ad-server: ldap://vagrantvm.example.org + service-principal: HTTP/cypher.example.org@EXAMPLE.ORG keytab-location: /tmp/tomcat.keytab ldap-search-base: dc=example,dc=org ldap-search-filter: "(| (userPrincipalName={0}) (sAMAccountName={0}))" diff --git a/spring-security-kerberos-samples/sec-server-win-auth/src/main/resources/templates/hello.html b/spring-security-kerberos-samples/sec-server-win-auth/src/main/resources/templates/hello.html index b6da1ad..d0a4c47 100644 --- a/spring-security-kerberos-samples/sec-server-win-auth/src/main/resources/templates/hello.html +++ b/spring-security-kerberos-samples/sec-server-win-auth/src/main/resources/templates/hello.html @@ -1,11 +1,10 @@ + xmlns:sec="http://www.thymeleaf.org/extras/spring-security"> Spring Security Kerberos Example -

Hello [[${#httpServletRequest.remoteUser}]]!

-

User principal is [[${#httpServletRequest.userPrincipal}]]!

+