fix usage of OIDCPreservePostTemplates, regression in 2.4.17; see #1325

thanks @perry19987

Signed-off-by: Hans Zandbelt <[email protected]>

Author: zandbelt

ChangeLog

@@ -1,3 +1,6 @@
+05/27/2025
+- fix usage of OIDCPreservePostTemplates, regression in 2.4.17; see #1325; thanks @perry19987
+
 05/22/2025
 - metrics: avoid possible segfault after restart twice; thanks @atzm
 

src/handle/response.c

@@ -143,11 +143,12 @@ apr_byte_t oidc_response_post_preserve_javascript(request_rec *r, const char *lo
 	}
 	json = apr_psprintf(r->pool, "{ %s }", json);
 
-	if (oidc_cfg_post_preserve_template_get(cfg) != NULL)
+	if (oidc_cfg_post_preserve_template_get(cfg) != NULL) {
 		if (oidc_util_html_send_in_template(
 			r, oidc_cfg_post_preserve_template_get(cfg), &_oidc_response_post_preserve_template_contents,
 			json, OIDC_POST_PRESERVE_ESCAPE_NONE, location, OIDC_POST_PRESERVE_ESCAPE_JAVASCRIPT) == OK)
 			return TRUE;
+	}
 
 	const char *jmethod = "preserveOnLoad";
 	const char *jscript = apr_psprintf(
@@ -677,11 +678,9 @@ static int oidc_response_process(request_rec *r, oidc_cfg_t *c, oidc_session_t *
 	/* check whether form post data was preserved; if so restore it */
 	if (_oidc_strcmp(original_method, OIDC_METHOD_FORM_POST) == 0) {
 		if (oidc_cfg_post_restore_template_get(c) != NULL)
-			if (oidc_util_html_send_in_template(r, oidc_cfg_post_restore_template_get(c),
-							    &_oidc_response_post_restore_template_contents,
-							    original_url, OIDC_POST_PRESERVE_ESCAPE_JAVASCRIPT, "",
-							    OIDC_POST_PRESERVE_ESCAPE_NONE) == OK)
-				return TRUE;
+			return oidc_util_html_send_in_template(
+			    r, oidc_cfg_post_restore_template_get(c), &_oidc_response_post_restore_template_contents,
+			    original_url, OIDC_POST_PRESERVE_ESCAPE_JAVASCRIPT, "", OIDC_POST_PRESERVE_ESCAPE_NONE);
 		return oidc_response_post_preserved_restore(r, original_url);
 	}
 

src/proto/request.c

@@ -717,9 +717,14 @@ int oidc_proto_request_auth(request_rec *r, struct oidc_provider_t *provider, co
 
 		} else {
 
-			/* signal this to the content handler */
-			rv = oidc_util_html_content_prep(r, OIDC_REQUEST_STATE_KEY_AUTHN_PRESERVE, "Preserving...",
-							 javascript, "preserveOnLoad", "<p>Preserving...</p>");
+			// NB: if a template is in use, we should not override
+			// OIDC_REQUEST_STATE_KEY_HTTP with OIDC_REQUEST_STATE_KEY_AUTHN_PRESERVE
+			if (oidc_request_state_get(r, OIDC_REQUEST_STATE_KEY_HTTP) == NULL) {
+				/* signal this to the content handler */
+				rv = oidc_util_html_content_prep(r, OIDC_REQUEST_STATE_KEY_AUTHN_PRESERVE,
+								 "Preserving...", javascript, "preserveOnLoad",
+								 "<p>Preserving...</p>");
+			}
 		}
 
 	} else {