X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiCheckToken.php;h=dd88b5fe3a5e2800254934f8c2bc5f1a0735d66c;hb=12601ff7d2796752404bfb331fccc41083d31f9f;hp=dfcbaf890e3f91e44420dadef88f07fe43de5b2e;hpb=b85192c7a7cd5f2b5c03c55c1627c14510ef6a1a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiCheckToken.php b/includes/api/ApiCheckToken.php
index dfcbaf890e..e1be8efad2 100644
--- a/includes/api/ApiCheckToken.php
+++ b/includes/api/ApiCheckToken.php
@@ -2,7 +2,7 @@
 /**
  * Created on Jan 29, 2015
  *
- * Copyright © 2015 Brad Jorsch bjorsch@wikimedia.org
+ * Copyright © 2015 Wikimedia Foundation and contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
  * @file
  */
 
+use MediaWiki\Session\Token;
+
 /**
  * @since 1.25
  * @ingroup API
@@ -34,11 +36,16 @@ class ApiCheckToken extends ApiBase {
 		$maxage = $params['maxtokenage'];
 		$salts = ApiQueryTokens::getTokenTypeSalts();
 
-		$res = array();
+		$res = [];
 
 		$tokenObj = ApiQueryTokens::getToken(
 			$this->getUser(), $this->getRequest()->getSession(), $salts[$params['type']]
 		);
+
+		if ( substr( $token, -strlen( urldecode( Token::SUFFIX ) ) ) === urldecode( Token::SUFFIX ) ) {
+			$this->addWarning( 'apiwarn-checktoken-percentencoding' );
+		}
+
 		if ( $tokenObj->match( $token, $maxage ) ) {
 			$res['result'] = 'valid';
 		} elseif ( $maxage !== null && $tokenObj->match( $token ) ) {
@@ -47,7 +54,7 @@ class ApiCheckToken extends ApiBase {
 			$res['result'] = 'invalid';
 		}
 
-		$ts = MediaWiki\Session\Token::getTimestamp( $token );
+		$ts = Token::getTimestamp( $token );
 		if ( $ts !== null ) {
 			$mwts = new MWTimestamp();
 			$mwts->timestamp->setTimestamp( $ts );
@@ -58,25 +65,26 @@ class ApiCheckToken extends ApiBase {
 	}
 
 	public function getAllowedParams() {
-		return array(
-			'type' => array(
+		return [
+			'type' => [
 				ApiBase::PARAM_TYPE => array_keys( ApiQueryTokens::getTokenTypeSalts() ),
 				ApiBase::PARAM_REQUIRED => true,
-			),
-			'token' => array(
+			],
+			'token' => [
 				ApiBase::PARAM_TYPE => 'string',
 				ApiBase::PARAM_REQUIRED => true,
-			),
-			'maxtokenage' => array(
+				ApiBase::PARAM_SENSITIVE => true,
+			],
+			'maxtokenage' => [
 				ApiBase::PARAM_TYPE => 'integer',
-			),
-		);
+			],
+		];
 	}
 
 	protected function getExamplesMessages() {
-		return array(
+		return [
 			'action=checktoken&type=csrf&token=123ABC'
 				=> 'apihelp-checktoken-example-simple',
-		);
+		];
 	}
 }