* (bug 24418) action=markpatrolled now requires a token

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 33ee8da..185247d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -122,6 +122,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 671) The <dfn> element has been whitelisted in user input.
 * (bug 24563) Entries on Special:WhatLinksHere now have a link to their history
 * (bug 21503) There's now a "reason" field when creating account for other users
+* (bug 24418) action=markpatrolled now requires a token
 
 === Bug fixes in 1.17 ===
 * (bug 17560) Half-broken deletion moved image files to deletion archive

diff --git a/includes/Article.php b/includes/Article.php
index c979c45..f134099 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1316,6 +1316,7 @@ class Article {
                }
 
                $sk = $wgUser->getSkin();
+               $token = $wgUser->editToken( $rcid );
 
                $wgOut->addHTML(
                        "<div class='patrollink'>" .
@@ -1327,7 +1328,8 @@ class Article {
                                                array(),
                                                array(
                                                        'action' => 'markpatrolled',
-                                                       'rcid' => $rcid
+                                                       'rcid' => $rcid,
+                                                       'token' => $token,
                                                ),
                                                array( 'known', 'noclasses' )
                                        )
@@ -2358,12 +2360,18 @@ class Article {
         * Mark this particular edit/page as patrolled
         */
        public function markpatrolled() {
-               global $wgOut, $wgRequest;
+               global $wgOut, $wgUser, $wgRequest;
 
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
 
                # If we haven't been given an rc_id value, we can't do anything
                $rcid = (int) $wgRequest->getVal( 'rcid' );
+
+               if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ), $rcid ) ) {
+                       $wgOut->showErrorPage( 'sessionfailure-title', 'sessionfailure' );
+                       return;
+               }
+
                $rc = RecentChange::newFromId( $rcid );
 
                if ( is_null( $rc ) ) {

diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index 490d76d..c75c7c0 100644 (file)
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -236,13 +236,15 @@ CONTROL;
                        }
                        // Build the link
                        if( $rcid ) {
+                               $token = $wgUser->editToken( $rcid );
                                $patrol = ' <span class="patrollink">[' . $sk->link(
                                        $this->mTitle, 
                                        wfMsgHtml( 'markaspatrolleddiff' ),
                                        array(),
                                        array(
                                                'action' => 'markpatrolled',
-                                               'rcid' => $rcid
+                                               'rcid' => $rcid,
+                                               'token' => $token,
                                        ),
                                        array(
                                                'known',
@@ -461,6 +463,7 @@ CONTROL;
                # Add redundant patrol link on bottom...
                if( $this->mRcidMarkPatrolled && $this->mTitle->quickUserCan('patrol') ) {
                        $sk = $wgUser->getSkin();
+                       $token = $wgUser->editToken( $this->mRcidMarkPatrolled );
                        $wgOut->addHTML(
                                "<div class='patrollink'>[" . $sk->link(
                                        $this->mTitle,
@@ -468,7 +471,8 @@ CONTROL;
                                        array(),
                                        array(
                                                'action' => 'markpatrolled',
-                                               'rcid' => $this->mRcidMarkPatrolled
+                                               'rcid' => $this->mRcidMarkPatrolled,
+                                               'token' => $token,
                                        )
                                ) . ']</div>'
                         );