3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-01-14 01:38:01 +08:00
Code Issues Projects Releases Wiki Activity

Keep directory listing compile-time option

Browse Source
This commit is contained in:
Sergey Lyubka 2021-07-21 11:05:27 +01:00
parent 3808dd3222
commit 0d5d7bb26f
5 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mongoose.c
View File

@ -1279,11 +1279,7 @@ void mg_http_serve_dir(struct mg_connection *c, struct mg_http_message *hm,
#endif
if (is_index && fp == NULL) {
#if MG_ENABLE_DIRECTORY_LISTING
if (opts->enable_dirlist && strcmp(opts->enable_dirlist, "no") == 0) {
mg_http_reply(c, 403, "", "%s", "Denied");
} else {
listdir(c, hm, opts, t2);
}
listdir(c, hm, opts, t2);
#else
mg_http_reply(c, 403, "", "%s", "Directory listing not supported");
#endif

1
mongoose.h
View File

@ -787,7 +787,6 @@ struct mg_http_serve_opts {
const char *root_dir; // Web root directory, must be non-NULL
const char *ssi_pattern; // SSI file name pattern, e.g. #.shtml
const char *extra_headers; // Extra HTTP headers to add in responses
const char *enable_dirlist; // Enable dir listing. Set to "no" to disable
};
// Parameter for mg_http_next_multipart

6
src/http.c
View File

@ -868,11 +868,7 @@ void mg_http_serve_dir(struct mg_connection *c, struct mg_http_message *hm,
#endif
if (is_index && fp == NULL) {
#if MG_ENABLE_DIRECTORY_LISTING
if (opts->enable_dirlist && strcmp(opts->enable_dirlist, "no") == 0) {
mg_http_reply(c, 403, "", "%s", "Denied");
} else {
listdir(c, hm, opts, t2);
}
listdir(c, hm, opts, t2);
#else
mg_http_reply(c, 403, "", "%s", "Directory listing not supported");
#endif

1
src/http.h
View File

@ -26,7 +26,6 @@ struct mg_http_serve_opts {
const char *root_dir; // Web root directory, must be non-NULL
const char *ssi_pattern; // SSI file name pattern, e.g. #.shtml
const char *extra_headers; // Extra HTTP headers to add in responses
const char *enable_dirlist; // Enable dir listing. Set to "no" to disable
};
// Parameter for mg_http_next_multipart

5
test/unit_test.c
View File

@ -369,7 +369,6 @@ static void eh1(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
sopts.root_dir = "./test/data";
sopts.ssi_pattern = "#.shtml";
sopts.extra_headers = "C: D\r\n";
sopts.enable_dirlist = "no";
mg_http_serve_dir(c, hm, &sopts);
}
} else if (ev == MG_EV_WS_MSG) {
@ -565,10 +564,6 @@ static void test_http_server(void) {
ASSERT(mg_strstr(mg_str(buf), mg_str(">Index of /test/<")) != NULL);
ASSERT(mg_strstr(mg_str(buf), mg_str(">fuzz.c<")) != NULL);
// Directory listing denied
ASSERT(fetch(&mgr, buf, url, "GET /secret/ HTTP/1.0\n\n") == 403);
ASSERT(cmpbody(buf, "Denied\n") == 0);
{
// Credentials
struct mg_http_message hm;