aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin J. Novack <jnovack@gmail.com>2012-09-17 09:53:19 -0400
committerJustin J. Novack <jnovack@gmail.com>2012-09-17 09:53:19 -0400
commit76aa2ab76d8f2305db7a2bb7cdbe461cca0146a3 (patch)
treee8a3a9cdab77505a14c71e24529b988433d57fdb
parent2935763e253c3616d951bc18c7d21a56349531fa (diff)
downloadphorkie-76aa2ab76d8f2305db7a2bb7cdbe461cca0146a3.tar.gz
phorkie-76aa2ab76d8f2305db7a2bb7cdbe461cca0146a3.zip
ADD: Add identity to /forbidden page for easy administration
-rw-r--r--data/templates/forbidden.htm6
-rw-r--r--www/auth.php9
-rw-r--r--www/secure.php8
3 files changed, 13 insertions, 10 deletions
diff --git a/data/templates/forbidden.htm b/data/templates/forbidden.htm
index ad40a9f..e6965dd 100644
--- a/data/templates/forbidden.htm
+++ b/data/templates/forbidden.htm
@@ -5,7 +5,11 @@
<fieldset>
<legend>Access Denied</legend>
- <img src="images/access_denied.png">
+ <img src="images/access_denied.png" align='left'>
+ <p>We're sorry, your identity is not authorized:</p>
+ <p><code>{{ identity }}</code></p>
+ <p>If you feel this message is in error, please notify the site admin
+ and include your identity.</p>
</fieldset>
{% endblock %}
diff --git a/www/auth.php b/www/auth.php
index bb4fcb2..b8d08ff 100644
--- a/www/auth.php
+++ b/www/auth.php
@@ -201,15 +201,6 @@ if (isset($_POST['start'])) {
}
$openid = $message->getArrayFormat();
- if ($GLOBALS['phorkie']['auth']['secure'] > 0 &&
- $GLOBALS['phorkie']['auth']['userlist']) {
- if (!in_array($openid['openid.identity'], $GLOBALS['phorkie']['users'])) {
- $redirect = 'http://' . $_SERVER['HTTP_HOST'] . "/forbidden";
- header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL));
- exit;
- }
- }
- // include_once 'openid/wrapper.php';
$email = (isset($openid['openid.ext1.value.email'])) ? $openid['openid.ext1.value.email'] : null;
$email = (isset($openid['openid.ext2.value.email']) && !isset($email)) ? $openid['openid.ext2.value.email'] : $email;
diff --git a/www/secure.php b/www/secure.php
index 07cdfb6..4b81d59 100644
--- a/www/secure.php
+++ b/www/secure.php
@@ -9,4 +9,12 @@ if (!isset($_SESSION['identity'])) {
header("Location: /login");
exit;
}
+if ($GLOBALS['phorkie']['auth']['secure'] > 0 &&
+ $GLOBALS['phorkie']['auth']['userlist']) {
+ if (!in_array($_SESSION['identity'], $GLOBALS['phorkie']['users'])) {
+ $redirect = 'http://' . $_SERVER['HTTP_HOST'] . "/forbidden";
+ header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL));
+ exit;
+ }
+}
?>