class LoginForm {
var $mName, $mPassword, $mRetype, $mReturnto, $mCookieCheck, $mPosted;
var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
- var $mLoginattempt, $mRemember, $mEmail;
+ var $mLoginattempt, $mRemember, $mEmail, $mDomain;
/**
* Constructor
*/
function LoginForm( &$request ) {
global $wgLang, $wgAllowRealName, $wgEnableEmail;
- global $wgEmailAuthentication;
+ global $wgAuth;
$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();
} 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 = '';
*/
function addNewAccountMailPassword() {
global $wgOut;
- global $wgEmailAuthentication;
if ('' == $this->mEmail) {
$this->mainLoginForm( wfMsg( 'noemail', htmlspecialchars( $this->mName ) ) );
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 ) );
- }
- # if user returns, that new email address gets authenticated in checkpassword()
+ $wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) );
+ $wgOut->returnToMain( false );
}
-# if ( $error === '' ) {
-# $wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) );
-# $wgOut->returnToMain( false );
-# } else {
-# $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
-# }
$u = 0;
}
* @access private
*/
function addNewAccount() {
- global $wgUser, $wgOut;
- global $wgEmailAuthentication;
+ global $wgUser, $wgOut, $wgEmailAuthentication;
$u = $this->addNewAccountInternal();
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();
+ }
if( $this->hasSessionCookie() ) {
return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
*/
function addNewAccountInternal() {
global $wgUser, $wgOut;
- global $wgMaxNameChars, $wgUseLatin1;
+ global $wgMaxNameChars, $wgUseLatin1, $wgEnableSorbs, $wgProxyWhitelist;
global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP;
global $wgMinimalPasswordLength;
+ global $wgAuth;
+
+ // 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;
}
+ if ( $wgEnableSorbs && !in_array( $wgIP, $wgProxyWhitelist ) &&
+ $wgUser->inSorbsBlacklist( $wgIP ) )
+ {
+ $this->mainLoginForm( wfMsg( 'sorbs_create_account_reason' ) );
+ return;
+ }
+
+
if ( 0 != strcmp( $this->mPassword, $this->mRetype ) ) {
$this->mainLoginForm( wfMsg( 'badretype' ) );
return false;
$wgUser->isIP( $name ) ||
(strpos( $name, '/' ) !== false) ||
(strlen( $name ) > $wgMaxNameChars) ||
- ($wgUseLatin1 && preg_match( "/[\x80-\xA0]/", $name )) ||
ucFirst($name) != $u->getName() )
{
$this->mainLoginForm( wfMsg( 'noname' ) );
}
}
+ 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 );
}
* @access private
*/
function processLogin() {
- global $wgUser, $wgLang;
- global $wgEmailAuthentication;
+ global $wgUser;
+ global $wgAuth;
if ( '' == $this->mName ) {
$this->mainLoginForm( wfMsg( 'noname' ) );
$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' ) );
return;
}
$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 = '<br />' . wfMsg( 'passwordsentforemailauthentication', $u->getName() );
- } else {
- $mailmsg = '<br />' . 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' );
}
$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() ) );
}
- return;
}
/**
+ * @return mixed true on success, WikiError on failure
* @access private
*/
- function mailPasswordInternal( $u, $savesettings = true, &$newpassword_out ) {
+ function mailPasswordInternal( $u ) {
global $wgPasswordSender, $wgDBname, $wgIP;
global $wgCookiePath, $wgCookieDomain;
$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;
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;
}
function mainLoginForm( $err ) {
global $wgUser, $wgOut, $wgLang;
global $wgDBname, $wgAllowRealName, $wgEnableEmail;
- global $wgEmailAuthentication;
+ global $wgAuth;
if ( '' == $this->mName ) {
if ( $wgUser->isLoggedIn() ) {
$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( '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' );
dépôts / lhc / web / wiklou.git / blobdiff