Support index.php fallback for files in built-in server

iluuu1994 · iluuu1994 · commit 30929c9a887e · 2023-12-21T15:35:40.000+01:00
If no router script is used, the built-in webserver will now look for a fallback index file recursively in all cases, including URLs with a period. Furthermore, if a router script returns false, we will no longer perform a recursive fallback. Previously, recursive fallback was performed when the URL contained no period. The rationale for this is that it avoids serving the root index.php file when the router has indicated that the file is a static file. The existing behavior essentially assumes that virtual routes don't contain periods, and that real files do. Both of those assumptions are incorrect. Fixes GH-12604
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
@@ -1437,14 +1437,13 @@ static void php_cli_server_request_dtor(php_cli_server_request *req) /* {{{ */
 	}
 } /* }}} */
 
-static void php_cli_server_request_translate_vpath(php_cli_server_request *request, const char *document_root, size_t document_root_len) /* {{{ */
+static void php_cli_server_request_translate_vpath(php_cli_server *server, php_cli_server_request *request, const char *document_root, size_t document_root_len) /* {{{ */
 {
 	zend_stat_t sb = {0};
 	static const char *index_files[] = { "index.php", "index.html", NULL };
 	char *buf = safe_pemalloc(1, request->vpath_len, 1 + document_root_len + 1 + sizeof("index.html"), 1);
 	char *p = buf, *prev_path = NULL, *q, *vpath;
 	size_t prev_path_len = 0;
-	int  is_static_file = 0;
 
 	memmove(p, document_root, document_root_len);
 	p += document_root_len;
@@ -1453,13 +1452,6 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
 		if (request->vpath[0] != '/') {
 			*p++ = DEFAULT_SLASH;
 		}
-		q = request->vpath + request->vpath_len;
-		while (q > request->vpath) {
-			if (*q-- == '.') {
-				is_static_file = 1;
-				break;
-			}
-		}
 		memmove(p, request->vpath, request->vpath_len);
 #ifdef PHP_WIN32
 		q = p + request->vpath_len;
@@ -1489,7 +1481,7 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
 					}
 					file++;
 				}
-				if (!*file || is_static_file) {
+				if (!*file) {
 					if (prev_path) {
 						pefree(prev_path, 1);
 					}
@@ -1499,6 +1491,10 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
 			}
 			break; /* regular file */
 		}
+		/* If the router has returned false we don't want to look for an index file recursively. */
+		if (server->router) {
+			break;
+		}
 		if (prev_path) {
 			pefree(prev_path, 1);
 			*q = DEFAULT_SLASH;
@@ -1801,7 +1797,7 @@ static int php_cli_server_client_read_request_on_message_complete(php_http_parse
 {
 	php_cli_server_client *client = parser->data;
 	client->request.protocol_version = parser->http_major * 100 + parser->http_minor;
-	php_cli_server_request_translate_vpath(&client->request, client->server->document_root, client->server->document_root_len);
+	php_cli_server_request_translate_vpath(client->server, &client->request, client->server->document_root, client->server->document_root_len);
 	if (client->request.vpath) {
 		const char *vpath = client->request.vpath;
 		const char *end = vpath + client->request.vpath_len;
diff --git a/sapi/cli/tests/php_cli_server_009.phpt b/sapi/cli/tests/php_cli_server_009.phpt
@@ -79,4 +79,4 @@ X-Powered-By: PHP/%s
 Content-type: text/html; charset=UTF-8
 
 string(9) "/foo/bar/"
-HTTP/1.0 404 Not Found
+HTTP/1.0 200 OK
diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt
@@ -61,12 +61,11 @@ X-Powered-By: %s
 Content-type: %s
 
 done
-HTTP/1.1 404 Not Found
+HTTP/1.1 200 OK
 Host: %s
 Date: %s
 Connection: close
-Content-Type: %s
-Content-Length: %d
+X-Powered-By: PHP/%s
+Content-type: %s
 
-<!doctype html><html><head><title>404 Not Found</title><style>AAA</style>
-</head><body><h1>Not Found</h1><p>The requested resource <code class="url">/main/no-exists.php</code> was not found on this server.</p></body></html>
+done
