X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=blobdiff_plain;f=plc.d%2Fhttpd;h=879ca7eebe9e29973fc3ad3d76b9e2675feddd04;hp=67012236081bb97ec963e57696cb267adf202163;hb=fe5065f3018e32b93c0aa470c05d5ce340dcf754;hpb=056625369a7163e8540b1e5cee4d756c07a64456

diff --git a/plc.d/httpd b/plc.d/httpd
index 6701223..879ca7e 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -1,6 +1,4 @@
 #!/bin/bash
-# $Id$
-# $URL$
 #
 # priority: 600
 #
@@ -58,6 +56,10 @@ case "$1" in
 	include_path=".:$DocumentRoot/planetlab/includes:$DocumentRoot/plekit/php:$DocumentRoot/generated:/etc/planetlab/php:/usr/share/plc_api/php"
 	sed -i -e "s@[;]*include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini
 
+	# Set open_basedir so as to avoid leaks
+	open_basedir="$DocumentRoot:/etc/planetlab/php:/usr/share/plc_api/php:/var/log/myslice:/var/tmp/bootmedium:/tmp"
+	sed -i -e "s@[;]*open_basedir =.*@open_basedir = \"$open_basedir\"@" $php_ini
+	
 	# for php-5.3 under fedora12, otherwise issues tons of warning messages
 	# Set timezone in php.ini if not already there
 	if grep '^;date.timezone' $php_ini >& /dev/null; then
@@ -65,6 +67,10 @@ case "$1" in
 	    sed -i -e 's,^;date.timezone.*,date.timezone = GMT,' $php_ini
 	fi
 
+	if grep '^short_open_tag = Off' $php_ini >& /dev/null; then
+	    sed -i -e 's,^short_open_tag = Off,short_open_tag = On,' $php_ini
+	fi
+
 	# Disable default Listen directive
 	sed -i -e '/^Listen/d' $httpd_conf
 
@@ -78,11 +84,11 @@ case "$1" in
 	    http_port=PLC_${server}_PORT
 	    https_port=PLC_${server}_SSL_PORT
 
-	    # API should always be accessed via SSL
-	    if [ "$server" = "API" ] ; then
-		https_port=${!http_port}
-		http_port=
-	    fi
+#	    # API should always be accessed via SSL
+#	    if [ "$server" = "API" ] ; then
+#		https_port=${!http_port}
+#		http_port=
+#	    fi
 
 	    # Check if we are already listening on these ports
 	    skip_http=0
@@ -106,26 +112,17 @@ case "$1" in
 		fi
 	    done
 
-        # Create a separate path for mod_wsgi until we are ready to replace 
-        # mod_python
-        PLC_API_WSGI_PATH=/PLCAPIWSGI 
-
 	    # HTTP configuration
 	    if [ $skip_http -eq 0 -a -n "${!http_port}" ] ; then
 		cat <<EOF
 Listen ${!http_port}
-# create wsgi socket where we have the permission
-### WSGISocketPrefix run/wsgi
-# Make sure that the admin web pages and API are always accessed via SSL
 <VirtualHost *:${!http_port}>
+    # Make sure that the admin web pages are always accessed via SSL
     Redirect /db https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/db
     Redirect /planetlab https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/planetlab
-    Redirect /$PLC_API_PATH https://$PLC_API_HOST:$PLC_API_PORT/$PLC_API_PATH
-###     Redirect /$PLC_API_WSGI_PATH/ https://$PLC_API_HOST:$PLC_API_PORT/$PLC_API_WSGI_PATH/
-###     WSGIScriptAlias $PLC_API_WSGI_PATH /usr/share/plc_api/ModWSGI.wsgi
-    # XX make processes and threads configurable 
-###     WSGIDaemonProcess plcapi-wsgi user=apache group=apache processes=1 threads=25
-###     WSGIProcessGroup plcapi-wsgi
+# as a matter of fact most xmlrpc clients won't follow the redirection
+# so this is mostly rethorical, but just in case...
+   Redirect /$PLC_API_PATH https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/$PLC_API_PATH
 </VirtualHost>
 EOF
 	    fi
@@ -140,48 +137,53 @@ EOF
 		    -e "s/^Listen .*/Listen ${!https_port}/" \
 		    -e "s/<VirtualHost _default_:.*>/<VirtualHost _default_:${!https_port}>/" \
 		    $ssl_conf
+	    # this is used to locate the right certificates
+	    server_lower=$(echo $server | tr 'A-Z' 'a-z')
+	    cat <<EOF
+# create wsgi socket where we have the permission
+WSGISocketPrefix run/wsgi
+
+<VirtualHost *:${!https_port}>
+
+   WSGIScriptAlias /$PLC_API_PATH /usr/share/plc_api/wsgi/plc.wsgi
+# xxx would be cool to be able to tweak this through config
+   WSGIDaemonProcess plcapi-wsgi-ssl user=apache group=apache processes=1 threads=25
+   WSGIProcessGroup plcapi-wsgi-ssl
+
+   # SSL
+   SSLEngine On
+   SSLCertificateFile /etc/planetlab/${server_lower}_ssl.crt
+   SSLCertificateKeyFile /etc/planetlab/${server_lower}_ssl.key
+   SSLCertificateChainFile /etc/planetlab/${server_lower}_ca_ssl.crt
+
+</VirtualHost>
+EOF
 	    fi
 	done >$plc_conf
 
 	# Set custom Apache directives
 	(
-	    if [ "$PLC_API_ENABLED" = "1" ] ; then
-		cat <<EOF
-# mod_python location
-<Location $PLC_API_PATH>
-    SetHandler mod_python
-    PythonPath "sys.path + ['/usr/share/plc_api']"
-    PythonHandler ModPython
-</Location>
-
-# mod_wsgi location
-### <Location $PLC_API_WSGI_PATH/>
-###     SetHandler mod_wsgi
-### </Location>
+	    # could be restricted to boot boxes but harmless..
+	    cat <<EOF
+AddType application/octet-stream .iso
+AddType application/octet-stream .usb
 EOF
-	    else
+	    # make sure /PLCAPI can't get accessed if API not enabled here
+	    if [ "$PLC_API_ENABLED" != "1" ] ; then
 		cat <<EOF
-# mod_python location
+# mod_wsgi location
 <Location $PLC_API_PATH>
     Deny from all
-</Location>
-
-# mod_wsgi location
-### <Location $PLC_API_WSGI_PATH/>
-###     Deny from all
-### </Location> 
+</Location> 
 EOF
 	    fi
 
+	    # redirect www requests if not on the right server
 	    if [ "$PLC_WWW_ENABLED" != "1" ] ; then
 		cat <<EOF
 Redirect /index.html http://$PLC_WWW_HOST:$PLC_WWW_PORT/
 EOF
 	    fi
-	    cat <<EOF
-AddType application/octet-stream .iso
-AddType application/octet-stream .usb
-EOF
 	) >>$plc_conf
 
 	# Make alpina-logs directory writable for bootmanager log upload