X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialUserlogin.php;h=f304ac0c4d8074121e7fbad5beca7a56113d8c44;hb=40745cfef875263d13f29cea01b501655d218f16;hp=0702ed42c604167247307dee18a34317fd01c29a;hpb=92c122bc67d17fd563d31e888d25e8c5d7c03a75;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php index 0702ed42c6..f304ac0c4d 100644 --- a/includes/SpecialUserlogin.php +++ b/includes/SpecialUserlogin.php @@ -11,7 +11,7 @@ function wfSpecialUserlogin() { global $wgCommandLineMode; global $wgRequest; - if( !$wgCommandLineMode && !isset( $_COOKIE[ini_get('session.name')] ) ) { + if( !$wgCommandLineMode && !isset( $_COOKIE[session_name()] ) ) { User::SetupSession(); } @@ -27,7 +27,7 @@ function wfSpecialUserlogin() { class LoginForm { var $mName, $mPassword, $mRetype, $mReturnto, $mCookieCheck, $mPosted; var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword; - var $mLoginattempt, $mRemember, $mEmail; + var $mLoginattempt, $mRemember, $mEmail, $mDomain; /** * Constructor @@ -35,10 +35,13 @@ class LoginForm { */ function LoginForm( &$request ) { global $wgLang, $wgAllowRealName, $wgEnableEmail; + global $wgAuth; + $this->mType = $request->getText( 'type' ); $this->mName = $request->getText( 'wpName' ); $this->mPassword = $request->getText( 'wpPassword' ); $this->mRetype = $request->getText( 'wpRetype' ); + $this->mDomain = $request->getText( 'wpDomain' ); $this->mReturnto = $request->getVal( 'returnto' ); $this->mCookieCheck = $request->getVal( 'wpCookieCheck' ); $this->mPosted = $request->wasPosted(); @@ -61,7 +64,12 @@ class LoginForm { } else { $this->mRealName = ''; } - + + if( !$wgAuth->validDomain( $this->mDomain ) ) { + $this->mDomain = 'invaliddomain'; + } + $wgAuth->setDomain( $this->mDomain ); + # When switching accounts, it sucks to get automatically logged out if( $this->mReturnto == $wgLang->specialPage( 'Userlogout' ) ) { $this->mReturnto = ''; @@ -91,7 +99,6 @@ class LoginForm { */ function addNewAccountMailPassword() { global $wgOut; - global $wgEmailAuthentication; if ('' == $this->mEmail) { $this->mainLoginForm( wfMsg( 'noemail', htmlspecialchars( $this->mName ) ) ); @@ -104,37 +111,19 @@ class LoginForm { return; } - $newadr = strtolower($this->mEmail); - - # prepare for authentication and mail a temporary password to newadr - if ( !$u->isValidEmailAddr( $newadr ) ) { - return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) ); - } - $u->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record - $u->mEmailAuthenticationtimestamp = 0; # but flag as "dirty" = unauthenticated - - if ($wgEmailAuthentication) { - $error = $this->mailPasswordInternal( $u, true, $dummy ); # mail a temporary password to the dirty address - } - + $u->saveSettings(); + $result = $this->mailPasswordInternal($u); + $wgOut->setPageTitle( wfMsg( 'accmailtitle' ) ); $wgOut->setRobotpolicy( 'noindex,nofollow' ); $wgOut->setArticleRelated( false ); - if ($wgEmailAuthentication) { - if ($error === '') { - return $this->mainLoginForm( wfMsg( 'passwordsentforemailauthentication', $u->getName() ) ); + if( WikiError::isError( $result ) ) { + $this->mainLoginForm( wfMsg( 'mailerror', $result->getMessage() ) ); } else { - return $this->mainLoginForm( wfMsg( 'mailerror', $error ) ); + $wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) ); + $wgOut->returnToMain( false ); } - # if user returns, that new email address gets authenticated in checkpassword() - } -# if ( $error === '' ) { -# $wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) ); -# $wgOut->returnToMain( false ); -# } else { -# $this->mainLoginForm( wfMsg( 'mailerror', $error ) ); -# } $u = 0; } @@ -143,8 +132,7 @@ class LoginForm { * @access private */ function addNewAccount() { - global $wgUser, $wgOut; - global $wgEmailAuthentication; + global $wgUser, $wgOut, $wgEmailAuthentication; $u = $this->addNewAccountInternal(); @@ -152,31 +140,15 @@ class LoginForm { return; } - $newadr = strtolower($this->mEmail); - if ($newadr != '') { # prepare for authentication and mail a temporary password to newadr - if ( !$u->isValidEmailAddr( $newadr ) ) { - return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) ); - } - $u->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record - $u->mEmailAuthenticationtimestamp = 0; # but flag as "dirty" = unauthenticated - - if ($wgEmailAuthentication) { - # mail a temporary password to the dirty address - - $error = $this->mailPasswordInternal( $u, true, $dummy ); - if ($error === '') { - return $this->mainLoginForm( wfMsg( 'passwordsentforemailauthentication', $u->getName() ) ); - } else { - return $this->mainLoginForm( wfMsg( 'mailerror', $error ) ); - } - # if user returns, that new email address gets authenticated in checkpassword() - } - } - $wgUser = $u; $wgUser->setCookies(); $wgUser->saveSettings(); + if( $wgEmailAuthentication && $wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) { + $wgUser->sendConfirmationMail(); + } + + wfRunHooks( 'AddNewAccount' ); if( $this->hasSessionCookie() ) { return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) ); @@ -190,15 +162,43 @@ class LoginForm { */ function addNewAccountInternal() { global $wgUser, $wgOut; - global $wgMaxNameChars; - global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP; - global $wgMinimalPasswordLength; + global $wgUseLatin1, $wgEnableSorbs, $wgProxyWhitelist; + global $wgMemc, $wgAccountCreationThrottle, $wgDBname; + global $wgAuth, $wgMinimalPasswordLength; + + // If the user passes an invalid domain, something is fishy + if( !$wgAuth->validDomain( $this->mDomain ) ) { + $this->mainLoginForm( wfMsg( 'wrongpassword' ) ); + return false; + } + + // If we are not allowing users to login locally, we should + // be checking to see if the user is actually able to + // authenticate to the authentication server before they + // create an account (otherwise, they can create a local account + // and login as any domain user). We only need to check this for + // domains that aren't local. + if( 'local' != $this->mDomain && '' != $this->mDomain ) { + if( !$wgAuth->canCreateAccounts() && ( !$wgAuth->userExists( $this->mName ) || !$wgAuth->authenticate( $this->mName, $this->mPassword ) ) ) { + $this->mainLoginForm( wfMsg( 'wrongpassword' ) ); + return false; + } + } if (!$wgUser->isAllowedToCreateAccount()) { $this->userNotPrivilegedMessage(); return false; } + $ip = wfGetIP(); + if ( $wgEnableSorbs && !in_array( $ip, $wgProxyWhitelist ) && + $wgUser->inSorbsBlacklist( $ip ) ) + { + $this->mainLoginForm( wfMsg( 'sorbs_create_account_reason' ) . ' (' . htmlspecialchars( $ip ) . ')' ); + return; + } + + if ( 0 != strcmp( $this->mPassword, $this->mRetype ) ) { $this->mainLoginForm( wfMsg( 'badretype' ) ); return false; @@ -206,16 +206,11 @@ class LoginForm { $name = trim( $this->mName ); $u = User::newFromName( $name ); - if ( is_null( $u ) || - ( '' == $name ) || - $wgUser->isIP( $name ) || - (strpos( $name, '/' ) !== false) || - (strlen( $name ) > $wgMaxNameChars) || - ucFirst($name) != $u->getName() ) - { + if ( is_null( $u ) ) { $this->mainLoginForm( wfMsg( 'noname' ) ); return false; } + if ( wfReadOnly() ) { $wgOut->readOnlyPage(); return false; @@ -226,13 +221,13 @@ class LoginForm { return false; } - if ( strlen( $this->mPassword ) < $wgMinimalPasswordLength ) { + if ( !$wgUser->isValidPassword( $this->mPassword ) ) { $this->mainLoginForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) ); return false; } if ( $wgAccountCreationThrottle ) { - $key = $wgDBname.':acctcreate:ip:'.$wgIP; + $key = $wgDBname.':acctcreate:ip:'.$ip; $value = $wgMemc->incr( $key ); if ( !$value ) { $wgMemc->set( $key, 1, 86400 ); @@ -243,6 +238,15 @@ class LoginForm { } } + if( !$wgAuth->addUser( $u, $this->mPassword ) ) { + $this->mainLoginForm( wfMsg( 'externaldberror' ) ); + return false; + } + + # Update user count + $ssUpdate = new SiteStatsUpdate( 0, 0, 0, 0, 1 ); + $ssUpdate->doUpdate(); + return $this->initUser( $u ); } @@ -264,9 +268,7 @@ class LoginForm { global $wgAuth; $wgAuth->initUser( $u ); - if ( $this->mRemember ) { $r = 1; } - else { $r = 0; } - $u->setOption( 'rememberpassword', $r ); + $u->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 ); return $u; } @@ -275,8 +277,8 @@ class LoginForm { * @access private */ function processLogin() { - global $wgUser, $wgLang; - global $wgEmailAuthentication; + global $wgUser; + global $wgAuth; if ( '' == $this->mName ) { $this->mainLoginForm( wfMsg( 'noname' ) ); @@ -309,16 +311,8 @@ class LoginForm { $u->loadFromDatabase(); } - # store temporarily the status before the password check is performed - $mailmsg = ''; - $oldadr = strtolower($u->getEmail()); - $newadr = strtolower($this->mEmail); - $alreadyauthenticated = (( $u->mEmailAuthenticationtimestamp != 0 ) || ($oldadr == '')) ; - - # checkPassword sets EmailAuthenticationtimestamp, if the newPassword is used - if (!$u->checkPassword( $this->mPassword )) { - $this->mainLoginForm( wfMsg( 'wrongpassword' ) ); + $this->mainLoginForm( wfMsg( $this->mPassword == '' ? 'wrongpasswordempty' : 'wrongpassword' ) ); return; } @@ -331,54 +325,15 @@ class LoginForm { } $u->setOption( 'rememberpassword', $r ); - /* check if user with correct password has entered a new email address */ - if (($newadr <> '') && ($newadr <> $oldadr)) { # the user supplied a new email address on the login page - - # prepare for authentication and mail a temporary password to newadr - if ( !$u->isValidEmailAddr( $newadr ) ) { - return $this->mainLoginForm( wfMsg( 'invalidemailaddress', $error ) ); - } - $u->mEmail = $newadr; # new behaviour: store this new emailaddr from login-page now into user database record ... - $u->mEmailAuthenticationtimestamp = 0; # ... but flag the address as "dirty" (unauthenticated) - $alreadyauthenticated = false; - - if ($wgEmailAuthentication) { - - # mail a temporary one-time password to the dirty address and return here to complete the user login - # if the user returns now or later using this temp. password, then the new email address $newadr - # - which is already stored in his user record - gets authenticated in checkpassword() - - $error = $this->mailPasswordInternal( $u, false, $newpassword_temp); - $u->mNewpassword = $newpassword_temp; - - # The temporary password is mailed. The user is logged-in as he entered his correct password - # This appears to be more intuitive than alternative 2. - - if ($error === '') { - $mailmsg = '
' . wfMsg( 'passwordsentforemailauthentication', $u->getName() ); - } else { - $mailmsg = '
' . wfMsg( 'mailerror', $error ) ; - } - } - } + $wgAuth->updateUser( $u ); $wgUser = $u; $wgUser->setCookies(); - # save all settings (incl. new email address and/or temporary password, if applicable) $wgUser->saveSettings(); - if ( !$wgEmailAuthentication || $alreadyauthenticated ) { - $authenticated = ''; - $mailmsg = ''; - } elseif ($u->mEmailAuthenticationtimestamp != 0) { - $authenticated = ' ' . wfMsg( 'emailauthenticated', $wgLang->timeanddate( $u->mEmailAuthenticationtimestamp, true ) ); - } else { - $authenticated = ' ' . wfMsg( 'emailnotauthenticated' ); - } - if( $this->hasSessionCookie() ) { - return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) . $authenticated . $mailmsg ); + return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) ); } else { return $this->cookieRedirectCheck( 'login' ); } @@ -407,21 +362,21 @@ class LoginForm { $u->loadFromDatabase(); - $error = $this->mailPasswordInternal( $u, true, $dummy ); - if ($error === '') { - $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ) ); + $result = $this->mailPasswordInternal( $u ); + if( WikiError::isError( $result ) ) { + $this->mainLoginForm( wfMsg( 'mailerror', $result->getMessage() ) ); } else { - $this->mainLoginForm( wfMsg( 'mailerror', $error ) ); + $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ), 'success' ); } - return; } /** + * @return mixed true on success, WikiError on failure * @access private */ - function mailPasswordInternal( $u, $savesettings = true, &$newpassword_out ) { - global $wgPasswordSender, $wgDBname, $wgIP; + function mailPasswordInternal( $u ) { + global $wgPasswordSender, $wgDBname; global $wgCookiePath, $wgCookieDomain; if ( '' == $u->getEmail() ) { @@ -431,25 +386,17 @@ class LoginForm { $np = $u->randomPassword(); $u->setNewpassword( $np ); - # we want to store this new password together with other values in the calling function - $newpassword_out = $u->mNewpassword; - - # WHY IS THIS HERE ? SHOULDN'T IT BE User::setcookie ??? setcookie( "{$wgDBname}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain ); - if ($savesettings) { $u->saveSettings(); - } - $ip = $wgIP; + $ip = wfGetIP(); if ( '' == $ip ) { $ip = '(Unknown)'; } - $m = wfMsg( 'passwordremindermailbody', $ip, $u->getName(), wfUrlencode($u->getName()), $np ); + $m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np ); - require_once('UserMailer.php'); - $error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( 'passwordremindermailsubject' ), $m ); - - return htmlspecialchars( $error ); + $result = $u->sendMail( wfMsg( 'passwordremindertitle' ), $m ); + return $result; } @@ -488,10 +435,10 @@ class LoginForm { /** * @access private */ - function mainLoginForm( $err ) { + function mainLoginForm( $msg, $msgtype = 'error' ) { global $wgUser, $wgOut, $wgLang; global $wgDBname, $wgAllowRealName, $wgEnableEmail; - global $wgEmailAuthentication; + global $wgAuth; if ( '' == $this->mName ) { if ( $wgUser->isLoggedIn() ) { @@ -501,29 +448,50 @@ class LoginForm { } } - $q = 'action=submitlogin'; - if ( !empty( $this->mReturnto ) ) { - $q .= '&returnto=' . wfUrlencode( $this->mReturnto ); - } $titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' ); require_once( 'templates/Userlogin.php' ); - $template =& new UserloginTemplate(); + + if ( $this->mType == 'signup' ) { + $template =& new UsercreateTemplate(); + $q = 'action=submitlogin&type=signup'; + $linkq = 'type=login'; + $linkmsg = 'gotaccount'; + } else { + $template =& new UserloginTemplate(); + $q = 'action=submitlogin&type=login'; + $linkq = 'type=signup'; + $linkmsg = 'nologin'; + } + + if ( !empty( $this->mReturnto ) ) { + $returnto = '&returnto=' . wfUrlencode( $this->mReturnto ); + $q .= $returnto; + $linkq .= $returnto; + } + + $link = ''; + $link .= wfMsgHtml( $linkmsg . 'link' ); + $link .= ''; + + $template->set( 'link', wfMsgHtml( $linkmsg, $link ) ); $template->set( 'name', $this->mName ); $template->set( 'password', $this->mPassword ); $template->set( 'retype', $this->mRetype ); $template->set( 'email', $this->mEmail ); $template->set( 'realname', $this->mRealName ); + $template->set( 'domain', $this->mDomain ); $template->set( 'action', $titleObj->getLocalUrl( $q ) ); - $template->set( 'error', $err ); + $template->set( 'message', $msg ); + $template->set( 'messagetype', $msgtype ); $template->set( 'create', $wgUser->isAllowedToCreateAccount() ); $template->set( 'createemail', $wgEnableEmail && $wgUser->isLoggedIn() ); $template->set( 'userealname', $wgAllowRealName ); $template->set( 'useemail', $wgEnableEmail ); - $template->set( 'useemailauthent', $wgEmailAuthentication ); $template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) or $this->mRemember ); + $wgAuth->modifyUITemplate( $template ); $wgOut->setPageTitle( wfMsg( 'userlogin' ) ); $wgOut->setRobotpolicy( 'noindex,nofollow' ); @@ -536,7 +504,7 @@ class LoginForm { */ function hasSessionCookie() { global $wgDisableCookieCheck; - return ( $wgDisableCookieCheck ) ? true : ( '' != $_COOKIE[session_name()] ); + return ( $wgDisableCookieCheck ) ? true : ( isset( $_COOKIE[session_name()] ) ); } /**