From: Jan Engelhardt Date: Thu, 02 Dec 2021 10:28:55 GMT Subject: [PATCH] http-backend: give a hint that web browser access is not supported Message-ID: <20211202102855.23907-1-jengelh@inai.de> In-Reply-To: When using a browser to access a URI that is served by http-backend, nothing but a blank page is shown. This is not helpful. Emit the same "Request not handled" messages, but to the CGI stream at stdout. Use the HTTP REQUEST_URI for this so that filesystem paths are not revealed more than necessary. Add a paragraph that browsing to http-backend URIs is not something that should normally be done. Signed-off-by: Jan Engelhardt --- Now as a -p1 patch. http-backend.c | 36 +++++++++++++++++++++++++++----- t/t5561-http-backend.sh | 46 ++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 28 deletions(-) diff --git a/http-backend.c b/http-backend.c index 3d6e2ff17f..f7858e9c49 100644 --- a/http-backend.c +++ b/http-backend.c @@ -139,6 +139,25 @@ static NORETURN void not_found(struct strbuf *hdr, const char *err, ...) exit(0); } +static NORETURN void not_found_2(struct strbuf *hdr, const char *dir, + const char *pathinfo, const char *err, + const char *hint) +{ + http_status(hdr, 404, "Not Found"); + hdr_nocache(hdr); + strbuf_add(hdr, "\r\n", 2); + if (pathinfo != NULL) + strbuf_addf(hdr, "%s: ", pathinfo); + strbuf_addf(hdr, "%s.\r\n", err); + if (hint != NULL) + strbuf_addf(hdr, "%s\r\n", hint); + end_headers(hdr); + + if (err && *err) + fprintf(stderr, "%s: %s\n", dir, err); + exit(0); +} + __attribute__((format (printf, 2, 3))) static NORETURN void forbidden(struct strbuf *hdr, const char *err, ...) { @@ -736,7 +755,8 @@ static int bad_request(struct strbuf *hdr, const struct service_cmd *c) int cmd_main(int argc, const char **argv) { - char *method = getenv("REQUEST_METHOD"); + const char *method = getenv("REQUEST_METHOD"); + const char *pathinfo = getenv("PATH_INFO"); const char *proto_header; char *dir; struct service_cmd *cmd = NULL; @@ -775,15 +795,21 @@ int cmd_main(int argc, const char **argv) regfree(&re); } - if (!cmd) - not_found(&hdr, "Request not supported: '%s'", dir); + if (!cmd) { + const char *hint = ""; + if (strcmp(method, "GET") == 0) + hint = "You cannot use a web browser to access " + "this URL. Only git operations like " + "clone/ls-remote/etc. will work.\n"; + not_found_2(&hdr, dir, pathinfo, "Request not supported", hint); + } setup_path(); if (!enter_repo(dir, 0)) - not_found(&hdr, "Not a git repository: '%s'", dir); + not_found_2(&hdr, dir, pathinfo, "Not a git repository", NULL); if (!getenv("GIT_HTTP_EXPORT_ALL") && access("git-daemon-export-ok", F_OK) ) - not_found(&hdr, "Repository not exported: '%s'", dir); + not_found_2(&hdr, dir, pathinfo, "Repository not exported", NULL); http_config(); max_request_buffer = git_env_ulong("GIT_HTTP_MAX_REQUEST_BUFFER", diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh index 9c57d84315..d8add36fb4 100755 --- a/t/t5561-http-backend.sh +++ b/t/t5561-http-backend.sh @@ -44,7 +44,7 @@ grep '^[^#]' >exp <