removing try of implementation of custom logout request

Evolveum · Sep 10, 2021 · 24f2299 · 24f2299
1 parent e367ca4
commit 24f2299
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 549 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/security/module/SamlModuleWebSecurityConfig.java b/.../src/main/java/com/evolveum/midpoint/web/security/module/SamlModuleWebSecurityConfig.java
@@ -7,11 +7,8 @@
 
 package com.evolveum.midpoint.web.security.module;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 
-import com.evolveum.midpoint.security.api.SecurityUtil;
 import com.evolveum.midpoint.web.security.saml.MidpointMetadataRelyingPartyRegistrationResolver;
 
 import com.evolveum.midpoint.web.security.saml.MidpointSaml2LoginConfigurer;
@@ -25,10 +22,6 @@
 import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository;
 import org.springframework.security.saml2.provider.service.servlet.filter.Saml2WebSsoAuthenticationFilter;
 import org.springframework.security.saml2.provider.service.web.Saml2MetadataFilter;
-import org.springframework.security.web.authentication.logout.CompositeLogoutHandler;
-import org.springframework.security.web.authentication.logout.CookieClearingLogoutHandler;
-import org.springframework.security.web.authentication.logout.LogoutHandler;
-import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 
 import com.evolveum.midpoint.model.api.ModelAuditRecorder;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -82,17 +75,6 @@ protected void configure(HttpSecurity http) throws Exception {
                 new OpenSamlMetadataResolver());
         filter.setRequestMatcher(new AntPathRequestMatcher( getConfiguration().getPrefix() + "/metadata"));
         http.addFilterAfter(filter, Saml2WebSsoAuthenticationFilter.class);
-
-        http.logout(logout -> {
-            List<LogoutHandler> handlers = new ArrayList<LogoutHandler>();
-            handlers.add(new SecurityContextLogoutHandler());
-            handlers.add(new CookieClearingLogoutHandler("JSESSIONID"));
-//            handlers.add(new MidpointSamlLogoutHandler());
-            logout.logoutSuccessHandler(createLogoutHandler())
-                    .addLogoutHandler(new CompositeLogoutHandler(handlers))
-//                    .logoutRequestMatcher(new SamlLogoutMatcher(getConfiguration().getPrefix() + "/logout"));
-                    .logoutRequestMatcher(new AntPathRequestMatcher(getConfiguration().getPrefix() + "/logout"));
-        });
     }
 
     private InMemoryRelyingPartyRegistrationRepository relyingPartyRegistrations() {

diff --git a/...lveum/midpoint/web/security/module/configuration/SamlMidpointAdditionalConfiguration.java b/...lveum/midpoint/web/security/module/configuration/SamlMidpointAdditionalConfiguration.java
@@ -6,36 +6,20 @@
  */
 package com.evolveum.midpoint.web.security.module.configuration;
 
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
-
-import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding;
-
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.springframework.util.StringUtils.hasText;
 
 /**
  * @author skublik
  */
 
 public class SamlMidpointAdditionalConfiguration implements Serializable {
 
-    private static final Trace LOGGER = TraceManager.getTrace(SamlMidpointAdditionalConfiguration.class);
-
     private final String nameOfUsernameAttribute;
     private final String linkText;
-    private final String logoutDestination;
-    private final Saml2MessageBinding logoutBinding;
 
-    private SamlMidpointAdditionalConfiguration(String nameOfUsernameAttribute, String linkText,
-            String logoutDestination, Saml2MessageBinding logoutBinding) {
+    private SamlMidpointAdditionalConfiguration(String nameOfUsernameAttribute, String linkText) {
         this.nameOfUsernameAttribute = nameOfUsernameAttribute;
         this.linkText = linkText;
-        this.logoutDestination = logoutDestination;
-        this.logoutBinding = logoutBinding;
     }
 
     public String getNameOfUsernameAttribute() {
@@ -46,14 +30,6 @@ public String getLinkText() {
         return linkText;
     }
 
-    public String getLogoutDestination() {
-        return logoutDestination;
-    }
-
-    public Saml2MessageBinding getLogoutBinding() {
-        return logoutBinding;
-    }
-
     public static Builder builder() {
         return new Builder();
     }
@@ -62,8 +38,6 @@ public static final class Builder {
 
         private String nameOfUsernameAttribute;
         private String linkText;
-        private String logoutDestination;
-        private Saml2MessageBinding logoutBinding;
 
         private Builder() {
         }
@@ -78,19 +52,8 @@ public Builder linkText(String textOfLink) {
             return this;
         }
 
-        public Builder logoutDestination(String logoutDestination) {
-            this.logoutDestination = logoutDestination;
-            return this;
-        }
-
-        public Builder logoutBinding(Saml2MessageBinding logoutBinding) {
-            this.logoutBinding = logoutBinding;
-            return this;
-        }
-
         public SamlMidpointAdditionalConfiguration build(){
-            return new SamlMidpointAdditionalConfiguration(this.nameOfUsernameAttribute, this.linkText,
-            this.logoutDestination, this.logoutBinding);
+            return new SamlMidpointAdditionalConfiguration(this.nameOfUsernameAttribute, this.linkText);
         }
     }
 }
diff --git a/...m/evolveum/midpoint/web/security/saml/MidpointLogoutRelyingPartyRegistrationResolver.java b/...m/evolveum/midpoint/web/security/saml/MidpointLogoutRelyingPartyRegistrationResolver.java