From 7b27361de75ab8c528bcf38ee965fd58f90491bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Dziewo=C5=84ski?= Date: Mon, 7 Nov 2016 20:10:21 +0100 Subject: [PATCH 04/10] SECURITY: SpecialWatchlist: Check CSRF token when using "Mark all pages visited" Bug: T150044 Change-Id: I7f75cab4ceb4a2c320af210fad15956b70c29661 --- RELEASE-NOTES-1.27 | 2 ++ includes/specials/SpecialWatchlist.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27 index 1a054a5..d6cfebf 100644 --- a/RELEASE-NOTES-1.27 +++ b/RELEASE-NOTES-1.27 @@ -29,6 +29,8 @@ was released. $wgAdvancedSearchHighlighting is true. * (T125177) SECURITY: API parameters may now be marked as "sensitive" to keep their values out of the logs. +* (T150044) SECURITY: "Mark all pages visited" on the watchlist now requires a CSRF + token. == MediaWiki 1.27.1 == diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index 15691f2..fcc0c91 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -76,6 +76,7 @@ class SpecialWatchlist extends ChangesListSpecialPage { if ( ( $config->get( 'EnotifWatchlist' ) || $config->get( 'ShowUpdatedMarker' ) ) && $request->getVal( 'reset' ) && $request->wasPosted() + && $user->matchEditToken( $request->getVal( 'token' ) ) ) { $user->clearAllNotifications(); $output->redirect( $this->getPageTitle()->getFullURL( $opts->getChangedValues() ) ); @@ -604,6 +605,7 @@ class SpecialWatchlist extends ChangesListSpecialPage { 'action' => $this->getPageTitle()->getLocalURL(), 'id' => 'mw-watchlist-resetbutton' ] ) . "\n" . Xml::submitButton( $this->msg( 'enotif_reset' )->text(), [ 'name' => 'dummy' ] ) . "\n" . + Html::hidden( 'token', $user->getEditToken() ) . "\n" . Html::hidden( 'reset', 'all' ) . "\n"; foreach ( $nondefaults as $key => $value ) { $form .= Html::hidden( $key, $value ) . "\n"; -- 2.9.3