[Pkg-mediawiki-commits] r242 - in mediawiki/trunk/debian: . patches

[Jonathan Wiltshire]

Author: jmw
Date: 2011-02-06 15:32:40 +0000 (Sun, 06 Feb 2011)
New Revision: 242

Added:
   mediawiki/trunk/debian/patches/CVE-2011-0003.patch
Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/patches/series
Log:
Merge 1:1.15.5-2 from squeeze (testing-security) to fix CVE-2011-0003

Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2011-02-06 15:13:17 UTC (rev 241)
+++ mediawiki/trunk/debian/changelog	2011-02-06 15:32:40 UTC (rev 242)
@@ -1,4 +1,4 @@
-mediawiki (1:1.15.5-2) UNRELEASED; urgency=high
+mediawiki (1:1.15.5-3) UNRELEASED; urgency=low
 
   * debian/patches/fix_datetime.patch: new, convert argument into
     the format expected by other methods, fixes date/time output
@@ -6,6 +6,14 @@
 
  -- Thorsten Glaser <tg at mirbsd.de>  Tue, 07 Sep 2010 11:04:26 +0200
 
+mediawiki (1:1.15.5-2) testing-security; urgency=high
+
+  * CVE-2011-0003: Protect against clickjacking by sending the
+    X-Frame-Options header in all pages (except normal page views
+    and a few selected special pages). Patch as released by upstream
+
+ -- Jonathan Wiltshire <debian at jwiltshire.org.uk>  Tue, 04 Jan 2011 22:39:26 +0000
+
 mediawiki (1:1.15.5-1) unstable; urgency=high
 
   [ Thorsten Glaser ]

Copied: mediawiki/trunk/debian/patches/CVE-2011-0003.patch (from rev 240, mediawiki/squeeze/debian/patches/CVE-2011-0003.patch)
===================================================================
--- mediawiki/trunk/debian/patches/CVE-2011-0003.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/CVE-2011-0003.patch	2011-02-06 15:32:40 UTC (rev 242)
@@ -0,0 +1,28 @@
+Description: prevent ClickJacking by breaking out of iframes
+Origin: http://www.mediawiki.org/wiki/Special:Code/MediaWiki/79566
+Bug: https://bugzilla.wikimedia.org/show_bug.cgi?id=26561
+Author: Tim Starling
+Last-Update: 2011-01-04
+
+--- mediawiki-1.15.5.orig/config/index.php
++++ mediawiki-1.15.5/config/index.php
+@@ -21,6 +21,7 @@
+ 
+ error_reporting( E_ALL );
+ header( "Content-type: text/html; charset=utf-8" );
++header( 'X-Frame-Options: DENY' );
+ @ini_set( "display_errors", true );
+ 
+ # In case of errors, let output be clean.
+--- mediawiki-1.15.5.orig/includes/OutputPage.php
++++ mediawiki-1.15.5/includes/OutputPage.php
+@@ -957,6 +957,9 @@
+ 		$wgRequest->response()->header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
+ 		$wgRequest->response()->header( 'Content-language: '.$wgContLanguageCode );
+ 
++		# To prevent clickjacking, do not allow this page to be inside a frame.
++		$wgRequest->response()->header( 'X-Frame-Options: DENY' );
++
+ 		if ($this->mArticleBodyOnly) {
+ 			$this->out($this->mBodytext);
+ 		} else {

Modified: mediawiki/trunk/debian/patches/series
===================================================================
--- mediawiki/trunk/debian/patches/series	2011-02-06 15:13:17 UTC (rev 241)
+++ mediawiki/trunk/debian/patches/series	2011-02-06 15:32:40 UTC (rev 242)
@@ -5,4 +5,5 @@
 add_rss_guid.patch
 backup_documentation.patch
 suppress_warnings.patch
+CVE-2011-0003.patch
 fix_datetime.patch