X-Git-Url: https://git-public.kairo.at/?p=authserver.git;a=blobdiff_plain;f=authorize.php;h=f06d8353dcdecc7617868581efb95933a3e6247e;hp=ac0979a94c3e96221de4a869d717b85505b78674;hb=c4e0aceb5d9e9076effd75de03f4588b65329740;hpb=80ca2a2f90bd1462e79678e28370b187ae851e59

diff --git a/authorize.php b/authorize.php
index ac0979a..f06d835 100644
--- a/authorize.php
+++ b/authorize.php
@@ -22,6 +22,7 @@ $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');
@@ -29,8 +30,16 @@ $para->setAttribute('class', 'warn');
 
 if (!count($errors)) {
   $session = $utils->initSession(); // Read session or create new session and set cookie.
+  if ($session['logged_in'] && (@$_GET['logout'] == 1)) {
+    $result = $db->prepare('UPDATE `auth_sessions` SET `logged_in` = FALSE WHERE `id` = :sessid;');
+    if (!$result->execute(array(':sessid' => $session['id']))) {
+      $utils->log('logout_failure', 'session: '.$session['id']);
+      $errors[] = _('Unexpected error while logging out.');
+    }
+    $session['logged_in'] = 0;
+  }
   if (intval($session['user'])) {
-    $result = $db->prepare('SELECT `id`,`email`,`verify_hash` FROM `auth_users` WHERE `id` = :userid;');
+    $result = $db->prepare('SELECT `id`,`email`,`verify_hash`,`group_id` FROM `auth_users` WHERE `id` = :userid;');
     $result->execute(array(':userid' => $session['user']));
     $user = $result->fetch(PDO::FETCH_ASSOC);
     if (!$user['id']) {
@@ -40,7 +49,6 @@ if (!count($errors)) {
   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.');
   }
@@ -55,23 +63,69 @@ if (!count($errors)) {
       exit();
     }
 
-    // Display an authorization form (unless the scope is email, which we always grant in this system).
     if (empty($_POST) && (@$request->query['scope'] != 'email')) {
+      // Display an authorization form (unless the scope is email, which we handle as a login request below).
       $para = $body->appendElement('p', sprintf(_('Hi %s!'), $user['email']));
       $para->setAttribute('class', 'userwelcome');
 
       $form = $body->appendForm('', 'POST', 'authform');
       $form->setAttribute('id', 'authform');
-      $form->appendElement('p', sprintf(_('Do you authorize %s to access %s?'), $request->query['client_id'], $request->query['scope']));
+      $domain_name = parse_url($request->query['redirect_uri'], PHP_URL_HOST);
+      if (!strlen($domain_name)) { $domain_name = $request->query['client_id']; }
+      $form->appendElement('p', sprintf(_('Do you authorize %s to access %s?'), $domain_name, $request->query['scope']));
       $submit = $form->appendInputSubmit(_('yes'));
       $submit->setAttribute('name', 'authorized');
       $form->appendText(' ');
       $submit = $form->appendInputSubmit(_('no'));
       $submit->setAttribute('name', 'authorized');
     }
+    elseif (empty($_POST) && (@$request->query['scope'] == 'email')) {
+      // Display an interstitial page for a login  when we have email scope (verified email for logging in).
+      $domain_name = parse_url($request->query['redirect_uri'], PHP_URL_HOST);
+      if (!strlen($domain_name)) { $domain_name = $request->query['client_id']; }
+      $para = $body->appendElement('p', sprintf(_('Sign in to %s using…'), $domain_name));
+      $para->setAttribute('class', 'signinwelcome');
+      $form = $body->appendForm('', 'POST', 'loginauthform');
+      $form->setAttribute('id', 'loginauthform');
+      $form->setAttribute('class', 'loginarea');
+      $ulist = $form->appendElement('ul');
+      $ulist->setAttribute('class', 'flat emaillist');
+      $emails = $utils->getGroupedEmails($user['group_id']);
+      if (!count($emails)) { $emails = array($user['email']); }
+      foreach ($emails as $email) {
+        $litem = $ulist->appendElement('li');
+        $litem->appendInputRadio('user_email', 'uemail_'.md5($email), $email, $email == $user['email']);
+        $litem->appendLabel('uemail_'.md5($email), $email);
+      }
+      $para = $form->appendElement('p');
+      $para->setAttribute('class', 'small otheremaillinks');
+      $link = $para->appendLink('#', _('Add another email address'));
+      $link->setAttribute('id', 'addanotheremail'); // Makes the JS put the right functionality onto the link.
+      $para->appendText(' ');
+      $link = $para->appendLink('#', _('This is not me'));
+      $link->setAttribute('id', 'isnotme'); // Makes the JS put the right functionality onto the link.
+      $authinput = $form->appendInputHidden('authorized', 'yes');
+      $authinput->setAttribute('id', 'isauthorized');
+      $submit = $form->appendInputSubmit(_('Sign in'));
+      $para = $form->appendElement('p');
+      $para->setAttribute('class', 'small');
+      $link = $para->appendLink('#', _('Cancel'));
+      $link->setAttribute('id', 'cancelauth'); // Makes the JS put the right functionality onto the link.
+      $utils->setRedirect($session, $_SERVER['REQUEST_URI']);
+    }
     else {
+      // Switch to different user if we selected a different email within the group.
+      if (strlen(@$_POST['user_email']) && ($_POST['user_email'] != $user['email'])) {
+        $result = $db->prepare('SELECT `id`, `pwdhash`, `email`, `status`, `verify_hash`,`group_id` FROM `auth_users` WHERE `group_id` = :groupid AND `email` = :email;');
+        $result->execute(array(':groupid' => $user['group_id'], ':email' => $_POST['user_email']));
+        $newuser = $result->fetch(PDO::FETCH_ASSOC);
+        if ($newuser) {
+          $user = $newuser;
+          $session = $utils->getLoginSession($user['id'], $session);
+        }
+      }
       // Handle authorize request, forwarding code in GET parameters if the user has authorized your client.
-      $is_authorized = ((@$_POST['authorized'] === 'yes') || ($request->query['scope'] == 'email'));
+      $is_authorized = (@$_POST['authorized'] === 'yes');
       $server->handleAuthorizeRequest($request, $response, $is_authorized, $user['id']);
       /* For testing only
       if ($is_authorized) {
@@ -80,6 +134,7 @@ if (!count($errors)) {
         exit("SUCCESS! Authorization Code: $code");
       }
       */
+      $utils->resetRedirect($session);
       $response->send();
       exit();
     }
@@ -89,11 +144,7 @@ if (!count($errors)) {
     $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']);
-    }
+    $utils->setRedirect($session, str_replace('&logout=1', '', $_SERVER['REQUEST_URI'])); // Make sure to strip a logout to not get into a loop.
   }
 }