// Called e.g. as /authorize?response_type=code&client_id=testclient&state=f00bar&scope=email&redirect_uri=http%3A%2F%2Ffake.example.com%2F
// This either redirects to the redirect URL with errors or success added as GET parameters,
// or sends a HTML page asking for login / permission to scope (email is always granted in this system but not always for OAuth2 generically)
-// or sends errors as a JSOn document (hopefully shouldn't but seen that in testing).
+// or sends errors as a JSON document (hopefully shouldn't but seen that in testing).
// Include the common auth system files (including the OAuth2 Server object).
require_once(__DIR__.'/authsystem.inc.php');
$style->setAttribute('rel', 'stylesheet');
$style->setAttribute('href', 'authsystem.css');
$head->appendJSFile('authsystem.js');
+$title->appendText('Authorization Request | KaiRo.at');
+$h1 = $body->appendElement('h1', 'KaiRo.at Authentication Server');
$errors = $utils->checkForSecureConnection();
+$utils->sendSecurityHeaders();
+
+$para = $body->appendElement('p', _('This login system does not work without JavaScript. Please activate JavaScript for this site to log in.'));
+$para->setAttribute('id', 'jswarning');
+$para->setAttribute('class', 'warn');
if (!count($errors)) {
$session = $utils->initSession(); // Read session or create new session and set cookie.
- $user = array('id' => 0, 'email' => '');
+ if (intval($session['user'])) {
+ $result = $db->prepare('SELECT `id`,`email`,`verify_hash` FROM `auth_users` WHERE `id` = :userid;');
+ $result->execute(array(':userid' => $session['user']));
+ $user = $result->fetch(PDO::FETCH_ASSOC);
+ if (!$user['id']) {
+ $utils->log('user_read_failure', 'user: '.$session['user']);
+ }
+ }
+ else {
+ $user = array('id' => 0, 'email' => '');
+ }
$pagetype = 'default';
if (is_null($session)) {
$errors[] = _('The session system is not working. Please <a href="https://www.kairo.at/contact">contact KaiRo.at</a> and tell the team about this.');
exit();
}
- // Display an authorization form.
- if (empty($_POST)) {
- $title->appendText('Authorization Request | KaiRo.at');
- $h1 = $body->appendElement('h1', 'KaiRo.at Authentication Server');
-
- $para = $body->appendElement('p', _('This login system does not work without JavaScript. Please activate JavaScript for this site to log in.'));
- $para->setAttribute('id', 'jswarning');
- $para->setAttribute('class', 'warn');
-
+ // Display an authorization form (unless the scope is email, which we always grant in this system).
+ if (empty($_POST) && (@$request->query['scope'] != 'email')) {
$para = $body->appendElement('p', sprintf(_('Hi %s!'), $user['email']));
$para->setAttribute('class', 'userwelcome');
}
else {
// Handle authorize request, forwarding code in GET parameters if the user has authorized your client.
- $is_authorized = ($_POST['authorized'] === 'yes');
- $server->handleAuthorizeRequest($request, $response, $is_authorized);
+ $is_authorized = ((@$_POST['authorized'] === 'yes') || ($request->query['scope'] == 'email'));
+ $server->handleAuthorizeRequest($request, $response, $is_authorized, $user['id']);
/* For testing only
if ($is_authorized) {
// this is only here so that you get to see your code in the cURL request. Otherwise, we'd redirect back to the client
// Display login/register form.
$para = $body->appendElement('p', _('You need to log in or register to continue.'));
$para->setAttribute('class', 'logininfo');
+ $utils->appendLoginForm($body, $session, $user);
+ // Save the request in the session so we can get back to fulfilling it.
+ $result = $db->prepare('UPDATE `auth_sessions` SET `saved_redirect` = :redir WHERE `id` = :sessid;');
+ if (!$result->execute(array(':redir' => $_SERVER['REQUEST_URI'], ':sessid' => $session['id']))) {
+ $utils->log('redir_save_failure', 'session: '.$session['id'].', redirect: '.$_SERVER['REQUEST_URI']);
+ }
}
}