Don't use public-audience-only function
[lhc/web/wiklou.git] / includes / api / ApiLogin.php
index 2b603b3..108ce81 100644 (file)
@@ -32,27 +32,10 @@ if (!defined('MEDIAWIKI')) {
 /**
  * Unit to authenticate log-in attempts to the current wiki.
  *
- * @addtogroup API
+ * @ingroup API
  */
 class ApiLogin extends ApiBase {
 
-       /**
-        * Time (in seconds) a user must wait after submitting
-        * a bad login (will be multiplied by the THROTTLE_FACTOR for each bad attempt)
-        */
-       const THROTTLE_TIME = 5;
-
-       /**
-        * The factor by which the wait-time in between authentication
-        * attempts is increased every failed attempt.
-        */
-       const THROTTLE_FACTOR = 2;
-
-       /**
-        * The maximum number of failed logins after which the wait increase stops.
-        */
-       const THOTTLE_MAX_COUNT = 10;
-
        public function __construct($main, $action) {
                parent :: __construct($main, $action, 'lg');
        }
@@ -74,16 +57,6 @@ class ApiLogin extends ApiBase {
 
                $result = array ();
 
-               // Make sure noone is trying to guess the password brut-force
-               $nextLoginIn = $this->getNextLoginTimeout();
-               if ($nextLoginIn > 0) {
-                       $result['result']  = 'NeedToWait';
-                       $result['details'] = "Please wait $nextLoginIn seconds before next log-in attempt";
-                       $result['wait'] = $nextLoginIn;
-                       $this->getResult()->addValue(null, 'login', $result);
-                       return;
-               }
-
                $params = new FauxRequest(array (
                        'wpName' => $name,
                        'wpPassword' => $password,
@@ -97,17 +70,22 @@ class ApiLogin extends ApiBase {
                }
 
                $loginForm = new LoginForm($params);
-               switch ($loginForm->authenticateUserData()) {
+               switch ($authRes = $loginForm->authenticateUserData()) {
                        case LoginForm :: SUCCESS :
                                global $wgUser, $wgCookiePrefix;
 
                                $wgUser->setOption('rememberpassword', 1);
                                $wgUser->setCookies();
 
+                               // Run hooks. FIXME: split back and frontend from this hook.
+                               // FIXME: This hook should be placed in the backend
+                               $injected_html = '';
+                               wfRunHooks('UserLoginComplete', array(&$wgUser, &$injected_html));
+
                                $result['result'] = 'Success';
-                               $result['lguserid'] = $_SESSION['wsUserID'];
-                               $result['lgusername'] = $_SESSION['wsUserName'];
-                               $result['lgtoken'] = $_SESSION['wsToken'];
+                               $result['lguserid'] = $wgUser->getId();
+                               $result['lgusername'] = $wgUser->getName();
+                               $result['lgtoken'] = $wgUser->getToken();
                                $result['cookieprefix'] = $wgCookiePrefix;
                                $result['sessionid'] = session_id();
                                break;
@@ -134,96 +112,19 @@ class ApiLogin extends ApiBase {
                                $result['result'] = 'CreateBlocked';
                                $result['details'] = 'Your IP address is blocked from account creation';
                                break;
+                       case LoginForm :: THROTTLED :
+                               global $wgPasswordAttemptThrottle;
+                               $result['result'] = 'Throttled';
+                               $result['wait'] = $wgPasswordAttemptThrottle['seconds'];
+                               break;
                        default :
-                               ApiBase :: dieDebug(__METHOD__, 'Unhandled case value');
-               }
-
-               if ($result['result'] != 'Success' && !isset( $result['details'] ) ) {
-                       $delay = $this->cacheBadLogin();
-                       $result['wait'] = $delay;
-                       $result['details'] = "Please wait " . $delay . " seconds before next log-in attempt";
+                               ApiBase :: dieDebug(__METHOD__, "Unhandled case value: {$authRes}");
                }
-               // if we were allowed to try to login, memcache is fine
 
                $this->getResult()->addValue(null, 'login', $result);
        }
 
-
-       /**
-        * Caches a bad-login attempt associated with the host and with an
-        * expiry of $this->mLoginThrottle. These are cached by a key
-        * separate from that used by the captcha system--as such, logging
-        * in through the standard interface will get you a legal session
-        * and cookies to prove it, but will not remove this entry.
-        *
-        * Returns the number of seconds until next login attempt will be allowed.
-        *
-        * @access private
-        */
-       private function cacheBadLogin() {
-               global $wgMemc;
-
-               $key = $this->getMemCacheKey();
-               $val = $wgMemc->get( $key );
-
-               $val['lastReqTime'] = time();
-               if (!isset($val['count'])) {
-                       $val['count'] = 1;
-               } else {
-                       $val['count'] = 1 + $val['count'];
-               }
-
-               $delay = ApiLogin::calculateDelay($val['count']);
-
-               $wgMemc->delete($key);
-               // Cache expiration should be the maximum timeout - to prevent a "try and wait" attack
-               $wgMemc->add( $key, $val, ApiLogin::calculateDelay(ApiLogin::THOTTLE_MAX_COUNT) );
-
-               return $delay;
-       }
-
-       /**
-        * How much time the client must wait before it will be
-        * allowed to try to log-in next.
-        * The return value is 0 if no wait is required.
-        */
-       private function getNextLoginTimeout() {
-               global $wgMemc;
-
-               $val = $wgMemc->get($this->getMemCacheKey());
-
-               $elapse = (time() - $val['lastReqTime']);  // in seconds
-               $canRetryIn = ApiLogin::calculateDelay($val['count']) - $elapse;
-
-               return $canRetryIn < 0 ? 0 : $canRetryIn;
-       }
-
-       /**
-        * Based on the number of previously attempted logins, returns
-        * the delay (in seconds) when the next login attempt will be allowed.
-        */
-       private static function calculateDelay($count) {
-               // Defensive programming
-               $count = intval($count);
-               $count = $count < 1 ? 1 : $count;
-               $count = $count > self::THOTTLE_MAX_COUNT ? self::THOTTLE_MAX_COUNT : $count;
-
-               return self::THROTTLE_TIME + self::THROTTLE_TIME * ($count - 1) * self::THROTTLE_FACTOR;
-       }
-
-       /**
-       * Internal cache key for badlogin checks. Robbed from the
-       * ConfirmEdit extension and modified to use a key unique to the
-       * API login.3
-       *
-       * @return string
-       * @access private
-       */
-       private function getMemCacheKey() {
-               return wfMemcKey( 'apilogin', 'badlogin', 'ip', wfGetIP() );
-       }
-
-       //public function mustBePosted() { return true; }
+       public function mustBePosted() { return true; }
 
        public function getAllowedParams() {
                return array (