Author: nd-guest
Date: 2007-08-28 20:51:37 +0000 (Tue, 28 Aug 2007)
New Revision: 1049

Added:
   packages/mapserver/branches/etch/4.10.0/debian/patches/80_xss.dpatch
Modified:
   packages/mapserver/branches/etch/4.10.0/debian/
   packages/mapserver/branches/etch/4.10.0/debian/changelog
   packages/mapserver/branches/etch/4.10.0/debian/patches/00list
Log:
Added patch to fix xss for etch version using
diffs r6679 and r6680 from http://trac.osgeo.org/mapserver/ticket/2256
with minor modifications to apply correctly.



Property changes on: packages/mapserver/branches/etch/4.10.0/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: packages/mapserver/branches/etch/4.10.0/debian/changelog
===================================================================
--- packages/mapserver/branches/etch/4.10.0/debian/changelog    2007-08-28 
18:51:55 UTC (rev 1048)
+++ packages/mapserver/branches/etch/4.10.0/debian/changelog    2007-08-28 
20:51:37 UTC (rev 1049)
@@ -1,3 +1,12 @@
+mapserver (4.10.0-5+etch2) stable-security; urgency=high
+
+  * Fixed XSS vulnerabilities.
+    - Added 80_xss.dpatch. Patch provided by upstream with minor modifications
+      to apply correctly.
+    [http://trac.osgeo.org/mapserver/ticket/2256]
+
+ -- Andreas Putzo <[EMAIL PROTECTED]>  Tue, 28 Aug 2007 20:19:05 +0000
+
 mapserver (4.10.0-5+etch1) testing; urgency=low
 
   * debian/po/ja.po: added, thanks to Kobayashi Noritada. (Closes: #413119)

Modified: packages/mapserver/branches/etch/4.10.0/debian/patches/00list
===================================================================
--- packages/mapserver/branches/etch/4.10.0/debian/patches/00list       
2007-08-28 18:51:55 UTC (rev 1048)
+++ packages/mapserver/branches/etch/4.10.0/debian/patches/00list       
2007-08-28 20:51:37 UTC (rev 1049)
@@ -1,3 +1,4 @@
 20_php_build
 50_clean
 70_ptrreturn
+80_xss

Added: packages/mapserver/branches/etch/4.10.0/debian/patches/80_xss.dpatch
===================================================================
--- packages/mapserver/branches/etch/4.10.0/debian/patches/80_xss.dpatch        
                        (rev 0)
+++ packages/mapserver/branches/etch/4.10.0/debian/patches/80_xss.dpatch        
2007-08-28 20:51:37 UTC (rev 1049)
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_xss.dpatch by  Andreas Putzo <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix XSS vulnerabilities.
+## DP: http://trac.osgeo.org/mapserver/ticket/2256
+
[EMAIL PROTECTED]@
+diff -urNad mapserver-4.10.0~/HISTORY.TXT mapserver-4.10.0/HISTORY.TXT
+--- mapserver-4.10.0~/HISTORY.TXT      2006-10-02 17:30:32.000000000 +0000
++++ mapserver-4.10.0/HISTORY.TXT       2007-08-28 19:53:30.000000000 +0000
+@@ -16,6 +16,8 @@
+ Version 4.10.0 (2006-10-04)
+ ---------------------------
+ 
++- Fixed XSS vulnerabilities (#2256)
++
+ - No source code changes since 4.10.0-rc1
+ 
+ Known issues in 4.10.0:
+diff -urNad mapserver-4.10.0~/mapserv.c mapserver-4.10.0/mapserv.c
+--- mapserver-4.10.0~/mapserv.c        2006-08-29 01:56:53.000000000 +0000
++++ mapserver-4.10.0/mapserv.c 2007-08-28 19:53:30.000000000 +0000
+@@ -183,7 +183,7 @@
+     msIO_printf("<HEAD><TITLE>MapServer Message</TITLE></HEAD>\n");
+     msIO_printf("<!-- %s -->\n", msGetVersion());
+     msIO_printf("<BODY BGCOLOR=\"#FFFFFF\">\n");
+-    msWriteError(stdout);
++    msWriteErrorXML(stdout);
+     msIO_printf("</BODY></HTML>");
+     msFreeMapServObj(msObj);
+     msCleanup();
+@@ -198,7 +198,7 @@
+       msIO_printf("<HEAD><TITLE>MapServer Message</TITLE></HEAD>\n");
+       msIO_printf("<!-- %s -->\n", msGetVersion());
+       msIO_printf("<BODY BGCOLOR=\"#FFFFFF\">\n");
+-      msWriteError(stdout);
++      msWriteErrorXML(stdout);
+       msIO_printf("</BODY></HTML>");
+     }
+   } else {
+@@ -210,7 +210,7 @@
+       msIO_printf("<HEAD><TITLE>MapServer Message</TITLE></HEAD>\n");
+       msIO_printf("<!-- %s -->\n", msGetVersion());
+       msIO_printf("<BODY BGCOLOR=\"#FFFFFF\">\n");
+-      msWriteError(stdout);
++      msWriteErrorXML(stdout);
+       msIO_printf("</BODY></HTML>");
+       }
+     } else {
+@@ -219,7 +219,7 @@
+       msIO_printf("<HEAD><TITLE>MapServer Message</TITLE></HEAD>\n");
+       msIO_printf("<!-- %s -->\n", msGetVersion());
+       msIO_printf("<BODY BGCOLOR=\"#FFFFFF\">\n");
+-      msWriteError(stdout);
++      msWriteErrorXML(stdout);
+       msIO_printf("</BODY></HTML>");
+     }
+   }
+diff -urNad mapserver-4.10.0~/maptemplate.c mapserver-4.10.0/maptemplate.c
+--- mapserver-4.10.0~/maptemplate.c    2006-09-29 20:52:05.000000000 +0000
++++ mapserver-4.10.0/maptemplate.c     2007-08-28 19:53:30.000000000 +0000
+@@ -2965,10 +2965,12 @@
+   } /* end query mode specific substitutions */
+ 
+   for(i=0;i<msObj->request->NumParams;i++) {
+-    sprintf(substr, "[%s]", msObj->request->ParamNames[i]);
+-    outstr = gsub(outstr, substr, msObj->request->ParamValues[i]);
+-    sprintf(substr, "[%s_esc]", msObj->request->ParamNames[i]);
++    snprintf(substr, PROCESSLINE_BUFLEN, "[%s]", 
msObj->request->ParamNames[i]);
++    encodedstr = msEncodeHTMLEntities(msObj->request->ParamValues[i]);
++    outstr = gsub(outstr, substr, encodedstr);
++    free(encodedstr);
+ 
++    snprintf(substr, PROCESSLINE_BUFLEN, "[%s_esc]", 
msObj->request->ParamNames[i]);
+     encodedstr = msEncodeUrl(msObj->request->ParamValues[i]);
+     outstr = gsub(outstr, substr, encodedstr);
+     free(encodedstr);


Property changes on: 
packages/mapserver/branches/etch/4.10.0/debian/patches/80_xss.dpatch
___________________________________________________________________
Name: svn:executable
   + *


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to