Merge pull request #263 from jdeathe/issue/251

jdeathe · web-flow · commit 54cdd01baf7d · 2019-10-03T19:39:21.000+01:00
CLOSES #251: Fixes default Apache DirectoryIndex file.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ Summary of release changes.
 - Adds `/docs` directory for supplementary documentation and simplify README.
 - Adds drop-in configuration for `/server-satus`; removes from global Apache configuration.
 - Fixes validation failure of 0 second --timeout value in `test/health_status`.
+- Fixes unintentional override of default `DirectoryIndex` in main Apache configuration.
 
 ### 1.13.2 - 2019-08-05
 
diff --git a/Dockerfile b/Dockerfile
@@ -44,6 +44,7 @@ ADD src /
 # - Limit threads for the application user
 # - Disable Apache directory indexes and welcome page
 # - Disable Apache language based content negotiation
+# - Prevent unintentional override of default DirectoryIndex
 # - Custom Apache configuration
 # - Disable all Apache modules and enable the minimum
 # - Disable Apache default fcgid configuration; replaced with 00-fcgid.conf
@@ -89,6 +90,7 @@ RUN useradd -r -M -d /var/www/app -s /sbin/nologin app \
 		-e 's~^LanguagePriority \(.*\)$~#LanguagePriority \1~g' \
 		-e 's~^ForceLanguagePriority \(.*\)$~#ForceLanguagePriority \1~g' \
 		-e 's~^AddLanguage \(.*\)$~#AddLanguage \1~g' \
+		-e '/^Include conf.d\/\*.conf/i DirectoryIndex index.html index.html.var' \
 		/etc/httpd/conf/httpd.conf \
 	&& { printf -- \
 		'\n%s\n%s\n%s\n%s\\\n%s%s\\\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n' \
diff --git a/test/fixture/apache/var/www/public_html/index.html b/test/fixture/apache/var/www/public_html/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>{{TITLE}}</title>
+	</head>
+	<body>
+		{{BODY}}
+	</body>
+</html>
diff --git a/test/fixture/apache/var/www/public_html/index.php b/test/fixture/apache/var/www/public_html/index.php
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>{{TITLE}}</title>
+		<meta name="php_version" content="<?php echo PHP_VERSION ?>">
+	</head>
+	<body>
+		{{BODY}}
+	</body>
+</html>
diff --git a/test/shpec/operation_shpec.sh b/test/shpec/operation_shpec.sh
@@ -180,6 +180,7 @@ function test_basic_operations ()
  - setenvif_module
  - status_module
  - version_module"
+	local -r content_index_html="$(< test/fixture/apache/var/www/public_html/index.html)"
 	local -r required_apache_modules="
 authz_user_module
 log_config_module
@@ -656,6 +657,48 @@ ${other_required_apache_modules}
 			end
 		end
 
+		describe "Apache DirectoryIndex"
+			it "Defaults to index.html"
+				__terminate_container \
+					apache-php.1 \
+				&> /dev/null
+
+				docker run \
+					--detach \
+					--no-healthcheck \
+					--name apache-php.1 \
+					--publish ${DOCKER_PORT_MAP_TCP_80}:80 \
+					--volume ${PWD}/test/fixture/apache/var/www/public_html:/opt/app/public_html:ro \
+					jdeathe/centos-ssh-apache-php-fcgi:latest \
+				&> /dev/null
+
+				if ! __is_container_ready \
+					apache-php.1 \
+					${STARTUP_TIME} \
+					"/usr/sbin/httpd(\.worker|\.event)? " \
+					"[[ 000 != \$(curl -sI -o /dev/null -w %{http_code} localhost/) ]]"
+				then
+					exit 1
+				fi
+
+				container_hostname="$(
+					docker exec \
+						apache-php.1 \
+						hostname
+				)"
+
+				curl_get_request="$(
+					curl -s \
+						--header "Host: ${container_hostname}" \
+						http://127.0.0.1:${container_port_80}/
+				)"
+
+				assert equal \
+					"${curl_get_request}" \
+					"${content_index_html}"
+			end
+		end
+
 		__terminate_container \
 			apache-php.1 \
 		&> /dev/null
