X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FLogin.php;h=7d6470620acfda4f5b419b8b5b17452a23f8894b;hb=9ea6d4b26d4375502c567276705dff2ff678122e;hp=d2388832695e2a8e5d5b2ee266b8c93409c21331;hpb=745bc7cf3f3990a8887fcc806a16d218f82e35db;p=friendica.git diff --git a/src/Module/Login.php b/src/Module/Login.php index d238883269..7d6470620a 100644 --- a/src/Module/Login.php +++ b/src/Module/Login.php @@ -1,17 +1,22 @@ get_baseurl()); - // NOTREACHED - } + $openid_url = trim(defaults($_POST, 'openid_url', $_POST['username'])); - // Otherwise it's probably an openid. - try { - require_once 'library/openid.php'; - $openid = new \LightOpenID; - $openid->identity = $openid_url; - $_SESSION['openid'] = $openid_url; - $_SESSION['remember'] = $_POST['remember']; - $openid->returnUrl = self::getApp()->get_baseurl(true) . '/openid'; - goaway($openid->authUrl()); - } catch (Exception $e) { - notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '

' . t('The error message was:') . ' ' . $e->getMessage()); - } - // NOTREACHED + self::openIdAuthentication($openid_url, !empty($_POST['remember'])); } if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') { - $record = null; + self::passwordAuthentication( + trim($_POST['username']), + trim($_POST['password']), + !empty($_POST['remember']) + ); + } + } - $addon_auth = [ - 'username' => trim($_POST['username']), - 'password' => trim($_POST['password']), - 'authenticated' => 0, - 'user_record' => null - ]; + /** + * Attempts to authenticate using OpenId + * + * @param string $openid_url OpenID URL string + * @param bool $remember Whether to set the session remember flag + */ + private static function openIdAuthentication($openid_url, $remember) + { + $noid = Config::get('system', 'no_openid'); - /* - * An addon indicates successful login by setting 'authenticated' to non-zero value and returning a user record - * Addons should never set 'authenticated' except to indicate success - as hooks may be chained - * and later addons should not interfere with an earlier one that succeeded. - */ - Addon::callHooks('authenticate', $addon_auth); + // if it's an email address or doesn't resolve to a URL, fail. + if ($noid || strpos($openid_url, '@') || !Network::isUrlValid($openid_url)) { + notice(L10n::t('Login failed.') . EOL); + goaway(self::getApp()->get_baseurl()); + // NOTREACHED + } - if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) { - $record = $addon_auth['user_record']; - } else { - $user_id = User::authenticate(trim($_POST['username']), trim($_POST['password'])); - if ($user_id) { - $record = dba::selectFirst('user', [], ['uid' => $user_id]); - } - } + // Otherwise it's probably an openid. + try { + $a = get_app(); + $openid = new LightOpenID($a->get_hostname()); + $openid->identity = $openid_url; + $_SESSION['openid'] = $openid_url; + $_SESSION['remember'] = $remember; + $openid->returnUrl = self::getApp()->get_baseurl(true) . '/openid'; + goaway($openid->authUrl()); + } catch (Exception $e) { + notice(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '

' . L10n::t('The error message was:') . ' ' . $e->getMessage()); + } + } - if (!$record || !count($record)) { - logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); - notice(t('Login failed.') . EOL); - goaway(self::getApp()->get_baseurl()); - } + /** + * Attempts to authenticate using login/password + * + * @param string $username User name + * @param string $password Clear password + * @param bool $remember Whether to set the session remember flag + */ + private static function passwordAuthentication($username, $password, $remember) + { + $record = null; + + $addon_auth = [ + 'username' => $username, + 'password' => $password, + 'authenticated' => 0, + 'user_record' => null + ]; + + /* + * An addon indicates successful login by setting 'authenticated' to non-zero value and returning a user record + * Addons should never set 'authenticated' except to indicate success - as hooks may be chained + * and later addons should not interfere with an earlier one that succeeded. + */ + Addon::callHooks('authenticate', $addon_auth); + + try { + if ($addon_auth['authenticated']) { + $record = $addon_auth['user_record']; - if (!$_POST['remember']) { - new_cookie(0); // 0 means delete on browser exit + if (empty($record)) { + throw new Exception(L10n::t('Login failed.')); + } + } else { + $record = dba::selectFirst('user', [], + ['uid' => User::getIdFromPasswordAuthentication($username, $password)] + ); } + } catch (Exception $e) { + logger('authenticate: failed login attempt: ' . notags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']); + notice($e->getMessage() . EOL); + goaway(self::getApp()->get_baseurl() . '/login'); + } - // if we haven't failed up this point, log them in. - $_SESSION['remember'] = $_POST['remember']; - $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC'); - authenticate_success($record, true, true); + if (!$remember) { + new_cookie(0); // 0 means delete on browser exit + } - if (x($_SESSION, 'return_url')) { - $return_url = $_SESSION['return_url']; - unset($_SESSION['return_url']); - } else { - $return_url = ''; - } + // if we haven't failed up this point, log them in. + $_SESSION['remember'] = $remember; + $_SESSION['last_login_date'] = DateTimeFormat::utcNow(); + authenticate_success($record, true, true); - goaway($return_url); + if (x($_SESSION, 'return_url')) { + $return_url = $_SESSION['return_url']; + unset($_SESSION['return_url']); + } else { + $return_url = ''; } + + goaway($return_url); } /** @@ -215,10 +249,10 @@ class Login extends BaseModule // stays logged in for a long time, e.g. with "Remember Me" $login_refresh = false; if (!x($_SESSION['last_login_date'])) { - $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC'); + $_SESSION['last_login_date'] = DateTimeFormat::utcNow(); } - if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) { - $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC'); + if (strcmp(DateTimeFormat::utc('now - 12 hours'), $_SESSION['last_login_date']) > 0) { + $_SESSION['last_login_date'] = DateTimeFormat::utcNow(); $login_refresh = true; } authenticate_success($user, false, false, $login_refresh); @@ -246,8 +280,8 @@ class Login extends BaseModule $reg = false; if ($register) { $reg = [ - 'title' => t('Create a New Account'), - 'desc' => t('Register') + 'title' => L10n::t('Create a New Account'), + 'desc' => L10n::t('Register') ]; } @@ -275,28 +309,28 @@ class Login extends BaseModule $tpl, [ '$dest_url' => self::getApp()->get_baseurl(true) . '/login', - '$logout' => t('Logout'), - '$login' => t('Login'), + '$logout' => L10n::t('Logout'), + '$login' => L10n::t('Login'), - '$lname' => ['username', t('Nickname or Email: ') , '', ''], - '$lpassword' => ['password', t('Password: '), '', ''], - '$lremember' => ['remember', t('Remember me'), 0, ''], + '$lname' => ['username', L10n::t('Nickname or Email: ') , '', ''], + '$lpassword' => ['password', L10n::t('Password: '), '', ''], + '$lremember' => ['remember', L10n::t('Remember me'), 0, ''], '$openid' => !$noid, - '$lopenid' => ['openid_url', t('Or login using OpenID: '),'',''], + '$lopenid' => ['openid_url', L10n::t('Or login using OpenID: '),'',''], '$hiddens' => $hiddens, '$register' => $reg, - '$lostpass' => t('Forgot your password?'), - '$lostlink' => t('Password Reset'), + '$lostpass' => L10n::t('Forgot your password?'), + '$lostlink' => L10n::t('Password Reset'), - '$tostitle' => t('Website Terms of Service'), - '$toslink' => t('terms of service'), + '$tostitle' => L10n::t('Website Terms of Service'), + '$toslink' => L10n::t('terms of service'), - '$privacytitle' => t('Website Privacy Policy'), - '$privacylink' => t('privacy policy'), + '$privacytitle' => L10n::t('Website Privacy Policy'), + '$privacylink' => L10n::t('privacy policy'), ] );