From: Christian Weiske Date: Wed, 28 Jan 2015 17:10:23 +0000 (+0100) Subject: Automatically login to phorkie X-Git-Tag: v0.5.0~10 X-Git-Url: https://git.cweiske.de/phorkie.git/commitdiff_plain/19f1b5d2a1730f8e37c8fc5585d30b99e70a8575 Automatically login to phorkie --- diff --git a/data/templates/base.htm b/data/templates/base.htm index efc9e3b..fabfd52 100644 --- a/data/templates/base.htm +++ b/data/templates/base.htm @@ -95,5 +95,8 @@ AGPL. + {% if autologin %} + + {% endif %} diff --git a/src/phorkie/Login/AutologinResponse.php b/src/phorkie/Login/AutologinResponse.php new file mode 100644 index 0000000..9384e3b --- /dev/null +++ b/src/phorkie/Login/AutologinResponse.php @@ -0,0 +1,53 @@ +status = $status; + $this->message = $message; + } + + public function send() + { + if ($this->status == 'error') { + //Cookie to prevent trying autologin again and again. + // After 1 hour the cookie expires and autologin is tried again. + setcookie('tried-autologin', '1', time() + 60 * 60); + } + + $data = htmlspecialchars(json_encode($this), ENT_NOQUOTES); + header('Content-type: text/html'); + echo << + + Autologin response + + + + + +XML; + } +} +?> diff --git a/www/js/autologin.js b/www/js/autologin.js new file mode 100644 index 0000000..fbe9898 --- /dev/null +++ b/www/js/autologin.js @@ -0,0 +1,39 @@ +jQuery(function($) { + document.getElementsByTagName("body")[0] + .insertAdjacentHTML( + 'beforeend', + '' + ); + /*; + $.ajax("../login.php?autologin=1") + .done(function() { + alert("success"); + }) + .fail(function() { + alert("error"); + }); + */ +}); + +function notifyAutologin(data) +{ + if (data.status != 'ok') { + return; + } + document.getElementsByTagName("body")[0] + .insertAdjacentHTML( + 'beforeend', + '' + ); + $('#autologinnotifier').click(function(event) { + $(this).fadeOut(); + }); + $('#autologinnotifier').hide().fadeIn('slow'); +} diff --git a/www/login.php b/www/login.php index e141b65..2762b4b 100644 --- a/www/login.php +++ b/www/login.php @@ -6,10 +6,27 @@ require_once 'www-header.php'; if (isset($_REQUEST['logout'])) { unset($_SESSION); session_destroy(); + //delete last openid cookie. + // if you deliberately log out, you do not want to be logged in + // automatically on the next page reload. + setcookie('lastopenid', '0', time() - 3600); + header('Location: ' . Tools::fullUrl()); exit(); } +$bAutologin = false; +if (isset($_GET['autologin']) && $_GET['autologin'] + && isset($_COOKIE['lastopenid']) +) { + $bAutologin = true; + // autologin=1: start openid autologin + // autologin=2: response from openid server + if ($_GET['autologin'] == 1) { + $_POST['openid_url'] = $_COOKIE['lastopenid']; + } +} + if (!count($_GET) && !count($_POST)) { render( 'login', @@ -36,10 +53,13 @@ if (isset($_POST['openid_url'])) { $realm = Tools::fullUrl(); $returnTo = Tools::fullUrl('login'); +if ($bAutologin) { + $returnTo = Tools::fullUrl('login?autologin=2'); +} try { $o = new \OpenID_RelyingParty($returnTo, $realm, $openid_url); -} catch (OpenID_Exception $e) { +} catch (\OpenID_Exception $e) { throw new Exception($e->getMessage()); } @@ -53,8 +73,23 @@ if (isset($_POST['openid_url'])) { $_SESSION['openid_url'] = $openid_url; try { $authRequest = $o->prepare(); - } catch (OpenID_Exception $e) { + if ($bAutologin) { + $authRequest->setMode(\OpenID::MODE_CHECKID_IMMEDIATE); + } + } catch (\OpenID_Exception $e) { + if ($bAutologin) { + $alres = new Login_AutologinResponse('error', $e->getMessage()); + $alres->send(); + exit(0); + } throw new Exception($e->getMessage()); + } catch (\Exception $e) { + if ($bAutologin) { + $alres = new Login_AutologinResponse('error', $e->getMessage()); + $alres->send(); + exit(0); + } + throw $e; } // SREG @@ -100,17 +135,33 @@ $id = $message->get('openid.claimed_id'); $mode = $message->get('openid.mode'); try { - $result = $o->verify(new \Net_URL2($returnTo . '?' . $queryString), $message); + $sep = '?'; + if (strpos($returnTo, '?') !== false) { + $sep = '&'; + } + $result = $o->verify(new \Net_URL2($returnTo . $sep . $queryString), $message); if ($result->success()) { $status = "Status:SUCCESS!"; $status .= " ({$result->getAssertionMethod()})"; } else { + if ($bAutologin) { + $alres = new Login_AutologinResponse( + 'error', 'Error logging in: ' . $result->getAssertionMethod() + ); + $alres->send(); + exit(0); + } throw new Exception('Error logging in'); $status = "Status:FAIL!"; $status .= " ({$result->getAssertionMethod()})"; } -} catch (OpenID_Exception $e) { +} catch (\OpenID_Exception $e) { + if ($bAutologin) { + $alres = new Login_AutologinResponse('error', $e->getMessage()); + $alres->send(); + exit(0); + } throw new Exception('Error logging in'); $status = "Status:EXCEPTION!"; $status .= " ({$e->getMessage()} : {$e->getCode()})"; @@ -156,7 +207,17 @@ $name = isset($openid['openid.ax.value.fullname']) $_SESSION['name'] = isset($name) ? $name : $_SERVER['REMOTE_ADDR']; $_SESSION['identity'] = $openid['openid.identity']; -setcookie('lastopenid', $_SESSION['identity'], time() + 84600 * 60, '/login'); +setcookie('tried-autologin', '0', time() - 3600);//delete +setcookie('lastopenid', $_SESSION['identity'], time() + 84600 * 60); + +if ($bAutologin) { + $alres = new Login_AutologinResponse('ok'); + $alres->name = $_SESSION['name']; + $alres->identity = $_SESSION['identity']; + $alres->send(); + exit(0); +} + $url = ''; if (isset($_SESSION['REQUEST_URI'])) { diff --git a/www/www-header.php b/www/www-header.php index 74329ed..833fb8a 100644 --- a/www/www-header.php +++ b/www/www-header.php @@ -105,6 +105,10 @@ function render($tplname, $vars = array()) $vars['identity'] = $_SESSION['identity']; $vars['name'] = $_SESSION['name']; $vars['email'] = $_SESSION['email']; + } else if (isset($_COOKIE['lastopenid']) + && !isset($_COOKIE['tried-autologin']) + ) { + $vars['autologin'] = true; } $vars['db'] = new Database(); if (!isset($vars['htmlhelper'])) {