Remove MimeMagic depedency from FSFile and move it to /libs

[lhc/web/wiklou.git] / includes / api / ApiQueryTokens.php

diff --git a/includes/api/ApiQueryTokens.php b/includes/api/ApiQueryTokens.php
index f887664..de5a377 100644 (file)
--- a/includes/api/ApiQueryTokens.php
+++ b/includes/api/ApiQueryTokens.php
@@ -35,59 +35,95 @@ class ApiQueryTokens extends ApiQueryBase {
 
        public function execute() {
                $params = $this->extractRequestParams();
-               $res = array(
+               $res = [
                        ApiResult::META_TYPE => 'assoc',
-               );
+               ];
 
                if ( $this->lacksSameOriginSecurity() ) {
                        $this->setWarning( 'Tokens may not be obtained when the same-origin policy is not applied' );
                        return;
                }
 
+               $user = $this->getUser();
+               $session = $this->getRequest()->getSession();
                $salts = self::getTokenTypeSalts();
                foreach ( $params['type'] as $type ) {
-                       $salt = $salts[$type];
-                       $val = $this->getUser()->getEditToken( $salt, $this->getRequest() );
-                       $res[$type . 'token'] = $val;
+                       $res[$type . 'token'] = self::getToken( $user, $session, $salts[$type] )->toString();
                }
 
                $this->getResult()->addValue( 'query', $this->getModuleName(), $res );
        }
 
+       /**
+        * Get the salts for known token types
+        * @return (string|array)[] Returning a string will use that as the salt
+        *  for User::getEditTokenObject() to fetch the token, which will give a
+        *  LoggedOutEditToken (always "+\\") for anonymous users. Returning an
+        *  array will use it as parameters to MediaWiki\Session\Session::getToken(),
+        *  which will always return a full token even for anonymous users.
+        */
        public static function getTokenTypeSalts() {
                static $salts = null;
                if ( !$salts ) {
-                       $salts = array(
+                       $salts = [
                                'csrf' => '',
                                'watch' => 'watch',
                                'patrol' => 'patrol',
                                'rollback' => 'rollback',
                                'userrights' => 'userrights',
-                       );
-                       Hooks::run( 'ApiQueryTokensRegisterTypes', array( &$salts ) );
+                               'login' => [ '', 'login' ],
+                               'createaccount' => [ '', 'createaccount' ],
+                       ];
+                       Hooks::run( 'ApiQueryTokensRegisterTypes', [ &$salts ] );
                        ksort( $salts );
                }
 
                return $salts;
        }
 
+       /**
+        * Get a token from a salt
+        * @param User $user
+        * @param MediaWiki\Session\Session $session
+        * @param string|array $salt A string will be used as the salt for
+        *  User::getEditTokenObject() to fetch the token, which will give a
+        *  LoggedOutEditToken (always "+\\") for anonymous users. An array will
+        *  be used as parameters to MediaWiki\Session\Session::getToken(), which
+        *  will always return a full token even for anonymous users. An array will
+        *  also persist the session.
+        * @return MediaWiki\Session\Token
+        */
+       public static function getToken( User $user, MediaWiki\Session\Session $session, $salt ) {
+               if ( is_array( $salt ) ) {
+                       $session->persist();
+                       return call_user_func_array( [ $session, 'getToken' ], $salt );
+               } else {
+                       return $user->getEditTokenObject( $salt, $session->getRequest() );
+               }
+       }
+
        public function getAllowedParams() {
-               return array(
-                       'type' => array(
+               return [
+                       'type' => [
                                ApiBase::PARAM_DFLT => 'csrf',
                                ApiBase::PARAM_ISMULTI => true,
                                ApiBase::PARAM_TYPE => array_keys( self::getTokenTypeSalts() ),
-                       ),
-               );
+                       ],
+               ];
        }
 
        protected function getExamplesMessages() {
-               return array(
+               return [
                        'action=query&meta=tokens'
                                => 'apihelp-query+tokens-example-simple',
                        'action=query&meta=tokens&type=watch|patrol'
                                => 'apihelp-query+tokens-example-types',
-               );
+               ];
+       }
+
+       public function isReadMode() {
+               // So login tokens can be fetched on private wikis
+               return false;
        }
 
        public function getCacheMode( $params ) {