diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-13 07:53:10 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-13 07:53:10 +0000 |
| commit | 3ac22b097d9a9e829ec45963a7c3a40dd12b40a1 (patch) | |
| tree | ae26d54d061b8f61a1ee2513aa913e8a5e3a1277 /sca-cpp/trunk/modules/openid | |
| parent | 1b5f778e514d74d86eee83932b9d5948d7e6e316 (diff) | |
Port to HTTPD 2.3.8. Add an auth module to make OpenID, OAuth 1/2 and HTTPD 2.3 Form auth modules play nice together.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1034693 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | sca-cpp/trunk/modules/openid/htdocs/index.html | 2 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/openid/openid-conf | 31 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/openid/openid-memcached-conf | 2 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/openid/openid-step2-conf | 4 |
4 files changed, 7 insertions, 32 deletions
diff --git a/sca-cpp/trunk/modules/openid/htdocs/index.html b/sca-cpp/trunk/modules/openid/htdocs/index.html index cdc65a4e37..e42e347671 100644 --- a/sca-cpp/trunk/modules/openid/htdocs/index.html +++ b/sca-cpp/trunk/modules/openid/htdocs/index.html @@ -19,7 +19,7 @@ <html> <head> -<script type="text/javascript" src="/js/ref.js"></script> +<script type="text/javascript" src="/wiring/ref.js"></script> <script type="text/javascript"> var protected = component("Protected"); var userInfo = defun(reference(protected, "userInfo"), "getuser", "getemail", "getrealm"); diff --git a/sca-cpp/trunk/modules/openid/openid-conf b/sca-cpp/trunk/modules/openid/openid-conf index 839b58b554..1d208784de 100755 --- a/sca-cpp/trunk/modules/openid/openid-conf +++ b/sca-cpp/trunk/modules/openid/openid-conf @@ -26,8 +26,8 @@ conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"` host=`echo $conf | awk '{ print $6 }'` openid_prefix=`cat $here/openid.prefix` -# Configure HTTPD mod_auth_openid module -cat >>$root/conf/httpd.conf <<EOF +# Configure OpenID authentication +cat >>$root/conf/auth.conf <<EOF # Generated by: openid-conf $* # Load support for OpenID authentication LoadModule authopenid_module $openid_prefix/modules/mod_auth_openid.so @@ -35,6 +35,8 @@ LoadModule authopenid_module $openid_prefix/modules/mod_auth_openid.so # Enable OpenID authentication <Location /> AuthType Open +AuthName "$host" +Require valid-user AuthOpenIDEnabled On AuthOpenIDCookiePath / AuthOpenIDCookieName TuscanyOpenAuth @@ -47,30 +49,5 @@ AuthOpenIDAXAdd FIRSTNAME http://axschema.org/namePerson/first AuthOpenIDAXAdd LASTNAME http://axschema.org/namePerson/last </Location> -# Enable unauthenticated access to public areas -<Location /login> -AuthOpenIDEnabled Off -</Location> -<Location /logout> -AuthOpenIDEnabled Off -</Location> -<Location /public> -AuthOpenIDEnabled Off -</Location> -<Location /ui> -AuthOpenIDEnabled Off -</Location> - -EOF - -cat >>$root/conf/vhost-ssl.conf <<EOF -# Generated by: openid-conf $* -# Require OpenID authentication -<Location /> -AuthType Open -AuthName "$host" -Require valid-user -</Location> - EOF diff --git a/sca-cpp/trunk/modules/openid/openid-memcached-conf b/sca-cpp/trunk/modules/openid/openid-memcached-conf index 776631dab8..1717b3ce92 100755 --- a/sca-cpp/trunk/modules/openid/openid-memcached-conf +++ b/sca-cpp/trunk/modules/openid/openid-memcached-conf @@ -24,7 +24,7 @@ host=$2 port=$3 # Configure HTTPD mod_auth_openid module cache -cat >>$root/conf/httpd.conf <<EOF +cat >>$root/conf/auth.conf <<EOF # Generated by: openid-cache-conf $* AddAuthOpenIDMemcached $host:$port diff --git a/sca-cpp/trunk/modules/openid/openid-step2-conf b/sca-cpp/trunk/modules/openid/openid-step2-conf index 30fdc4846e..d91becf7a4 100755 --- a/sca-cpp/trunk/modules/openid/openid-step2-conf +++ b/sca-cpp/trunk/modules/openid/openid-step2-conf @@ -26,19 +26,17 @@ conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"` host=`echo $conf | awk '{ print $6 }'` # Configure HTTPD to serve OpenID XRDS and LRDD documents -cat >>$root/conf/httpd.conf <<EOF +cat >>$root/conf/auth.conf <<EOF # Generated by: openid-step2-conf $* # Serve OpenID XRDS document Alias /openid $root/conf/openid.xrds <Location /openid> -AuthOpenIDEnabled Off ForceType application/xrds+xml </Location> # Serve OpenID LRDD document Alias /.well-known/host-meta $root/conf/openid.lrdd <Location /.well-known/host-meta> -AuthOpenIDEnabled Off ForceType text/plain </Location> |