X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=f220e1685b649878459a64e459414c6ab5f3b31d;hb=b78996416ce8c195dfd725c332c7fbddefe08832;hp=e3c8d92eebd23f2ae9e6ba33d98f25fcab3ce8ec;hpb=ca734f168caaa3a9fb66fd7ada6ecc26e1299ae6;p=friendica.git
diff --git a/include/auth.php b/include/auth.php
index e3c8d92eeb..f220e1685b 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,4 +1,9 @@
hash != cookie_hash($r[0])) {
logger("Hash for user ".$data->uid." doesn't fit.");
nuke_session();
- goaway(z_root());
+ goaway(System::baseUrl());
}
// Renew the cookie
- new_cookie(604800, $r[0]);
+ // Expires after 7 days by default,
+ // can be set via system.auth_cookie_lifetime
+ $authcookiedays = Config::get('system', 'auth_cookie_lifetime', 7);
+ new_cookie($authcookiedays*24*60*60, $r[0]);
// Do the authentification if not done by now
- if (!isset($_SESSION) OR !isset($_SESSION['authenticated'])) {
+ if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
authenticate_success($r[0]);
if (get_config('system','paranoia'))
@@ -43,7 +51,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
call_hooks("logging_out");
nuke_session();
info(t('Logged out.').EOL);
- goaway(z_root());
+ goaway(System::baseUrl());
}
if (x($_SESSION,'visitor_id') && !x($_SESSION,'uid')) {
@@ -65,7 +73,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
logger('Session address changed. Paranoid setting in effect, blocking session. '.
$_SESSION['addr'].' != '.$_SERVER['REMOTE_ADDR']);
nuke_session();
- goaway(z_root());
+ goaway(System::baseUrl());
}
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
@@ -75,7 +83,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
if (!dbm::is_result($r)) {
nuke_session();
- goaway(z_root());
+ goaway(System::baseUrl());
}
// Make sure to refresh the last login time for the user if the user
@@ -114,7 +122,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
if ($noid || strpos($temp_string,'@') || !validate_url($temp_string)) {
$a = get_app();
notice(t('Login failed.').EOL);
- goaway(z_root());
+ goaway(System::baseUrl());
// NOTREACHED
}
@@ -125,7 +133,8 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
$openid = new LightOpenID;
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
- $openid->returnUrl = App::get_baseurl(true).'/openid';
+ $_SESSION['remember'] = $_POST['remember'];
+ $openid->returnUrl = System::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());
@@ -175,20 +184,15 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
if (!$record || !count($record)) {
logger('authenticate: failed login attempt: '.notags(trim($_POST['username'])).' from IP '.$_SERVER['REMOTE_ADDR']);
notice(t('Login failed.').EOL);
- goaway(z_root());
+ goaway(System::baseUrl());
}
- // If the user specified to remember the authentication, then set a cookie
- // that expires after one week (the default is when the browser is closed).
- // The cookie will be renewed automatically.
- // The week ensures that sessions will expire after some inactivity.
- if ($_POST['remember'])
- new_cookie(604800, $r[0]);
- else
+ if (! $_POST['remember']) {
new_cookie(0); // 0 means delete on browser exit
+ }
// 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);
}
@@ -203,39 +207,3 @@ function nuke_session() {
session_unset();
session_destroy();
}
-
-/**
- * @brief Calculate the hash that is needed for the "Friendica" cookie
- *
- * @param array $user Record from "user" table
- *
- * @return string Hashed data
- */
-function cookie_hash($user) {
- return(hash("sha256", get_config("system", "site_prvkey").
- $user["uprvkey"].
- $user["password"]));
-}
-
-/**
- * @brief Set the "Friendica" cookie
- *
- * @param int $time
- * @param array $user Record from "user" table
- */
-function new_cookie($time, $user = array()) {
-
- if ($time != 0)
- $time = $time + time();
-
- if ($user)
- $value = json_encode(array("uid" => $user["uid"],
- "hash" => cookie_hash($user),
- "ip" => $_SERVER['REMOTE_ADDR']));
- else
- $value = "";
-
- setcookie("Friendica", $value, $time, "/", "",
- (get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true);
-
-}