X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialUserlogin.php;h=7fa01d21894bb784afb669129c1f16b39a2037a6;hb=35e5762255b8cba9759a2db7e23dc2b785ff4444;hp=53fc94c4947749b9f5e6e46591d9675980565248;hpb=b0c8c2ce80e86cc8af218df2d5131e7824ea2cd6;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php index 53fc94c494..7fa01d2189 100644 --- a/includes/SpecialUserlogin.php +++ b/includes/SpecialUserlogin.php @@ -1,8 +1,7 @@ setPassword( null ); $u->saveSettings(); - $result = $this->mailPasswordInternal($u); + $result = $this->mailPasswordInternal( $u, false ); wfRunHooks( 'AddNewAccount', array( $u ) ); @@ -145,23 +147,30 @@ class LoginForm { */ function addNewAccount() { global $wgUser, $wgEmailAuthentication; - + # Create the account and abort if there's a problem doing so $u = $this->addNewAccountInternal(); if( $u == NULL ) return; - + # If we showed up language selection links, and one was in use, be # smart (and sensible) and save that language as the user's preference global $wgLoginLanguageSelector; if( $wgLoginLanguageSelector && $this->mLanguage ) $u->setOption( 'language', $this->mLanguage ); - + # Save user settings and send out an email authentication message if needed $u->saveSettings(); - if( $wgEmailAuthentication && User::isValidEmailAddr( $u->getEmail() ) ) - $u->sendConfirmationMail(); - + if( $wgEmailAuthentication && User::isValidEmailAddr( $u->getEmail() ) ) { + global $wgOut; + $error = $u->sendConfirmationMail(); + if( WikiError::isError( $error ) ) { + $wgOut->addWikiText( wfMsg( 'confirmemail_sendfailed', $error->getMessage() ) ); + } else { + $wgOut->addWikiText( wfMsg( 'confirmemail_oncreate' ) ); + } + } + # If not logged in, assume the new account as the current one and set session cookies # then show a "welcome" message or a "need cookies" message as needed if( $wgUser->isAnon() ) { @@ -176,8 +185,7 @@ class LoginForm { } else { # Confirm that the account was created global $wgOut; - $skin = $wgUser->getSkin(); - $self = Title::makeTitle( NS_SPECIAL, 'Userlogin' ); + $self = SpecialPage::getTitleFor( 'Userlogin' ); $wgOut->setPageTitle( wfMsgHtml( 'accountcreated' ) ); $wgOut->setArticleRelated( false ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); @@ -194,8 +202,8 @@ class LoginForm { function addNewAccountInternal() { global $wgUser, $wgOut; global $wgEnableSorbs, $wgProxyWhitelist; - global $wgMemc, $wgAccountCreationThrottle, $wgDBname; - global $wgAuth, $wgMinimalPasswordLength, $wgReservedUsernames; + global $wgMemc, $wgAccountCreationThrottle; + global $wgAuth, $wgMinimalPasswordLength; // If the user passes an invalid domain, something is fishy if( !$wgAuth->validDomain( $this->mDomain ) ) { @@ -221,6 +229,7 @@ class LoginForm { return false; } + #Â Check anonymous user ($wgUser) limitations : if (!$wgUser->isAllowedToCreateAccount()) { $this->userNotPrivilegedMessage(); return false; @@ -234,9 +243,10 @@ class LoginForm { return; } + # Now create a dummy user ($u) and check if it is valid $name = trim( $this->mName ); - $u = User::newFromName( $name ); - if ( is_null( $u ) || in_array( $u->getName(), $wgReservedUsernames ) ) { + $u = User::newFromName( $name, 'creatable' ); + if ( is_null( $u ) ) { $this->mainLoginForm( wfMsg( 'noname' ) ); return false; } @@ -251,13 +261,21 @@ class LoginForm { return false; } - if ( !$wgUser->isValidPassword( $this->mPassword ) ) { + if ( !$u->isValidPassword( $this->mPassword ) ) { $this->mainLoginForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) ); return false; } - if ( $wgAccountCreationThrottle ) { - $key = $wgDBname.':acctcreate:ip:'.$ip; + $abortError = ''; + if( !wfRunHooks( 'AbortNewAccount', array( $u, &$abortError ) ) ) { + // Hook point to add extra creation throttles and blocks + wfDebug( "LoginForm::addNewAccountInternal: a hook blocked creation\n" ); + $this->mainLoginForm( $abortError ); + return false; + } + + if ( $wgAccountCreationThrottle && $wgUser->isPingLimitable() ) { + $key = wfMemcKey( 'acctcreate', 'ip', $ip ); $value = $wgMemc->incr( $key ); if ( !$value ) { $wgMemc->set( $key, 1, 86400 ); @@ -268,23 +286,11 @@ class LoginForm { } } - $abortError = ''; - if( !wfRunHooks( 'AbortNewAccount', array( $u, &$abortError ) ) ) { - // Hook point to add extra creation throttles and blocks - wfDebug( "LoginForm::addNewAccountInternal: a hook blocked creation\n" ); - $this->mainLoginForm( $abortError ); - return false; - } - - if( !$wgAuth->addUser( $u, $this->mPassword ) ) { + if( !$wgAuth->addUser( $u, $this->mPassword, $this->mEmail, $this->mRealName ) ) { $this->mainLoginForm( wfMsg( 'externaldberror' ) ); return false; } - # Update user count - $ssUpdate = new SiteStatsUpdate( 0, 0, 0, 0, 1 ); - $ssUpdate->doUpdate(); - return $this->initUser( $u ); } @@ -296,34 +302,48 @@ class LoginForm { * @return User object. * @private */ - function &initUser( &$u ) { + function initUser( $u ) { + global $wgAuth; + $u->addToDatabase(); - $u->setPassword( $this->mPassword ); + + if ( $wgAuth->allowPasswordChange() ) { + $u->setPassword( $this->mPassword ); + } + $u->setEmail( $this->mEmail ); $u->setRealName( $this->mRealName ); $u->setToken(); - global $wgAuth; $wgAuth->initUser( $u ); $u->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 ); + $u->saveSettings(); + + # Update user count + $ssUpdate = new SiteStatsUpdate( 0, 0, 0, 0, 1 ); + $ssUpdate->doUpdate(); return $u; } /** - * @private + * Internally authenticate the login request. + * + * This may create a local account as a side effect if the + * authentication plugin allows transparent local account + * creation. + * + * @public */ - - function authenticateUserData() - { - global $wgUser, $wgAuth, $wgReservedUsernames; + function authenticateUserData() { + global $wgUser, $wgAuth; if ( '' == $this->mName ) { - return AuthNoName; + return self::NO_NAME; } $u = User::newFromName( $this->mName ); - if( is_null( $u ) || in_array( $u->getName(), $wgReservedUsernames ) ) { - return AuthIllegal; + if( is_null( $u ) || !User::isUsableName( $u->getName() ) ) { + return self::ILLEGAL; } if ( 0 == $u->getID() ) { global $wgAuth; @@ -334,39 +354,80 @@ class LoginForm { */ if ( $wgAuth->autoCreate() && $wgAuth->userExists( $u->getName() ) ) { if ( $wgAuth->authenticate( $u->getName(), $this->mPassword ) ) { - $u =& $this->initUser( $u ); + $u = $this->initUser( $u ); } else { - return AuthPluginPass; + return self::WRONG_PLUGIN_PASS; } } else { - return AuthNotExists; + return self::NOT_EXISTS; } } else { - $u->loadFromDatabase(); + $u->load(); } - if (!$u->checkPassword( $this->mPassword )) { - return '' == $this->mPassword ? AuthEmptyPass : AuthWrongPass; + // Give general extensions, such as a captcha, a chance to abort logins + $abort = self::ABORTED; + if( !wfRunHooks( 'AbortLogin', array( $u, $this->mPassword, &$abort ) ) ) { + return $abort; } - else - { + + if (!$u->checkPassword( $this->mPassword )) { + if( $u->checkTemporaryPassword( $this->mPassword ) ) { + // The e-mailed temporary password should not be used + // for actual logins; that's a very sloppy habit, + // and insecure if an attacker has a few seconds to + // click "search" on someone's open mail reader. + // + // Allow it to be used only to reset the password + // a single time to a new value, which won't be in + // the user's e-mail archives. + // + // For backwards compatibility, we'll still recognize + // it at the login form to minimize surprises for + // people who have been logging in with a temporary + // password for some time. + // + // As a side-effect, we can authenticate the user's + // e-mail address if it's not already done, since + // the temporary password was sent via e-mail. + // + if( !$u->isEmailConfirmed() ) { + $u->confirmEmail(); + } + + // At this point we just return an appropriate code + // indicating that the UI should show a password + // reset form; bot interfaces etc will probably just + // fail cleanly here. + // + $retval = self::RESET_PASS; + } else { + $retval = '' == $this->mPassword ? self::EMPTY_PASS : self::WRONG_PASS; + } + } else { $wgAuth->updateUser( $u ); $wgUser = $u; - return AuthSuccess; + + $retval = self::SUCCESS; } + wfRunHooks( 'LoginAuthenticateAudit', array( $u, $this->mPassword, $retval ) ); + return $retval; } - + function processLogin() { - global $wgUser, $wgAuth, $wgReservedUsernames; + global $wgUser, $wgAuth; switch ($this->authenticateUserData()) { - case (AuthSuccess): + case self::SUCCESS: # We've verified now, update the real record - # - $wgUser->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 ); + if( (bool)$this->mRemember != (bool)$wgUser->getOption( 'rememberpassword' ) ) { + $wgUser->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 ); + $wgUser->saveSettings(); + } else { + $wgUser->invalidateCache(); + } $wgUser->setCookies(); - $wgUser->saveSettings(); if( $this->hasSessionCookie() ) { return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) ); @@ -375,39 +436,61 @@ class LoginForm { } break; - case (AuthNoName): - case (AuthIllegal): + case self::NO_NAME: + case self::ILLEGAL: $this->mainLoginForm( wfMsg( 'noname' ) ); break; - case (AuthWrongPluginPass): + case self::WRONG_PLUGIN_PASS: $this->mainLoginForm( wfMsg( 'wrongpassword' ) ); break; - case (AuthNotExists): + case self::NOT_EXISTS: $this->mainLoginForm( wfMsg( 'nosuchuser', htmlspecialchars( $this->mName ) ) ); break; - case (AuthWrongPass): + case self::WRONG_PASS: $this->mainLoginForm( wfMsg( 'wrongpassword' ) ); break; - case (AuthEmptyPass): + case self::EMPTY_PASS: $this->mainLoginForm( wfMsg( 'wrongpasswordempty' ) ); break; + case self::RESET_PASS: + $this->resetLoginForm( wfMsg( 'resetpass_announce' ) ); + break; default: wfDebugDieBacktrace( "Unhandled case value" ); } } + function resetLoginForm( $error ) { + global $wgOut; + $wgOut->addWikiText( "