From aa1c3b839972c084d27bff23e4477c098287ff40 Mon Sep 17 00:00:00 2001
From: Marius Hoch <hoo@online.de>
Date: Tue, 13 May 2014 16:29:22 +0200
Subject: [PATCH] Require one of page id or page title as params to ApiRollback

Also made the code flow easier to understand by moving
calls to ApiBase::extractRequestParams up in the stack.

Change-Id: I346c6ae4fc0b48c5a794c3d621018baf9bde6b9e
Follows-up: I9c4e4fa
---
 includes/api/ApiRollback.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php
index 7c893d2f65..fbe87d2c1c 100644
--- a/includes/api/ApiRollback.php
+++ b/includes/api/ApiRollback.php
@@ -43,12 +43,12 @@ class ApiRollback extends ApiBase {
 		$params = $this->extractRequestParams();
 
 		// User and title already validated in call to getTokenSalt from Main
-		$titleObj = $this->getRbTitle();
+		$titleObj = $this->getRbTitle( $params );
 		$pageObj = WikiPage::factory( $titleObj );
 		$summary = $params['summary'];
 		$details = array();
 		$retval = $pageObj->doRollback(
-			$this->getRbUser(),
+			$this->getRbUser( $params ),
 			$summary,
 			$params['token'],
 			$params['markbot'],
@@ -162,16 +162,24 @@ class ApiRollback extends ApiBase {
 	}
 
 	public function getTokenSalt() {
-		return array( $this->getRbTitle()->getPrefixedText(), $this->getRbUser() );
+		$params = $this->extractRequestParams();
+
+		return array(
+			$this->getRbTitle( $params )->getPrefixedText(),
+			$this->getRbUser( $params )
+		);
 	}
 
-	private function getRbUser() {
+	/**
+	 * @param array $params
+	 *
+	 * @return string
+	 */
+	private function getRbUser( array $params ) {
 		if ( $this->mUser !== null ) {
 			return $this->mUser;
 		}
 
-		$params = $this->extractRequestParams();
-
 		// We need to be able to revert IPs, but getCanonicalName rejects them
 		$this->mUser = User::isIP( $params['user'] )
 			? $params['user']
@@ -184,14 +192,16 @@ class ApiRollback extends ApiBase {
 	}
 
 	/**
+	 * @param array $params
+	 *
 	 * @return Title
 	 */
-	private function getRbTitle() {
+	private function getRbTitle( array $params ) {
 		if ( $this->mTitleObj !== null ) {
 			return $this->mTitleObj;
 		}
 
-		$params = $this->extractRequestParams();
+		$this->requireOnlyOneParameter( $params, 'title', 'pageid' );
 
 		if ( isset( $params['title'] ) ) {
 			$this->mTitleObj = Title::newFromText( $params['title'] );
-- 
2.20.1