SecurityUtils.java: fixed logout URL when using root context-path (/)

Evolveum · Mar 23, 2022 · f723274 · f723274
1 parent 687a48a
commit f723274
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/util/SecurityUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/util/SecurityUtils.java
@@ -1,19 +1,17 @@
 /*
- * Copyright (C) 2010-2020 Evolveum and contributors
+ * Copyright (C) 2010-2022 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
 package com.evolveum.midpoint.web.security.util;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
-import com.evolveum.midpoint.authentication.api.util.AuthUtil;
-import com.evolveum.midpoint.authentication.api.config.ModuleAuthentication;
-import com.evolveum.midpoint.gui.impl.component.menu.LeftMenuAuthzUtil;
-
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;
@@ -25,12 +23,15 @@
 import org.jetbrains.annotations.NotNull;
 import org.springframework.security.web.csrf.CsrfToken;
 
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
+import com.evolveum.midpoint.authentication.api.util.AuthUtil;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.gui.impl.component.menu.LeftMenuAuthzUtil;
 import com.evolveum.midpoint.web.component.menu.MainMenuItem;
 import com.evolveum.midpoint.web.component.menu.MenuItem;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AuthenticationSequenceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AuthenticationsPolicyType;
 
 /**
  * @author lazyman
@@ -155,7 +156,9 @@ public static AuthenticationSequenceType getSequenceByName(String name, Authenti
     }
 
     public static String getPathForLogoutWithContextPath(String contextPath, @NotNull String prefix) {
-        return "/" + AuthUtil.stripSlashes(contextPath) + getPathForLogout(prefix);
+        return StringUtils.isNotEmpty(contextPath)
+                ? "/" + AuthUtil.stripSlashes(contextPath) + getPathForLogout(prefix)
+                : getPathForLogout(prefix);
     }
 
     private static String getPathForLogout(@NotNull String prefix) {