diff options
Diffstat (limited to 'sca-cpp/trunk/modules/openid')
-rw-r--r-- | sca-cpp/trunk/modules/openid/htdocs/login/index.html | 11 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/openid/htdocs/logout/index.html | 11 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/openid/openid-conf | 2 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/openid/start-test | 6 |
4 files changed, 22 insertions, 8 deletions
diff --git a/sca-cpp/trunk/modules/openid/htdocs/login/index.html b/sca-cpp/trunk/modules/openid/htdocs/login/index.html index dcb10e111f..47fbb73204 100644 --- a/sca-cpp/trunk/modules/openid/htdocs/login/index.html +++ b/sca-cpp/trunk/modules/openid/htdocs/login/index.html @@ -55,9 +55,16 @@ if (typeof(openidReferrer()) == 'undefined') { document.location = '/'; } +function clearauthcookie() { + document.cookie = 'TuscanyOpenAuth=; expires=' + new Date(1970,01,01).toGMTString() + '; domain=.' + domainname(window.location.hostname) + '; path=/'; + document.cookie = 'TuscanyOAuth1=; expires=' + new Date(1970,01,01).toGMTString() + '; domain=.' + domainname(window.location.hostname) + '; path=/'; + document.cookie = 'TuscanyOAuth2=; expires=' + new Date(1970,01,01).toGMTString() + '; domain=.' + domainname(window.location.hostname) + '; path=/'; + document.cookie = 'TuscanyOpenIDAuth=; expires=' + new Date(1970,01,01).toGMTString() + '; domain=.' + domainname(window.location.hostname) + '; path=/'; + return true; +} + function submitSignin(w) { - var reset = 'TuscanyOpenAuth=; expires=' + new Date(1970,01,01).toGMTString() + '; domain=.' + window.location.hostname + '; path=/'; - document.cookie = reset; + clearauthcookie(); document.signin.openid_identifier.value = w(); document.signin.action = openidReferrer(); document.signin.submit(); diff --git a/sca-cpp/trunk/modules/openid/htdocs/logout/index.html b/sca-cpp/trunk/modules/openid/htdocs/logout/index.html index 35172da07f..a9d2e628d7 100644 --- a/sca-cpp/trunk/modules/openid/htdocs/logout/index.html +++ b/sca-cpp/trunk/modules/openid/htdocs/logout/index.html @@ -31,9 +31,16 @@ <form name="signout" action="/login" method="GET"> <script type="text/javascript"> +function clearauthcookie() { + document.cookie = 'TuscanyOpenAuth=; expires=' + new Date(1970,01,01).toGMTString() + '; domain=.' + domainname(window.location.hostname) + '; path=/'; + document.cookie = 'TuscanyOAuth1=; expires=' + new Date(1970,01,01).toGMTString() + '; domain=.' + domainname(window.location.hostname) + '; path=/'; + document.cookie = 'TuscanyOAuth2=; expires=' + new Date(1970,01,01).toGMTString() + '; domain=.' + domainname(window.location.hostname) + '; path=/'; + document.cookie = 'TuscanyOpenIDAuth=; expires=' + new Date(1970,01,01).toGMTString() + '; domain=.' + domainname(window.location.hostname) + '; path=/'; + return true; +} + function submitSignout() { - var reset = 'TuscanyOpenAuth=; expires=' + new Date(1970,01,01).toGMTString() + '; domain=.' + window.location.hostname + '; path=/'; - document.cookie = reset; + clearauthcookie(); document.signout.submit(); return true; } diff --git a/sca-cpp/trunk/modules/openid/openid-conf b/sca-cpp/trunk/modules/openid/openid-conf index f4f715ce99..d07e4b7cad 100755 --- a/sca-cpp/trunk/modules/openid/openid-conf +++ b/sca-cpp/trunk/modules/openid/openid-conf @@ -58,7 +58,7 @@ AuthName "$host" Require valid-user AuthOpenIDEnabled On AuthOpenIDCookiePath / -AuthOpenIDCookieName TuscanyOpenAuth +AuthOpenIDCookieName TuscanyOpenIDAuth AuthOpenIDLoginPage /login/ AuthOpenIDAXAdd REMOTE_USER http://axschema.org/contact/email AuthOpenIDAXAdd EMAIL http://axschema.org/contact/email diff --git a/sca-cpp/trunk/modules/openid/start-test b/sca-cpp/trunk/modules/openid/start-test index 195e1c3c98..5cac1dbe14 100755 --- a/sca-cpp/trunk/modules/openid/start-test +++ b/sca-cpp/trunk/modules/openid/start-test @@ -31,9 +31,9 @@ ./openid-memcached-conf tmp localhost 11213 ./openid-step2-conf tmp -# For this test to work you need to add your openid to the -# the authorized user group -../../modules/http/group-auth-conf tmp https://www.google.com/accounts/o8/id?id=1234567 +# For this test to work you need to add your openid (or email address if +# available from your openid attributes to the the authorized user group +../../modules/http/group-auth-conf tmp jane@example.com ../../modules/server/server-conf tmp ../../modules/server/scheme-conf tmp |