Merge pull request #90 from prime-framework/degroff/fix_handleFollowMetaRefresh4x

degroff/fix handle follow meta refresh

Author: robotdan

build.savant

@@ -29,7 +29,7 @@ logbackVersion = "1.4.14"
 slf4jVersion = "2.0.13"
 testngVersion = "7.8.0"
 
-project(group: "org.primeframework", name: "prime-mvc", version: "4.35.0", licenses: ["ApacheV2_0"]) {
+project(group: "org.primeframework", name: "prime-mvc", version: "4.35.1", licenses: ["ApacheV2_0"]) {
   workflow {
     fetch {
       // Dependency resolution order:

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>org.primeframework</groupId>
   <artifactId>prime-mvc</artifactId>
-  <version>4.35.0</version>
+  <version>4.35.1</version>
   <packaging>jar</packaging>
 
   <name>FusionAuth App</name>

src/test/java/org/example/action/meta/RefreshAction.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025, Inversoft Inc., All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+package org.example.action.meta;
+
+import org.primeframework.mvc.ErrorException;
+import org.primeframework.mvc.action.annotation.Action;
+import org.primeframework.mvc.action.result.annotation.Forward;
+
+/**
+ * @author Daniel DeGroff
+ */
+@Action
+@Forward.List({
+    @Forward(code = "input-lc", page = "/meta/refresh-lc.ftl"),
+    @Forward(code = "input-uc", page = "/meta/refresh-uc.ftl")
+})
+public class RefreshAction {
+  public String test = "lc";
+
+  public String get() {
+    if (test == null || !(test.equals("lc") || test.equals("uc"))) {
+      throw new ErrorException("error");
+    }
+
+    return "input-" + test;
+  }
+}

src/test/java/org/example/action/meta/TargetAction.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025, Inversoft Inc., All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+package org.example.action.meta;
+
+import org.primeframework.mvc.action.annotation.Action;
+
+/**
+ * @author Daniel DeGroff
+ */
+@Action
+public class TargetAction {
+  public String get() {
+    return "input";
+  }
+}

src/test/java/org/primeframework/mvc/GlobalTest.java

@@ -213,6 +213,30 @@ public void flash_scope_compatibility() throws Exception {
     ;
   }
 
+  @Test
+  public void follow_meta_refresh() throws Exception {
+    // use upper case Refresh and URL, and lower case refresh and url
+    test.forEach("lc", "uc")
+        .test(param -> test
+            .simulate(() -> simulator
+                .test("/meta/refresh")
+                .withURLParameter("test", param)
+                .get()
+                .assertStatusCode(200)
+                .assertBodyContains("""
+                                        <meta http-equiv="{refresh}" content="0; {url}=/meta/target">
+                                        """
+                                        .replace("{refresh}", param.equals("uc") ? "Refresh" : "refresh")
+                                        .replace("{url}", param.equals("uc") ? "URL" : "url"))
+
+                .followMetaRefresh(result -> result
+                    .assertStatusCode(200)
+                    .assertBody("""
+                                    We made it!
+                                    """)))
+        );
+  }
+
   @Test
   public void get() throws Exception {
     // Not called yet

src/test/java/org/primeframework/mvc/test/RequestResult.java

@@ -1893,13 +1893,14 @@ private RequestResult handleFollowMetaRefresh(ThrowingConsumer<RequestResult> re
       if (element.hasAttr("http-equiv")) {
         String value = element.attr("http-equiv");
         // Never null
-        if (value.equals("refresh")) {
+        if (value.equalsIgnoreCase("refresh")) {
           String content = element.attr("content");
           // Handle this
           String[] parts = content.split(";");
           for (String part : parts) {
-            if (part.startsWith("URL=")) {
-              String uri = part.substring(4);
+            String trimmedPart = part.trim();
+            if (trimmedPart.toLowerCase(Locale.ROOT).startsWith("url=")) {
+              String uri = trimmedPart.substring(4);
               if (uri.startsWith("'")) {
                 uri = uri.substring(1, uri.length() - 1);
               }

src/test/web/templates/meta/refresh-lc.ftl

@@ -0,0 +1,8 @@
+<html lang="en_US">
+[#-- Note that refresh and URL are intentionally lowercase--]
+<head>
+  <meta http-equiv="refresh" content="0; url=/meta/target">
+  <title>Refresh please</title>
+</head>
+<body></body>
+</html>

src/test/web/templates/meta/refresh-uc.ftl

@@ -0,0 +1,8 @@
+<html lang="en_US">
+[#-- Note that refresh and URL are intentionally lowercase--]
+<head>
+  <meta http-equiv="Refresh" content="0; URL=/meta/target">
+  <title>Refresh please</title>
+</head>
+<body></body>
+</html>

src/test/web/templates/meta/target.ftl

@@ -0,0 +1 @@
+We made it!