head	1.2;
access;
symbols
	RELEASE_6_1_0:1.1
	RELEASE_5_5_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2006.05.01.11.33.17;	author clement;	state dead;
branches;
next	1.1;

1.1
date	2005.12.12.20.35.19;	author clement;	state Exp;
branches;
next	;


desc
@@


1.2
log
@ Oops I forgot to "cvs rm" a secfix

Spotted by:	krion
@
text
@--- modules/mappers/mod_imap.c (original)
+++ modules/mappers/mod_imap.c Mon Dec 12 08:41:53 2005
@@@@ -342,7 +342,7 @@@@
     if (!strcasecmp(value, "referer")) {
         referer = apr_table_get(r->headers_in, "Referer");
         if (referer && *referer) {
-	    return apr_pstrdup(r->pool, referer);
+	    return ap_escape_html(r->pool, referer);
         }
         else {
 	    /* XXX:  This used to do *value = '\0'; ... which is totally bogus

--- server/util.c (original)
+++ server/util.c Mon Dec 12 08:41:53 2005
@@@@ -1762,6 +1762,8 @@@@
             j += 3;
         else if (s[i] == '&')
             j += 4;
+        else if (s[i] == '"')
+            j += 5;
 
     if (j == 0)
         return apr_pstrmemdup(p, s, i);
@@@@ -1779,6 +1781,10 @@@@
         else if (s[i] == '&') {
             memcpy(&x[j], "&amp;", 5);
             j += 4;
+        }
+        else if (s[i] == '"') {
+            memcpy(&x[j], "&quot;", 6);
+            j += 5;
         }
         else
             x[j] = s[i];

@


1.1
log
@SECURITY: CVE-2005-3352 (cve.mitre.org)
     mod_imap: Escape untrusted referer header before outputting in HTML
     to avoid potential cross-site scripting.  Change also made to
     ap_escape_html so we escape quotes.  Reported by JPCERT.
     [Mark Cox]

Reported by:    simon
@
text
@@

