mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-04 01:39:01 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Stricter checks for mg_url_*()

Browse Source
This commit is contained in:
cpq 2021-03-24 15:49:35 +00:00
parent 0ae5c61759
commit e9d122f231
6 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/http-client/Makefile
View File

@ -1,5 +1,7 @@
PROG ?= example
CFLAGS ?= -DMG_ENABLE_LINES $(EXTRA)
ROOT ?= $(realpath $(CURDIR)/../..)
LIN = docker run -it --rm -v $(ROOT):$(ROOT) -w $(CURDIR) mdashnet/cc2
ifneq ($(MBEDTLS),)
CFLAGS += -DMG_ENABLE_MBEDTLS=1 -I$(MBEDTLS)/include -I/usr/include
@ -14,9 +16,13 @@ endif
all: $(PROG)
$(DEBUGGER) ./$(PROG) $(ARGS)
$(PROG): main.c
$(CC) ../../mongoose.c -I../.. -W -Wall $(CFLAGS) -o $(PROG) main.c
linux: all
linux: CFLAGS += -O2 -g -fsanitize=address,undefined,shift,null,return,bounds,alignment,object-size,bool,enum -static-libasan
linux: CC = $(LIN) cc
linux: DEBUGGER = $(LIN)
clean:
rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb

2
examples/http-client/main.c
View File

@ -12,7 +12,7 @@
#include "mongoose.h"
// The very first web page in history. You can replace it from command line
static const char *s_url = "http://info.cern.ch";
static const char *s_url = "http://info.cern.ch//foo";
// Print HTTP response and signal that we're done
static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {

10
mongoose.c
View File

@ -3875,19 +3875,19 @@ static struct url urlparse(const char *url) {
struct url u;
memset(&u, 0, sizeof(u));
for (i = 0; url[i] != '\0'; i++) {
if (i > 0 && url[i - 1] == '/' && url[i] == '/') {
if (i > 0 && u.host == 0 && url[i - 1] == '/' && url[i] == '/') {
u.host = i + 1;
u.port = 0;
} else if (url[i] == ']') {
u.port = 0; // IPv6 URLs, like http://[::1]/bar
} else if (url[i] == ':') {
} else if (url[i] == ':' && u.port == 0) {
u.port = i + 1;
} else if (url[i] == '@') {
} else if (url[i] == '@' && u.user == 0 && u.pass == 0) {
u.user = u.host;
u.pass = u.port;
u.host = i + 1;
u.port = 0;
} else if (u.host && !u.uri && url[i] == '/') {
} else if (u.host && u.uri == 0 && url[i] == '/') {
u.uri = i;
}
}
@ -4283,7 +4283,7 @@ unsigned long mg_millis(void) {
#else
struct timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
return (unsigned long) ((uint64_t) ts.tv_sec * 1000 + ts.tv_nsec / 1000000);
#endif
}

8
src/url.c
View File

@ -16,19 +16,19 @@ static struct url urlparse(const char *url) {
struct url u;
memset(&u, 0, sizeof(u));
for (i = 0; url[i] != '\0'; i++) {
if (i > 0 && url[i - 1] == '/' && url[i] == '/') {
if (i > 0 && u.host == 0 && url[i - 1] == '/' && url[i] == '/') {
u.host = i + 1;
u.port = 0;
} else if (url[i] == ']') {
u.port = 0; // IPv6 URLs, like http://[::1]/bar
} else if (url[i] == ':') {
} else if (url[i] == ':' && u.port == 0) {
u.port = i + 1;
} else if (url[i] == '@') {
} else if (url[i] == '@' && u.user == 0 && u.pass == 0) {
u.user = u.host;
u.pass = u.port;
u.host = i + 1;
u.port = 0;
} else if (u.host && !u.uri && url[i] == '/') {
} else if (u.host && u.uri == 0 && url[i] == '/') {
u.uri = i;
}
}

2
src/util.c
View File

@ -332,6 +332,6 @@ unsigned long mg_millis(void) {
#else
struct timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
return (unsigned long) ((uint64_t) ts.tv_sec * 1000 + ts.tv_nsec / 1000000);
#endif
}

8
test/unit_test.c
View File

@ -113,6 +113,11 @@ static void test_url(void) {
ASSERT(vcmp(mg_url_host("p://foo"), "foo"));
ASSERT(vcmp(mg_url_host("p://foo/"), "foo"));
ASSERT(vcmp(mg_url_host("p://foo/x"), "foo"));
ASSERT(vcmp(mg_url_host("p://foo/x/"), "foo"));
ASSERT(vcmp(mg_url_host("p://foo/x//"), "foo"));
ASSERT(vcmp(mg_url_host("p://foo//x"), "foo"));
ASSERT(vcmp(mg_url_host("p://foo///x"), "foo"));
ASSERT(vcmp(mg_url_host("p://foo///x//"), "foo"));
ASSERT(vcmp(mg_url_host("p://bar:1234"), "bar"));
ASSERT(vcmp(mg_url_host("p://bar:1234/"), "bar"));
ASSERT(vcmp(mg_url_host("p://bar:1234/a"), "bar"));
@ -128,6 +133,7 @@ static void test_url(void) {
ASSERT(mg_url_port("x://foo:1234/xx") == 1234);
ASSERT(mg_url_port("x://foo:1234") == 1234);
ASSERT(mg_url_port("p://bar:1234/a") == 1234);
ASSERT(mg_url_port("p://bar:1234/a:b") == 1234);
ASSERT(mg_url_port("http://bar") == 80);
ASSERT(mg_url_port("http://localhost:1234") == 1234);
ASSERT(mg_url_port("https://bar") == 443);
@ -138,6 +144,7 @@ static void test_url(void) {
ASSERT(mg_url_port("wss://u:p@bar:123/abc") == 123);
ASSERT(mg_url_port("http://u:p@[::1]/abc") == 80);
ASSERT(mg_url_port("http://u:p@[::1]:2121/abc") == 2121);
ASSERT(mg_url_port("http://u:p@[::1]:2121/abc/cd:ef") == 2121);
// User / pass
ASSERT(vcmp(mg_url_user("p://foo"), ""));
@ -152,6 +159,7 @@ static void test_url(void) {
ASSERT(vcmp(mg_url_pass("p://:p@foo"), "p"));
ASSERT(vcmp(mg_url_user("p://u:p@foo"), "u"));
ASSERT(vcmp(mg_url_pass("p://u:p@foo"), "p"));
ASSERT(vcmp(mg_url_pass("p://u:p@foo//a@b"), "p"));
// URI
ASSERT(strcmp(mg_url_uri("p://foo"), "/") == 0);