X-Git-Url: https://git-public.kairo.at/?p=authserver.git;a=blobdiff_plain;f=authorize.php;h=68e3b94e08ed401242e64d5199d972050158eba5;hp=33d7d5e25f4ebe8217962ec1e4bf0080d2d6dace;hb=77f0f9ff1f1c54aef1e7370144df302d83118f70;hpb=558e9862bdf09a65cb41c76569cdb3f4021fa356

diff --git a/authorize.php b/authorize.php
index 33d7d5e..68e3b94 100644
--- a/authorize.php
+++ b/authorize.php
@@ -3,37 +3,63 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// Simple server based on https://bshaffer.github.io/oauth2-server-php-docs/cookbook
+// 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).
 
 // Include the common auth system files (including the OAuth2 Server object).
 require_once(__DIR__.'/authsystem.inc.php');
 
+$errors = $utils->checkForSecureConnection();
+
 $request = OAuth2\Request::createFromGlobals();
 $response = new OAuth2\Response();
 
-// validate the authorize request
+// Validate the authorize request.
 if (!$server->validateAuthorizeRequest($request, $response)) {
-    $response->send();
-    die;
+  $response->send();
+  exit();
 }
-// display an authorization form
+
+// Display an authorization form.
 if (empty($_POST)) {
-  exit('
-<form method="post">
-  <label>Do You Authorize TestClient?</label><br />
-  <input type="submit" name="authorized" value="yes">
-  <input type="submit" name="authorized" value="no">
-</form>');
+  // Start HTML document as a DOM object.
+  extract(ExtendedDocument::initHTML5()); // sets $document, $html, $head, $title, $body
+  $document->formatOutput = true; // we want a nice output
+  $style = $head->appendElement('link');
+  $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');
+
+  $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');
+
+  $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']));
+  $submit = $form->appendInputSubmit(_('yes'));
+  $submit->setAttribute('name', 'authorized');
+  $form->appendText(' ');
+  $submit = $form->appendInputSubmit(_('no'));
+  $submit->setAttribute('name', 'authorized');
+  // Send HTML to client.
+  print($document->saveHTML());
+  exit();
 }
 
-// print the authorization code if the user has authorized your client
+// 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);
+/* 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
   $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
   exit("SUCCESS! Authorization Code: $code");
 }
+*/
 $response->send();
-
 ?>