From 08cc74348fb3c4d0787ea5b30c342520f30bd951 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Sun, 14 Jan 2024 15:11:17 +0000
Subject: [PATCH] Remove unnecessary differences in HTML between rendered
 forms.

---
 auth_mellon_handler.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/auth_mellon_handler.c b/auth_mellon_handler.c
index 6350bca..e4cefd6 100644
--- a/auth_mellon_handler.c
+++ b/auth_mellon_handler.c
@@ -613,7 +613,7 @@ static int am_set_logout_response_post_content(request_rec *r,
           "    <input type=\"hidden\" name=\"SAMLResponse\" value=\"%s\">\n"
           "    <input type=\"hidden\" name=\"RelayState\" value=\"%s\">\n"
           "    <noscript>\n"
-          "     <input type=\"submit\">\n"
+          "     <input type=\"submit\" value=\"Proceed\">\n"
           "    </noscript>\n"
           "  </form>\n"
           " </body>\n"
@@ -634,7 +634,7 @@ static int am_set_logout_response_post_content(request_rec *r,
           "  <form method=\"POST\" action=\"%s\">\n"
           "    <input type=\"hidden\" name=\"SAMLResponse\" value=\"%s\">\n"
           "    <noscript>\n"
-          "     <input type=\"submit\">\n"
+          "     <input type=\"submit\" value=\"Proceed\">\n"
           "    </noscript>\n"
           "  </form>\n"
           " </body>\n"
@@ -2886,19 +2886,18 @@ static int am_handle_repost(request_rec *r)
     }
 
     output = apr_psprintf(r->pool,
-      "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"
+      "<!DOCTYPE html>\n"
       "<html>\n"
       " <head>\n" 
       "  <title>SAML rePOST request</title>\n" 
       " </head>\n" 
-      " <body onload=\"document.getElementById('form').submit();\">\n" 
-      "  <noscript>\n"
-      "   Your browser does not support Javascript, \n"
-      "   you must click the button below to proceed.\n"
-      "  </noscript>\n"
-      "   <form id=\"form\" method=\"POST\" action=\"%s\" enctype=\"%s\"%s>\n%s"
+      " <body onload=\"document.forms[0].submit()\">\n"
+      "   <noscript>\n"
+      "    <strong>Note:</strong> Since your browser does not support JavaScript, you must press the button below once to proceed.\n"
+      "   </noscript>\n"
+      "   <form method=\"POST\" action=\"%s\" enctype=\"%s\"%s>\n%s"
       "    <noscript>\n"
-      "     <input type=\"submit\">\n"
+      "     <input type=\"submit\" value=\"Proceed\">\n"
       "    </noscript>\n"
       "   </form>\n"
       " </body>\n" 
@@ -3014,7 +3013,7 @@ static int am_set_authn_request_post_content(request_rec *r, LassoLogin *login)
       "    <input type=\"hidden\" name=\"SAMLRequest\" value=\"%s\">\n"
       "    <input type=\"hidden\" name=\"RelayState\" value=\"%s\">\n"
       "    <noscript>\n"
-      "     <input type=\"submit\">\n"
+      "     <input type=\"submit\" value=\"Proceed\">\n"
       "    </noscript>\n"
       "  </form>\n"
       " </body>\n"
