From: Graham Leggett <minfrin@apache.org>
Date: Sat, 18 Nov 2023 15:10:02 +0000 (+0000)
Subject: Backport to v2.4:
X-Git-Tag: 2.4.59-rc1-candidate~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69bba17e0d53b800622b1edfb074bf4d0738fadc;p=thirdparty%2Fapache%2Fhttpd.git

Backport to v2.4:

   *) mod_ldap: HTML-escape data in ldap-status handler
      trunk patch: http://svn.apache.org/r1913855
      2.4.x patch  svn merge -c 1913855 ^/httpd/httpd/trunk .
      +1: covener, minfrin, ylavic



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913944 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 8925855e893..34aeaac6f3a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.59
 
+  *) mod_ldap: HTML-escape data in the ldap-status handler.
+     [Eric Covener, Chamal De Silva]
+
   *) mod_ssl: Disable the OpenSSL ENGINE API when OPENSSL_NO_ENGINE is set.
      Allow for "SSLCryptoDevice builtin" if the ENGINE API is not available,
      notably with OpenSSL >= 3.  PR 68080.  [ Yann Ylavic, Joe Orton ]
diff --git a/STATUS b/STATUS
index 9198762ec83..10eedd00db9 100644
--- a/STATUS
+++ b/STATUS
@@ -153,10 +153,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   *) mod_ldap: HTML-escape data in ldap-status handler
-      trunk patch: http://svn.apache.org/r1913855
-      2.4.x patch  svn merge -c 1913855 ^/httpd/httpd/trunk .
-      +1: covener, minfrin, ylavic
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/changes-entries/md_v2.4.25.txt b/changes-entries/md_v2.4.25.txt
deleted file mode 100644
index d4bf95f1b60..00000000000
--- a/changes-entries/md_v2.4.25.txt
+++ /dev/null
@@ -1,4 +0,0 @@
- * mod_md: Fix the reported "until" validity of a certificate in the status
-   handler. [Rainer Jung]
-   Fix possible NULL deref when logging the error that an authentication
-   resource could not be retrieved from the ACME server. [Stefan Eissing]
diff --git a/modules/ldap/util_ldap_cache.c b/modules/ldap/util_ldap_cache.c
index 774a76e1acf..27dc733958e 100644
--- a/modules/ldap/util_ldap_cache.c
+++ b/modules/ldap/util_ldap_cache.c
@@ -230,8 +230,8 @@ void util_ldap_search_node_display(request_rec *r, util_ald_cache_t *cache, void
                "<td nowrap>%s</td>"
                "<td nowrap>%s</td>"
                "</tr>",
-               node->username,
-               node->dn,
+               ap_escape_html(r->pool, node->username),
+               ap_escape_html(r->pool, node->dn),
                date_str);
 }
 
@@ -331,9 +331,9 @@ void util_ldap_compare_node_display(request_rec *r, util_ald_cache_t *cache, voi
                "<td nowrap>%s</td>"
                "<td nowrap>%s</td>"
                "</tr>",
-               node->dn,
-               node->attrib,
-               node->value,
+               ap_escape_html(r->pool, node->dn),
+               ap_escape_html(r->pool, node->attrib),
+               ap_escape_html(r->pool, node->value),
                date_str,
                cmp_result,
                sub_groups_val,
@@ -391,8 +391,8 @@ void util_ldap_dn_compare_node_display(request_rec *r, util_ald_cache_t *cache,
                "<td nowrap>%s</td>"
                "<td nowrap>%s</td>"
                "</tr>",
-               node->reqdn,
-               node->dn);
+               ap_escape_html(r->pool, node->reqdn),
+               ap_escape_html(r->pool, node->dn));
 }