stephenseo/c_simple_http
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Refactor static_validate_path
All checks were successful
Run Unit Tests / build-and-run-unit-tests (push) Successful in 19s
Details

Browse source
This commit is contained in:
Stephen Seo 2024-11-03 18:20:26 +09:00
parent 1b7c73f12f
commit d4b3c3af8b
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/static.c
View file

@ -304,12 +304,28 @@ C_SIMPLE_HTTP_StaticFileInfo c_simple_http_get_file(
int c_simple_http_static_validate_path(const char *path) { int c_simple_http_static_validate_path(const char *path) {
uint64_t length = strlen(path); uint64_t length = strlen(path);
if (length >= 3 && path[0] == '.' && path[1] == '.' && path[2] == '/') {
// Starts with "..", invalid.
return 1;
}
for (uint64_t idx = 0; idx <= length && path[idx] != 0; ++idx) { for (uint64_t idx = 0; idx <= length && path[idx] != 0; ++idx) {
if (length - idx >= 2) { if (length - idx >= 4) {
if (path[idx] == '.' && path[idx + 1] == '.') { if (path[idx] == '/'
&& path[idx + 1] == '.'
&& path[idx + 2] == '.'
&& path[idx + 3] == '/') {
// Contains "..", invalid. // Contains "..", invalid.
return 1; return 1;
} }
} else if (length - idx == 3) {
if (path[idx] == '/'
&& path[idx + 1] == '.'
&& path[idx + 2] == '.') {
// Ends with "..", invalid.
return 1;
}
} }
} }
return 0; return 0;

5
src/test.c
View file

@ -1004,6 +1004,11 @@ int main(int argc, char **argv) {
CHECK_TRUE(info.result == STATIC_FILE_RESULT_OK); CHECK_TRUE(info.result == STATIC_FILE_RESULT_OK);
CHECK_STREQ(info.mime_type, "application/octet-stream"); CHECK_STREQ(info.mime_type, "application/octet-stream");
c_simple_http_cleanup_static_file_info(&info); c_simple_http_cleanup_static_file_info(&info);
CHECK_TRUE(c_simple_http_static_validate_path("../derp") != 0);
CHECK_TRUE(c_simple_http_static_validate_path("./derp") == 0);
CHECK_TRUE(c_simple_http_static_validate_path("./../derp") != 0);
CHECK_TRUE(c_simple_http_static_validate_path("/derp/..") != 0);
} }
RETURN() RETURN()