Do not allow include statements in sites

diff --git a/apache2-vhost-update b/apache2-vhost-update
index 61c5bf369567ec375acd91039e470a6aafaca1b3..a61369edeecf9c9b2622dabc94b3435efdd0c526 100755 (executable)
--- a/apache2-vhost-update
+++ b/apache2-vhost-update
@@ -112,8 +112,16 @@ if [ "$?" != "0" ]; then
        echo "Could not get a lock/checkout $DESTINATION/$site." >&2
        exit 1
 fi
        echo "Could not get a lock/checkout $DESTINATION/$site." >&2
        exit 1
 fi

+

 cp -f "$STATINGDIR/$site" "$DESTINATION/$site"
 
 cp -f "$STATINGDIR/$site" "$DESTINATION/$site"
 

+if grep -i include "$DESTINATION/$site" > /dev/null; then
+       echo "New site may have include statements - rejecting." >&2
+       rm -f "$DESTINATION/$site"
+       co "$DESTINATION/$site"
+       exit 1
+fi
+

 /usr/sbin/apache2ctl configtest
 if [ "$?" != "0" ]; then
        echo "configtest returned errors; reverting." >&2
 /usr/sbin/apache2ctl configtest
 if [ "$?" != "0" ]; then
        echo "configtest returned errors; reverting." >&2

diff --git a/debian/changelog b/debian/changelog
index 1afa4c8900d30b69168876fd2dc219c4e382d726..03fe38355b6b8cefa1acbc832a25cac3d4de16b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian.org (10) stable; urgency=low
+
+  * Do not allow include statements.
+
+ -- Peter Palfrader <weasel@debian.org>  Sat, 10 Jan 2009 14:54:34 +0100
+

 debian.org (9) stable; urgency=low
 
   * Make restart-apache way more powerful.
 debian.org (9) stable; urgency=low
 
   * Make restart-apache way more powerful.