SHIBUI-2646: fixes for trailing slashes for non-PAC4J config

TIER · Jan 7, 2025 · 66123ad · 66123ad
1 parent 58cb10d
commit 66123ad
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.../main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/SpringSecurityConfig.java b/.../main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/SpringSecurityConfig.java
@@ -112,7 +112,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
             .authorizeHttpRequests()
             .requestMatchers(new AntPathRequestMatcher("/unsecured/**/*"),
                              new AntPathRequestMatcher("/entities*"),
-                             new AntPathRequestMatcher("/entities/**/*"),
+                             new AntPathRequestMatcher("/entities/*"),
+                             new AntPathRequestMatcher("/entities/**"),
                              new AntPathRequestMatcher("/actuator/**"),
                              new AntPathRequestMatcher("/api/beacon/send")).permitAll()
             .anyRequest().hasAnyRole(acceptedAuthenticationRoles)
@@ -158,7 +159,9 @@ public InMemoryUserDetailsManager userDetailsManager() {
     @Profile("!no-auth")
     public WebSecurityCustomizer webSecurityCustomizer() {
         return (web) -> web.ignoring().requestMatchers(new AntPathRequestMatcher("/unsecured/**/*"),
-                        new AntPathRequestMatcher("/entities/**/*"),
+                        new AntPathRequestMatcher("/entities*"),
+                        new AntPathRequestMatcher("/entities/*"),
+                        new AntPathRequestMatcher("/entities/**"),
                         new AntPathRequestMatcher("/favicon.ico"),
                         new AntPathRequestMatcher("/assets/**/*.png"),
                         new AntPathRequestMatcher("/static/**/*"),