MID-8464: fix for redirect to oidc server

Evolveum · Mar 3, 2023 · 5cbb71b · 5cbb71b
1 parent 598850a
commit 5cbb71b
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidpointResponse.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidpointResponse.java
@@ -19,6 +19,7 @@
 import org.apache.catalina.connector.OutputBuffer;
 import org.apache.catalina.connector.Response;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 import java.util.Arrays;
 import java.util.List;
@@ -69,26 +70,40 @@ public void setHeader(String name, String value) {
                 } else if (StringUtils.isBlank(contextPath)) {
                     if (value.startsWith("/")) {
                         value = publicUrlPrefix + value;
-                    } else {
+                    } else if (isUrlThisApplication(value)){
                         String partAfterSchema = value.substring(value.indexOf("://") + 3);
                         value = publicUrlPrefix + partAfterSchema.substring(partAfterSchema.indexOf("/"));
                     }
                 } else if (value.contains(contextPath + "/")) {
                     if (value.startsWith(contextPath)) {
                         value = publicUrlPrefix + value.substring(contextPath.length());
-                    } else if (value.startsWith("/")){
+                    } else if (value.startsWith("/")) {
                         value = publicUrlPrefix + value;
-                    } else {
+                    } else if (isUrlThisApplication(value)) {
                         String partAfterHostname = value.substring(value.indexOf("://") + 3);
                         partAfterHostname = partAfterHostname.substring(partAfterHostname.indexOf("/"));
-                        value = publicUrlPrefix + partAfterHostname.substring(partAfterHostname.indexOf(contextPath) + contextPath.length());
+                        value = publicUrlPrefix +
+                                partAfterHostname.substring(
+                                        partAfterHostname.indexOf(contextPath) + contextPath.length());
                     }
                 }
             }
         }
         super.setHeader(name, value);
     }
 
+    private boolean isUrlThisApplication(String url) {
+        if (StringUtils.isEmpty(url)) {
+            return true;
+        }
+
+        String applicationUrl = ServletUriComponentsBuilder.fromCurrentContextPath().build().toUriString();
+        if (StringUtils.isEmpty(applicationUrl)) {
+            return true;
+        }
+        return url.startsWith(applicationUrl);
+    }
+
     private String getPublicUrlPrefix() {
         try {
             PrismObject<SystemConfigurationType> systemConfig = systemObjectCache.getSystemConfiguration(new OperationResult("load system configuration"));