diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-02-26 17:18:04 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-02-26 17:18:04 +0000 |
| commit | dcc9f98944e475ebf5a31b0a6a96ac1004010abe (patch) | |
| tree | a4e8e558ddb264fb20a89281701ddae18e2e735f /src/libserver/url.c | |
| parent | 02e57d35421af7d1457c974447ce8a44c9dbbcf6 (diff) | |
| download | rspamd-dcc9f98944e475ebf5a31b0a6a96ac1004010abe.tar.gz rspamd-dcc9f98944e475ebf5a31b0a6a96ac1004010abe.zip | |
Fixes to the url parser.
Diffstat (limited to 'src/libserver/url.c')
| -rw-r--r-- | src/libserver/url.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/libserver/url.c b/src/libserver/url.c index 87d235966..0f2ea10a8 100644 --- a/src/libserver/url.c +++ b/src/libserver/url.c @@ -1073,6 +1073,17 @@ rspamd_web_parse (struct http_parser_url *u, const gchar *str, gsize len, st = parse_semicolon; SET_U (u, UF_SCHEMA); } + else if (!g_ascii_isalnum (t) && t != '+' && t != '-') { + if (!strict && p > c) { + /* We might have some domain, but no protocol */ + st = parse_domain; + p = c; + break; + } + else { + goto out; + } + } p ++; break; case parse_semicolon: @@ -1174,7 +1185,12 @@ rspamd_web_parse (struct http_parser_url *u, const gchar *str, gsize len, if (!g_unichar_isalnum (uc)) { /* Bad symbol */ - goto out; + if (strict) { + goto out; + } + else { + goto set; + } } p = g_utf8_next_char (p); @@ -1831,7 +1847,7 @@ rspamd_url_find (rspamd_mempool_t *pool, m.add_prefix = FALSE; if (matcher->start (begin, end, pos, &m) && matcher->end (begin, end, pos, &m)) { - if (m.add_prefix) { + if (m.add_prefix || matcher->prefix[0] != '\0') { l = m.m_len + 1 + strlen (m.prefix); *url_str = rspamd_mempool_alloc (pool, l); rspamd_snprintf (*url_str, |