From a73791f16d10ea0e2c477f29d9049d75516aa774 Mon Sep 17 00:00:00 2001 From: "Justin J. Novack" Date: Sun, 16 Sep 2012 01:17:46 -0400 Subject: [PATCH] Added OpenID Authentication --- data/config.default.php | 5 + data/config.php.dist | 4 + data/templates/base.htm | 8 + data/templates/forbidden.htm | 21 +++ data/templates/login.htm | 44 ++++++ src/openid/config.php | 55 +++++++ src/openid/wrapper.php | 27 ++++ www/.htaccess | 4 + www/auth.php | 258 ++++++++++++++++++++++++++++++++ www/css/debug.css | 85 +++++++++++ www/css/openid.css | 64 ++++++++ www/delete.php | 3 + www/display.php | 3 + www/edit.php | 3 + www/forbidden.php | 11 ++ www/fork.php | 3 + www/images/access_denied.png | Bin 0 -> 15610 bytes www/images/google.gif | Bin 0 -> 1596 bytes www/images/openid-inputicon.gif | Bin 0 -> 237 bytes www/images/yahoo.gif | Bin 0 -> 1682 bytes www/index.php | 3 + www/list.php | 5 +- www/login.php | 11 ++ www/new.php | 3 + www/raw.php | 3 + www/revision.php | 3 + www/secure.php | 11 ++ www/www-header.php | 4 + 28 files changed, 640 insertions(+), 1 deletion(-) create mode 100644 data/templates/forbidden.htm create mode 100644 data/templates/login.htm create mode 100644 src/openid/config.php create mode 100644 src/openid/wrapper.php create mode 100644 www/auth.php create mode 100644 www/css/debug.css create mode 100644 www/css/openid.css create mode 100644 www/forbidden.php create mode 100644 www/images/access_denied.png create mode 100644 www/images/google.gif create mode 100644 www/images/openid-inputicon.gif create mode 100644 www/images/yahoo.gif create mode 100644 www/login.php create mode 100644 www/secure.php diff --git a/data/config.default.php b/data/config.default.php index 88c9ae5..7ecbda3 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -12,6 +12,11 @@ $GLOBALS['phorkie']['cfg'] = array( 'geshi' => 'MediaWiki/geshi/geshi/geshi.php', 'index' => 'new'//"new" or "list" ); +$GLOBALS['phorkie']['auth'] = array( + 'secure' => 0, // 0 = public, no authentication, 1 = protect adds/edits/deletes, 2 = use authentication + 'userlist' => false, // true = user must be explicitly defined, false = anyone allowed, but they must authenticate + 'anonymousEmail' => 'anonymous@phorkie' // Email for non-authenticated commits +); $GLOBALS['phorkie']['tools'] = array( '\\phorkie\\Tool_Xmllint' => true, '\\phorkie\\Tool_PHPlint' => true, diff --git a/data/config.php.dist b/data/config.php.dist index 1e814bd..e90f704 100644 --- a/data/config.php.dist +++ b/data/config.php.dist @@ -5,4 +5,8 @@ //$GLOBALS['phorkie']['cfg']['git']['private'] = 'ssh://git@bogo:paste/'; //$GLOBALS['phorkie']['cfg']['elasticsearch'] = 'http://localhost:9200/phorkie/'; //$GLOBALS['phorkie']['cfg']['setupcheck'] = false; +//$GLOBALS['phorkie']['users'] = array( +// 'https://www.google.com/accounts/o8/id?id=ABCDEFGHIJKLMNOPQRSTUVWXYZ', +// 'http://anonymous.phorkie.openid' +//); ?> diff --git a/data/templates/base.htm b/data/templates/base.htm index 2b8544b..8192b6b 100644 --- a/data/templates/base.htm +++ b/data/templates/base.htm @@ -25,6 +25,14 @@
  • List all
    • + {% if identity %} +
  • + {{name}} ({{email}}) +
    • +
  • + Logout +
    • + {% endif %} {% if db.adapter %}
  • diff --git a/data/templates/forbidden.htm b/data/templates/forbidden.htm new file mode 100644 index 0000000..ad40a9f --- /dev/null +++ b/data/templates/forbidden.htm @@ -0,0 +1,21 @@ +{% extends "base.htm" %} +{% block title %}Access Denied{% endblock %} + +{% block content %} + +
    + Access Denied + +
    +{% endblock %} + +{% block sidebar %} + {% if recents.results %} +

    Recently created

    +
      + {% for repo in recents.repos %} + {% include 'repo-sidebar-list.htm' %} + {% endfor %} +
    + {% endif %} +{% endblock %} diff --git a/data/templates/login.htm b/data/templates/login.htm new file mode 100644 index 0000000..13d86be --- /dev/null +++ b/data/templates/login.htm @@ -0,0 +1,44 @@ +{% extends "base.htm" %} +{% block title %}Login{% endblock %} + +{% block content %} + + + + + + + + + + + +
    + Sign-in +
    +

    Please choose your account provider

    +
    + + +
    +
    +

    or enter your OpenID URL.

    + + +
    +
    +
    +{% endblock %} + +{% block sidebar %} + {% if recents.results %} +

    Recently created

    +
      + {% for repo in recents.repos %} + {% include 'repo-sidebar-list.htm' %} + {% endfor %} +
    + {% endif %} +{% endblock %} diff --git a/src/openid/config.php b/src/openid/config.php new file mode 100644 index 0000000..fdec5e1 --- /dev/null +++ b/src/openid/config.php @@ -0,0 +1,55 @@ + + * @copyright 2009 Bill Shupp + * @license http://www.opensource.org/licenses/bsd-license.php FreeBSD + * @link http://github.com/shupp/openid + */ + +set_include_path(dirname(__FILE__) . '/../../:' . get_include_path()); + +/** + * Required files + */ +require_once 'OpenID/RelyingParty.php'; +require_once 'OpenID/Discover.php'; +require_once 'OpenID/Store.php'; +require_once 'OpenID/Extension/SREG10.php'; +require_once 'OpenID/Extension/SREG11.php'; +require_once 'OpenID/Extension/AX.php'; +require_once 'OpenID/Extension/UI.php'; +require_once 'OpenID/Extension/OAuth.php'; +require_once 'OpenID/Message.php'; +require_once 'OpenID/Observer/Log.php'; +require_once 'Net/URL2.php'; + +// Determine realm and return_to +$base = 'http'; +if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') { + $base .= 's'; +} +$base .= '://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']; + +$realm = $base . '/'; +$returnTo = $base . dirname($_SERVER['PHP_SELF']); +if ($returnTo[strlen($returnTo) - 1] != '/') { + $returnTo .= '/'; +} +$returnTo .= 'auth'; + +// SQL storage example +// $storeOptions = array( +// 'dsn' => 'mysql://user:pass@db.example.com/openid' +// ); +// OpenID::setStore(OpenID_Store::factory('MDB2', $storeOptions)); +// +// // The first time you run it, you'll also need to create the tables: +// OpenID::getStore()->createTables(); + +?> diff --git a/src/openid/wrapper.php b/src/openid/wrapper.php new file mode 100644 index 0000000..cb57f4e --- /dev/null +++ b/src/openid/wrapper.php @@ -0,0 +1,27 @@ + + * @copyright 2009 Bill Shupp + * @license http://www.opensource.org/licenses/bsd-license.php FreeBSD + * @link http://github.com/shupp/openid + */ +?> + + + PEAR OpenID Debug + + + + + + diff --git a/www/.htaccess b/www/.htaccess index a8f2eed..fd2963b 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -19,3 +19,7 @@ RewriteRule ^list/([0-9]+)$ /list.php?page=$1 RewriteRule ^search$ /search.php RewriteRule ^search/([0-9]+)$ /search.php?page=$1 + +RewriteRule ^auth$ /auth.php +RewriteRule ^login$ /login.php +RewriteRule ^forbidden$ /forbidden.php diff --git a/www/auth.php b/www/auth.php new file mode 100644 index 0000000..8fe38e0 --- /dev/null +++ b/www/auth.php @@ -0,0 +1,258 @@ + + * @copyright 2009 Bill Shupp + * @license http://www.opensource.org/licenses/bsd-license.php FreeBSD + * @link http://github.com/shupp/openid + */ + +// A tool for testing Relying Party functionality +set_include_path( + __DIR__ . '/../../src/' + . PATH_SEPARATOR . get_include_path() +); + +require_once 'www-header.php'; +require_once 'openid/config.php'; + + +if (isset($_REQUEST['logout'])) { + unset($_SESSION); + session_destroy(); + $redirect = 'http://' . $_SERVER['HTTP_HOST']; + header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL)); + exit; +} + +if (!count($_GET) && !count($_POST)) { + $redirect = 'http://' . $_SERVER['HTTP_HOST'] . "/login"; + header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL)); + exit; +} + +// Hackaround Non-Javascript Login Page +if (!count($_POST) && isset($_GET['start'])) { + $_POST = $_GET; +} + +if (isset($_POST['identifier'])) { + $identifier = $_POST['identifier']; +} else if (isset($_SESSION['identifier'])) { + $identifier = $_SESSION['identifier']; +} else { + $identifier = null; +} + +try { + $o = new OpenID_RelyingParty($returnTo, $realm, $identifier); +} catch (OpenID_Exception $e) { + $contents = "
    \n"; + $contents .= "
    " . $e->getMessage() . "
    \n"; + $contents .= "
    "; + include_once 'openid/wrapper.php'; + exit; +} + +if (!empty($_POST['disable_associations']) + || !empty($_SESSION['disable_associations'])) { + + $o->disableAssociations(); + $_SESSION['disable_associations'] = true; +} + +$log = new OpenID_Observer_Log; +OpenID::attach($log); + +if (isset($_POST['start'])) { + + $_SESSION['identifier'] = $identifier; + try { + $authRequest = $o->prepare(); + } catch (OpenID_Exception $e) { + $contents = "
    \n"; + $contents .= "
    " . $e->getMessage() . "
    \n"; + $contents .= "
    "; + include_once 'openid/wrapper.php'; + exit; + } + + // checkid_immediate + if (!empty($_POST['checkid_immediate'])) { + $authRequest->setMode('checkid_immediate'); + } + + // SREG + if (!empty($_POST['sreg'])) { + $sreg = new OpenID_Extension_SREG11(OpenID_Extension::REQUEST); + $sreg->set('required', 'email,firstname,lastname,nickname'); + $sreg->set('optional', 'gender,dob'); + $authRequest->addExtension($sreg); + } + + // AX + if (!empty($_POST['ax'])) { + $ax = new OpenID_Extension_AX(OpenID_Extension::REQUEST); + $ax->set('type.email', 'http://axschema.org/contact/email'); + $ax->set('type.firstname', 'http://axschema.org/namePerson/first'); + $ax->set('type.lastname', 'http://axschema.org/namePerson/last'); + $ax->set('mode', 'fetch_request'); + $ax->set('required', 'email,firstname,lastname'); + $authRequest->addExtension($ax); + } + + // UI + if (!empty($_POST['ui'])) { + $ui = new OpenID_Extension_UI(OpenID_Extension::REQUEST); + $ui->set('mode', 'popup'); + $ui->set('language', 'en-US'); + $authRequest->addExtension($ui); + } + + // OAuth + if (!empty($_POST['oauth'])) { + $oauth = new OpenID_Extension_OAuth(OpenID_Extension::REQUEST); + $oauth->set('consumer', $_POST['oauth_consumer_key']); + $_SESSION['OAuth_consumer_key'] = $_POST['oauth_consumer_key']; + $_SESSION['OAuth_consumer_secret'] = $_POST['oauth_consumer_secret']; + + $oauth->set('scope', $_POST['oauth_scope']); + $_SESSION['OAuth_scope'] = $_POST['oauth_scope']; + + $_SESSION['OAuth_access_token_url'] = $_POST['oauth_access_token_url']; + $_SESSION['OAuth_access_token_method'] = $_POST['oauth_access_token_method']; + + $authRequest->addExtension($oauth); + } + + $url = $authRequest->getAuthorizeURL(); + + if (empty($_POST['debug'])) { + header("Location: $url"); + exit; + } + +} else { + if (isset($_SESSION['identifier'])) { + $usid = $_SESSION['identifier']; + unset($_SESSION['identifier']); + } else { + $usid = null; + } + + unset($_SESSION['disable_associations']); + + if (!count($_POST)) { + list(, $queryString) = explode('?', $_SERVER['REQUEST_URI']); + } else { + // I hate php sometimes + $queryString = file_get_contents('php://input'); + } + + $message = new OpenID_Message($queryString, OpenID_Message::FORMAT_HTTP); + $id = $message->get('openid.claimed_id'); + $mode = $message->get('openid.mode'); + + try { + $result = $o->verify(new Net_URL2($returnTo . '?' . $queryString), + $message); + + if ($result->success()) { + $status = "Status:SUCCESS!"; + $status .= " ({$result->getAssertionMethod()})"; + } else { + $status = "Status:FAIL!"; + $status .= " ({$result->getAssertionMethod()})"; + } + } catch (OpenID_Exception $e) { + $status = "Status:EXCEPTION!"; + $status .= " ({$e->getMessage()} : {$e->getCode()})"; + } + + // OAuth hyprid fetching access token + if (isset($_SESSION['OAuth_consumer_key'], + $_SESSION['OAuth_consumer_secret'], + $_SESSION['OAuth_access_token_url'], + $_SESSION['OAuth_access_token_method'])) { + + try { + $oauth = new OpenID_Extension_OAuth(OpenID_Extension::RESPONSE, + $message); + + // Fix line lengths. + $consumerKey = $_SESSION['OAuth_consumer_key']; + $consumerSecret = $_SESSION['OAuth_consumer_key']; + $tokenURL = $_SESSION['OAuth_access_token_url']; + $tokenMethod = $_SESSION['OAuth_access_token_method']; + + $oauthData = $oauth->getAccessToken($consumerKey, + $consumerSecret, + $tokenURL, + array(), + $tokenMethod); + + } catch (Exception $e) { + } + } + + $contents = "
    +

    + + + + + + $status\n + "; + + foreach ($message->getArrayFormat() as $key => $value) { + $contents .= "\n"; + } + + if (isset($oauthData) && count($oauthData)) { + $contents .= ""; + $contents .= " "; + $contents .= ""; + + foreach ($oauthData as $key => $value) { + $contents .= "\n"; + } + } + + $contents .= "
    Results
    User Supplied Identifier:$usid
    Claimed Identifier:$id
    Mode:$mode


    Message Contents

    $key$value


    OAuth Access token/secret

    $key$value
    "; + $contents .= "

    "; + + $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; + $email = (isset($openid['openid.sreg.email']) && !isset($email)) ? $openid['openid.sreg.email'] : $email; + $email = (isset($openid['openid.ax.value.email']) && !isset($email)) ? $openid['openid.ax.value.email'] : $email; + $_SESSION['email'] = (isset($email)) ? $email : $GLOBALS['phorkie']['auth']['anonymousEmail']; + + $name = (isset($openid['openid.ext1.value.firstname']) && isset($openid['openid.ext1.value.lastname'])) ? $openid['openid.ext1.value.firstname']." ".$openid['openid.ext1.value.lastname'] : null; + $name = (isset($openid['openid.sreg.firstname']) && isset($openid['openid.sreg.lastname']) && !isset($name)) ? $openid['openid.sreg.firstname']." ".$openid['openid.sreg.lastname'] : $name; + $name = (isset($openid['openid.sreg.nickname']) && !isset($name)) ? $openid['openid.sreg.nickname'] : $name; + $_SESSION['name'] = (isset($name)) ? $name : $_SERVER['REMOTE_ADDR']; + + $_SESSION['identity'] = $openid['openid.identity']; + + $redirect = 'http://' . $_SERVER['HTTP_HOST'] . $_SESSION['REQUEST_URI']; + header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL)); +} + +?> diff --git a/www/css/debug.css b/www/css/debug.css new file mode 100644 index 0000000..634243a --- /dev/null +++ b/www/css/debug.css @@ -0,0 +1,85 @@ +html, body { + background: #ededed; + font: 82.5% Helvetica Neue, HelveticaNeue, Helvetica, sans-serif; + margin: 30px 0 0; padding: 0px; } + +h3 { + color: #aaa; + margin: 0; padding: 0; + font-size: 1.3em; + + position: absolute; + top: 30px; + width: 100%; + text-align: center; + left: 0; +} + +h3 a { + color: #111; + text-decoration: none; +} + +h3 a:hover { + text-decoration: underline; + +} + +form { + padding: 30px; + background: #fff; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + width: 400px; + margin: 50px auto 0; + } + +table { + font-size: 1.1em !important; + font-weight: bold; +} + +td { + width: 200px; +} +.discover_results { + margin: 60px 0 ; + padding: 30px; + background: #111; + text-align: center; +} + + +.discover_results b { + color: #fff; + font-size: 2.4em; +} + +.relyingparty_results { + width: 100%; +} + +.relyingparty_results table b { + display: block; + width: 300px; + font-size: 1.7em; + color: #fff; +} + + +pre, .relyingparty_results p table { + font-size: 1.2em; + width: 900px !important; + text-align: left; + margin: 0 auto; + + color: #ddd; + padding: 30px; + +} + +.relyingparty_results { + background: #111; + padding: 30px; + margin: 60px 0; +} diff --git a/www/css/openid.css b/www/css/openid.css new file mode 100644 index 0000000..38988a7 --- /dev/null +++ b/www/css/openid.css @@ -0,0 +1,64 @@ +body { + font-family:"Helvetica Neue", Helvetica, Arial, sans-serif; +} +#openid_form { + width: 470px; +} +#openid_form legend { + font-weight: bold; +} +#openid_choice { + display: none; +} +#openid_input_area { + clear: both; +} +#openid_btns { + height: 66px; + margin-bottom: 10px; +} +#openid_btns br { + clear: both; +} +#openid_highlight { + padding: 3px; + background-color: #FFFCC9; + float: left; +} +#identifier { + margin: 0px !important; + width: 250px; + background: #FFF url(/images/openid-inputicon.gif) no-repeat scroll 0 50%; + padding-left:18px; +} +.openid_large_btn { + width: 100px; + height: 60px; + border: 1px solid #DDD; + margin: 3px; + float: left; +} +.openid_small_btn { + width: 24px; + height: 24px; + border: 1px solid #DDD; + margin: 3px; + float: left; +} +.google { + background: #FFF url(/images/google.gif) no-repeat center center; +} +.yahoo { + background: #FFF url(/images/yahoo.gif) no-repeat center center; +} + +a.openid_large_btn:hover { + outline: none; + border: 1px solid #030303; +} +a.openid_large_btn:focus { + -moz-outline-style: none; +} +.openid_selected { + border: 4px solid #DDD; +} diff --git a/www/delete.php b/www/delete.php index 6d68ae4..f332028 100644 --- a/www/delete.php +++ b/www/delete.php @@ -4,6 +4,9 @@ namespace phorkie; * Delete paste or ask for deletion */ require_once 'www-header.php'; +if ($GLOBALS['phorkie']['auth']['secure'] > 0) { + require_once 'secure.php'; +} $repo = new Repository(); $repo->loadFromRequest(); diff --git a/www/display.php b/www/display.php index c8df8a9..2376d30 100644 --- a/www/display.php +++ b/www/display.php @@ -4,6 +4,9 @@ namespace phorkie; * Display paste contents */ require_once 'www-header.php'; +if ($GLOBALS['phorkie']['auth']['secure'] == 2) { + require_once 'secure.php'; +} $repo = new Repository(); $repo->loadFromRequest(); diff --git a/www/edit.php b/www/edit.php index 562c97c..226b774 100644 --- a/www/edit.php +++ b/www/edit.php @@ -4,6 +4,9 @@ namespace phorkie; * Edit paste contents */ require_once 'www-header.php'; +if ($GLOBALS['phorkie']['auth']['secure'] > 0) { + require_once 'secure.php'; +} $repo = new Repository(); $repo->loadFromRequest(); diff --git a/www/forbidden.php b/www/forbidden.php new file mode 100644 index 0000000..e8fb7ec --- /dev/null +++ b/www/forbidden.php @@ -0,0 +1,11 @@ + diff --git a/www/fork.php b/www/fork.php index 7997632..cc2ed33 100644 --- a/www/fork.php +++ b/www/fork.php @@ -4,6 +4,9 @@ */ namespace phorkie; require_once 'www-header.php'; +if ($GLOBALS['phorkie']['auth']['secure'] > 0) { + require_once 'secure.php'; +} if ($_SERVER['REQUEST_METHOD'] !== 'POST') { throw new Exception_Input('Forking only possible via POST'); diff --git a/www/images/access_denied.png b/www/images/access_denied.png new file mode 100644 index 0000000000000000000000000000000000000000..c13d7b9394c32ea3bdbf57d16e24fac71d6fb172 GIT binary patch literal 15610 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 SHy-#g2}o8_Nuo;3DENQt1g~`f literal 0 HcmV?d00001 diff --git a/www/images/google.gif b/www/images/google.gif new file mode 100644 index 0000000000000000000000000000000000000000..1b6cd07bd8b9f27175e0a03be3b5849e0f5479c7 GIT binary patch literal 1596 zcmc(e`#aNn0DwQcU}GKMxn#>^B<6OWQKZt-cb3xBiE^HYQf=ZKSu)*APi@FdDnu7l zbE$~JN>R#|+lE{hiz(BRl~d+uOl9Xe=bt$55AUzjP!`6aB*XlLd;L`$MA0-=oh;_@%=DSKzTW5!kkg02oxN<-;QgzZXZ6@(M)5 zb-u1@<^vWqN`U%R3CtOJuojJt|Ec%yo>_yZ%MV%ajx`i>ysy4d0^mKeNIQ#t@2y*KMj}jE8i*m zl#eQZ7!1Pfn72wr)$QwY6gabm(O6$Lylw3Pd(s%KbU5crNh3{eeZxI4(dJKB1MUAN>n;QZCCkQs_tGtJY-^iC3ja3x9v_uTP?vFVW;}s># zx;OS=;!{FWer7!3y~sj6t|9~xWcTkC-QJ+z*` z{$kU`Oy-`7hp(oZDFCEubef~t-M)K#*_S^K7T>g7T^A0(oK7oIN_s0RehD8}s1*i- z0sK!m=+Xa`J^uB-PXLSoRAEU$)j~-M#?mcPT3yt{hn6u4gKCOf&J$L|DbuOJmz+s9 z2lJ2J?sjAok}A_-F35;rl&1P$i@IJDD5Bmxks6yO#s#L4K20(2&;kgjBXbWq$Y}&> zCc!g3Y<~;U$CQlDX2nU|3Dx218gg&b%2GehXilrp4#P1y;weqVUjQptQlB1c;VO7e z@*D^wqyiQ&MP@@Eiijj!C6&AUPa6q7&lm^MToqj2ny^P9>WX^Ttd-e`;&k}6HltTz=X|A>@zzv6@ z)2r$ZZK19Hq1s>pg(Wg*yF5bqcpgSu2*Z=3Y48rhsMseSGm6D#RWnKSz*rI2&e%)U zhJ)uMj-*j*Cq6a|SR^kuis=outMPl7vPf8@-OF`fK(;t_tEV6%zOcxe#-=20Mq7|L zi=0@wEQshFjSRBhL&)v46Z=EWNGr^Y7(cjs9|q}uirjP>UklMq_Cn}BpIZ=OxlIZN zrqgmZ9Daq-5mP(tkggoG%l1Mp5`!YX9P+{9a@vc{UA@ux9w!5<$J7Qsxz)kjp9U>O zdMGwqZ?ce!P4?kRO}wMe2<(jAw{y`J9zkIp$bd;9jpjy5e7h8h$r8hU6K*}g{&bHR zc4&^sGRyCwh1g@leXv&EK^8KfI43fLjtGZ4%_yBJq-Q6Ii74-1r$U?ItVA?Z^o7I@ z6Gx_VGVMkkya7VbaJCw^O!RGWg$&GOOC(&Bu>?}_7>IP{%ivHGBI}%WA6YI2+3M9H z%iJLj*4d~I--NgTJ(9t@qodNU?AaV`YHlKR%UVir5C+OujBse~Mp}pFlaUEl5;MVK zxnv+FK^_1to@fbJn^<{1g0s+?k E17=sO82|tP literal 0 HcmV?d00001 diff --git a/www/images/openid-inputicon.gif b/www/images/openid-inputicon.gif new file mode 100644 index 0000000000000000000000000000000000000000..cde836c893f64bcfec04b9c817e3371ff122fe19 GIT binary patch literal 237 zcmVb{bmUKcqz}))c5uC(7v?)v4a2P)ZNa- z@$&T2)z|&~{r~^}A^8LV00000EC2ui01yBW000GQ;3tk`X`bk)Wk@<6#nZYULKH{p zEx|?+kif!I0vIL|#ZMubBmjWH2OtmxIFVa~6JQ7!1CK!f5W#StOTv&C3=E8h2vI1s n+#cd5;2fT3B_0kF0v!+!GARoV78n&7dMN`JIW(4+BOw4gP{MS* literal 0 HcmV?d00001 diff --git a/www/images/yahoo.gif b/www/images/yahoo.gif new file mode 100644 index 0000000000000000000000000000000000000000..42adbfa57f86b8b2df5aa1b7fe90510a7d1fdfdd GIT binary patch literal 1682 zcmV;D25tFANk%w1VN?JR0QUd@mU^Y$)Z(Fuu9$+OiD{W+I(v?Bo^?%%^Y8SKa-f%f zrJRAP?db1@W|sQ-`{?5AU^RD{eyHu}@MAc6Y)F84S&#er{JEpU(8JfsyU}JneZsZL zSS)eo;OgSr=DVrI-qz#a*5rX-lZrIb?D>k<=p7w-06N?k+!11Z%BingssxX*~`Jx%e>NQL4U@#&si&Ry{X0d`1)-{ zg6ib$l60Y~mAI;tw^}Z8;o0SWTajTmc&LxG+tT3I%-z$;*=0U@n}Df z_WAbn_i93aS}k+@`~3Iy_*yJ-{r&yp+~-;?aeZ2la7u;o?eq2W_P3J0;iQSMZ9#_O-sRiQ;BHNT`1AO8Qj6r> z=!+x&Fkmx*3aAJ-s-85w)XV*n|rAH`~33k^Rb@1vYox} z>+;~*+x%&C>Lw4uMvz|_vc)vS@X=;7?8j0^uVyl!LrHg=Iz3>%W_GG_VoC(sJZv``HXa* zrIxkU(csd>*m+iriD#Si^7g{9%5+bN>E!JE{QaMVtz9y8td_W5GInuEg!AzAjBA~X zY@AsvasU7SA^8LV00000EC2ui08{`F000R80L>t9BSw)JIS9nHVe#jm!-o(fN}Ncs zqD6~fM)VmW02LY`Stc0KkV8WON`_FRxX7}l%ZU3P9D0C2ViSKjMS*eC!QC5NWc*24 z$ACo`hlu15G!rIFqD1JxyfmSQfQkeLyuEbT;aCwDIQ`|T5~at(emLt$WH9QCKO?Fj z!YZJpKo=h-$7uT!(ZdXCA3nU9VnV{d0N()k(Y5u#B%yvAamGe5)veXFd%|B&z}{E8T{37 zh=$XgAq(IDLK-DxqXs0h{KJhuWN1QBJY)EyRU!TiVM;~maN!RZP&~xT1YQjCP&*>v zG{z^SKvar9Z%BlLKM^>@P9t6rA<+h8P*4UH{%m1KMF#8;qhgZOW6=OR_%lH)|M;QC z8ZSfy%{eR3AQ2<}h+xkGOhf{J3Vrwkz(32laK<*D3lQa{dk%K=0FpwEPj!g6c z8PB|?!Vn>}!~`5T1t5_zE=)iG0UUIK4SoL5A(0aP5b%#W8tjnDD-wa@&pQ_U;|wMK zP_awA|9s&=3UeHwj6-G|f<{Y6;N(Ia64h{zIqvjAj2hSc^NKS(WVVJ5CDigyFgPgS zk0p~ZbHfV$&=8I(61-3X6MR?_!$S{5GXw`Ytg(h5N(#^hz#+8og#&*SW6=pXX^~7s zFkB+QLkzgEL@`eIumT%^WMK#(^!)R|8hsQ|gbd{TLyHi#R)~`zC)5;?9Um+JL^Gdc zPzgiQO?9dAYKu|J14=HfQCJs5ExCItCfU89hC~?OkX(YSVLmi;d zz!!K_6YW}g;8BGXI9aiX4Mdod4IRil;>SO66v75h2HbJ^?H7Hao9>T4MsJEFFH&Hw-a literal 0 HcmV?d00001 diff --git a/www/index.php b/www/index.php index 9a05add..7ac6fcf 100644 --- a/www/index.php +++ b/www/index.php @@ -1,4 +1,7 @@ diff --git a/www/new.php b/www/new.php index ef9daec..fc6d5f3 100644 --- a/www/new.php +++ b/www/new.php @@ -11,6 +11,9 @@ namespace phorkie; * Creates and redirects to display page */ require_once 'www-header.php'; +if ($GLOBALS['phorkie']['auth']['secure'] > 0) { + require_once 'secure.php'; +} $repopo = new Repository_Post(); if ($repopo->process($_POST)) { diff --git a/www/raw.php b/www/raw.php index 8bda11e..67a21ee 100644 --- a/www/raw.php +++ b/www/raw.php @@ -4,6 +4,9 @@ */ namespace phorkie; require_once 'www-header.php'; +if ($GLOBALS['phorkie']['auth']['secure'] == 2) { + require_once 'secure.php'; +} $repo = new Repository(); $repo->loadFromRequest(); diff --git a/www/revision.php b/www/revision.php index 53ac458..06462af 100644 --- a/www/revision.php +++ b/www/revision.php @@ -4,6 +4,9 @@ namespace phorkie; * Display paste contents */ require_once 'www-header.php'; +if ($GLOBALS['phorkie']['auth']['secure'] == 2) { + require_once 'secure.php'; +} $repo = new Repository(); $repo->loadFromRequest(); diff --git a/www/secure.php b/www/secure.php new file mode 100644 index 0000000..5893033 --- /dev/null +++ b/www/secure.php @@ -0,0 +1,11 @@ + diff --git a/www/www-header.php b/www/www-header.php index 72a2e67..3bb7e89 100644 --- a/www/www-header.php +++ b/www/www-header.php @@ -1,5 +1,6 @@ loadTemplate($tplname . '.htm'); -- 2.30.2