Return-Path: Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: (qmail 71497 invoked from network); 3 Dec 2010 04:00:59 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Dec 2010 04:00:59 -0000 Received: (qmail 49926 invoked by uid 500); 3 Dec 2010 04:00:59 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 49861 invoked by uid 500); 3 Dec 2010 04:00:58 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 49854 invoked by uid 99); 3 Dec 2010 04:00:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Dec 2010 04:00:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Dec 2010 04:00:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DEBE22388A32; Fri, 3 Dec 2010 03:59:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041681 - in /tuscany/sca-cpp/trunk: modules/http/ modules/oauth/ modules/openid/ samples/store-cluster/ samples/store-cpp/ samples/store-java/ samples/store-nosql/ samples/store-python/ samples/store-scheme/ samples/store-sql/ samples/sto... Date: Fri, 03 Dec 2010 03:59:20 -0000 To: commits@tuscany.apache.org From: jsdelfino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101203035920.DEBE22388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jsdelfino Date: Fri Dec 3 03:59:19 2010 New Revision: 1041681 URL: http://svn.apache.org/viewvc?rev=1041681&view=rev Log: Add scripts to support 'Require valid-user' and 'Require group' authz configurations separately. Added: tuscany/sca-cpp/trunk/modules/http/group-auth-conf - copied, changed from r1041680, tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf tuscany/sca-cpp/trunk/modules/http/passwd-auth-conf - copied, changed from r1041680, tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start Modified: tuscany/sca-cpp/trunk/modules/http/Makefile.am tuscany/sca-cpp/trunk/modules/http/basic-auth-conf tuscany/sca-cpp/trunk/modules/http/cert-auth-conf tuscany/sca-cpp/trunk/modules/http/form-auth-conf tuscany/sca-cpp/trunk/modules/http/httpd-conf tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf tuscany/sca-cpp/trunk/modules/http/open-auth-conf tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf tuscany/sca-cpp/trunk/modules/oauth/start-mixed-test tuscany/sca-cpp/trunk/modules/oauth/start-test tuscany/sca-cpp/trunk/modules/openid/start-test tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start tuscany/sca-cpp/trunk/samples/store-java/ssl-start tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start tuscany/sca-cpp/trunk/samples/store-python/ssl-start tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start tuscany/sca-cpp/trunk/samples/store-sql/ssl-start tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start Modified: tuscany/sca-cpp/trunk/modules/http/Makefile.am URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/Makefile.am?rev=1041681&r1=1041680&r2=1041681&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/Makefile.am (original) +++ tuscany/sca-cpp/trunk/modules/http/Makefile.am Fri Dec 3 03:59:19 2010 @@ -20,7 +20,7 @@ INCLUDES = -I${HTTPD_INCLUDE} incl_HEADERS = *.hpp incldir = $(prefix)/include/modules/http -dist_mod_SCRIPTS = httpd-conf httpd-addr httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf basic-auth-conf cert-auth-conf form-auth-conf open-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf httpd-worker-conf httpd-event-conf +dist_mod_SCRIPTS = httpd-conf httpd-addr httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf basic-auth-conf cert-auth-conf form-auth-conf open-auth-conf passwd-auth-conf group-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf httpd-worker-conf httpd-event-conf moddir=$(prefix)/modules/http curl_test_SOURCES = curl-test.cpp Modified: tuscany/sca-cpp/trunk/modules/http/basic-auth-conf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/basic-auth-conf?rev=1041681&r1=1041680&r2=1041681&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/basic-auth-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/basic-auth-conf Fri Dec 3 03:59:19 2010 @@ -25,8 +25,6 @@ root=`readlink -f $1` conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"` host=`echo $conf | awk '{ print $6 }'` -httpd_prefix=`cat $here/httpd.prefix` - # Generate basic authentication configuration cat >>$root/conf/auth.conf <>$root/conf/auth.conf < EOF -# Create test users -touch $root/conf/httpd.passwd -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd test test 2>/dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd admin admin 2>/dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd foo foo 2>/dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd bar bar 2>/dev/null - Modified: tuscany/sca-cpp/trunk/modules/http/cert-auth-conf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/cert-auth-conf?rev=1041681&r1=1041680&r2=1041681&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/cert-auth-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/cert-auth-conf Fri Dec 3 03:59:19 2010 @@ -25,8 +25,6 @@ root=`readlink -f $1` conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"` host=`echo $conf | awk '{ print $6 }'` -httpd_prefix=`cat $here/httpd.prefix` - # Generate authentication configuration cat >>$root/conf/auth.conf < EOF -# Create certificate-based users -touch $root/conf/httpd.passwd +# Create password file and certificate-based users cat >>$root/conf/httpd.passwd <>$root/conf/auth.conf <>$root/conf/auth.conf </dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd admin admin 2>/dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd foo foo 2>/dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd bar bar 2>/dev/null - Copied: tuscany/sca-cpp/trunk/modules/http/group-auth-conf (from r1041680, tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf) URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/group-auth-conf?p2=tuscany/sca-cpp/trunk/modules/http/group-auth-conf&p1=tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf&r1=1041680&r2=1041681&rev=1041681&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/group-auth-conf Fri Dec 3 03:59:19 2010 @@ -17,41 +17,28 @@ # specific language governing permissions and limitations # under the License. -# Generate an SSL tunnel configuration here=`readlink -f $0`; here=`dirname $here` mkdir -p $1 root=`readlink -f $1` +user=$2 +group="members" -conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"` -host=`echo $conf | awk '{ print $6 }'` - -port=`$here/httpd-addr port $2` -sslhost=$3 -sslport=$4 -tport=$5 - -httpd_prefix=`cat $here/httpd.prefix` - -# Generate HTTPD configuration -cat >>$root/conf/httpd.conf < -ServerName http://localhost:$port - -TunnelPass https://$sslhost:$sslport/tunnel/localhost/$tport - -# Declare SSL certificates used in this virtual host -#TunnelSSLCACertificateFile "$root/cert/ca.crt" -TunnelSSLCertificateFile "$root/cert/tunnel.crt" -TunnelSSLCertificateKeyFile "$root/cert/tunnel.key" - - +# Add user to group +cat $root/conf/httpd.groups | awk " BEGIN { found = 0 } /$group: / { printf \"%s %s\n\", \$0, \"$user\"; found = 1 } !/$group: / { printf \"%s\n\", \$0 } END { if (found == 0) printf \"%s: %s\n\", \"$group\", \"$user\" } " >$root/conf/.httpd.groups.tmp 2>/dev/null +cp $root/conf/.httpd.groups.tmp $root/conf/httpd.groups +rm $root/conf/.httpd.groups.tmp + +# Generate HTTPD group authorization configuration +conf=`cat $root/conf/auth.conf | grep "Generated by: group-auth-conf"` +if [ "$conf" = "" ]; then + cat >>$root/conf/auth.conf < +AuthGroupFile "$root/conf/httpd.groups" +Require group members + EOF +fi Modified: tuscany/sca-cpp/trunk/modules/http/httpd-conf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-conf?rev=1041681&r1=1041680&r2=1041681&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/httpd-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/httpd-conf Fri Dec 3 03:59:19 2010 @@ -230,11 +230,21 @@ Require all granted # Allow authorized access to root location Options FollowSymLinks +AuthUserFile "$root/conf/httpd.passwd" Require all granted EOF +# Create password and group files +cat >$root/conf/httpd.passwd <$root/conf/httpd.groups <$root/conf/vhost.conf <>$root/conf/auth.conf < @@ -45,7 +42,6 @@ Require valid-user AuthType Form AuthName "$host" AuthFormProvider file -AuthUserFile "$root/conf/httpd.passwd" AuthFormLoginRequiredLocation /login AuthFormLogoutLocation / Session On @@ -57,10 +53,3 @@ SetHandler form-login-handler EOF -# Create test users -touch $root/conf/httpd.passwd -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd test test 2>/dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd admin admin 2>/dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd foo foo 2>/dev/null -$httpd_prefix/bin/htpasswd -b $root/conf/httpd.passwd bar bar 2>/dev/null - Copied: tuscany/sca-cpp/trunk/modules/http/passwd-auth-conf (from r1041680, tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start) URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/passwd-auth-conf?p2=tuscany/sca-cpp/trunk/modules/http/passwd-auth-conf&p1=tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start&r1=1041680&r2=1041681&rev=1041681&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start (original) +++ tuscany/sca-cpp/trunk/modules/http/passwd-auth-conf Fri Dec 3 03:59:19 2010 @@ -17,19 +17,15 @@ # specific language governing permissions and limitations # under the License. -../../modules/http/ssl-ca-conf tmp localhost -../../modules/http/ssl-cert-conf tmp localhost -../../modules/http/httpd-conf tmp localhost 8090 htdocs -../../modules/http/httpd-ssl-conf tmp 8453 -../../modules/http/basic-auth-conf tmp -../../modules/server/server-conf tmp -../../modules/server/cpp-conf tmp -cat >>tmp/conf/httpd.conf </dev/null -../../components/cache/memcached-start -../../modules/http/httpd-start tmp Modified: tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf?rev=1041681&r1=1041680&r2=1041681&view=diff ============================================================================== --- tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf (original) +++ tuscany/sca-cpp/trunk/modules/http/tunnel-ssl-conf Fri Dec 3 03:59:19 2010 @@ -30,8 +30,6 @@ sslhost=$3 sslport=$4 tport=$5 -httpd_prefix=`cat $here/httpd.prefix` - # Generate HTTPD configuration cat >>$root/conf/httpd.conf <>tmp/conf/httpd.conf <>tmp/conf/httpd.conf <>tmp/conf/httpd.conf <>tmp/conf/httpd.conf <>tmp/conf/httpd.conf <>tmp/conf/httpd.conf <>tmp/conf/httpd.conf <>tmp/conf/httpd.conf <>tmp/conf/httpd.conf <