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

backport: remove extra '/' in URI, config changes
All checks were successful
Run Unit Tests / build-and-run-unit-tests (push) Successful in 7s
Details

Browse source
This commit is contained in:
Stephen Seo 2024-09-24 14:53:28 +09:00
parent 570da15dab
commit f22a523b45
3 changed files with 111 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
example_config/example.config
View file

@ -38,3 +38,39 @@ HTML_FILE='''example_config/inner.html'''
VAR_FILE='''example_config/var.html''' VAR_FILE='''example_config/var.html'''
PATH=/error PATH=/error
PATH=/inner/further
HTML='''
<html>
<head>
<style>
body {
color: #FFF;
background-color: #333;
}
a {
color: #AAF;
}
a:link {
color: #AAF;
}
a:visited {
color: #88B;
}
a:focus a:hover {
color: #DDF;
}
a:active {
color: #FFF;
}
</style>
</head>
<body>
<h1>Nested inner: further<h1>
{{{VAR}}}
<br>
<a href="/inner">back</a>
</body>
</html>
'''
VAR='''yep'''

3
example_config/inner.html
View file

@ -28,6 +28,7 @@
{{{VAR_FILE}}} {{{VAR_FILE}}}
<br> <br>
<a href="..">Back.</a> <a href="/inner/further">further</a><br>
<a href="/">Back.</a>
</body> </body>
</html> </html>

73
src/http.c
View file

@ -200,6 +200,14 @@ char *c_simple_http_request_response(
} }
char *c_simple_http_strip_path(const char *path, size_t path_size) { char *c_simple_http_strip_path(const char *path, size_t path_size) {
if (path_size == 1 && path[0] == '/') {
// Edge case: root path.
char *buf = malloc(2);
buf[0] = '/';
buf[1] = 0;
return buf;
}
size_t idx = 0; size_t idx = 0;
for (; idx < path_size && path[idx] != 0; ++idx) { for (; idx < path_size && path[idx] != 0; ++idx) {
if (path[idx] == '?' || path[idx] == '#') { if (path[idx] == '?' || path[idx] == '#') {
@ -211,7 +219,72 @@ char *c_simple_http_strip_path(const char *path, size_t path_size) {
memcpy(stripped_path, path, idx); memcpy(stripped_path, path, idx);
stripped_path[idx] = 0; stripped_path[idx] = 0;
// Strip multiple '/' into one.
__attribute((cleanup(simple_archiver_list_free)))
SDArchiverLinkedList *parts = simple_archiver_list_init();
idx = 0;
size_t prev_idx = 0;
size_t size;
char *buf;
uint_fast8_t slash_visited = 0;
for (; stripped_path[idx] != 0; ++idx) {
if (stripped_path[idx] == '/') {
if (slash_visited) {
// Intentionally left blank.
} else {
slash_visited = 1;
if (idx > prev_idx) {
size = idx - prev_idx + 1;
buf = malloc(size);
memcpy(buf, stripped_path + prev_idx, size - 1);
buf[size - 1] = 0;
c_simple_http_add_string_part(parts, buf, 0);
free(buf);
}
}
} else {
if (slash_visited) {
buf = malloc(2);
buf[0] = '/';
buf[1] = 0;
c_simple_http_add_string_part(parts, buf, 0);
free(buf);
prev_idx = idx;
}
slash_visited = 0;
}
}
if (!slash_visited && idx > prev_idx) {
size = idx - prev_idx + 1;
buf = malloc(size);
memcpy(buf, stripped_path + prev_idx, size - 1);
buf[size - 1] = 0;
c_simple_http_add_string_part(parts, buf, 0);
free(buf);
} else if (slash_visited && prev_idx == 0) {
buf = malloc(2);
buf[0] = '/';
buf[1] = 0;
c_simple_http_add_string_part(parts, buf, 0);
free(buf);
}
free(stripped_path);
stripped_path = c_simple_http_combine_string_parts(parts);
// Strip trailing '/'. // Strip trailing '/'.
idx = strlen(stripped_path);
while (idx-- > 1) { while (idx-- > 1) {
if (stripped_path[idx] == '/' || stripped_path[idx] == 0) { if (stripped_path[idx] == '/' || stripped_path[idx] == 0) {
stripped_path[idx] = 0; stripped_path[idx] = 0;