{
try {
- LOCAL_ARRAY(char, login, MAX_URL);
- LOCAL_ARRAY(char, foundHost, MAX_URL);
- LOCAL_ARRAY(char, urlpath, MAX_URL);
- char *t = NULL;
- char *q = NULL;
- int foundPort;
- int l;
- int i;
- const char *src;
- char *dst;
- foundHost[0] = urlpath[0] = login[0] = '\0';
-
- if ((l = rawUrl.length()) + Config.appendDomainLen > (MAX_URL - 1)) {
- debugs(23, DBG_IMPORTANT, MYNAME << "URL too large (" << l << " bytes)");
- return false;
- }
+ LOCAL_ARRAY(char, login, MAX_URL);
+ LOCAL_ARRAY(char, foundHost, MAX_URL);
+ LOCAL_ARRAY(char, urlpath, MAX_URL);
+ char *t = NULL;
+ char *q = NULL;
+ int foundPort;
+ int l;
+ int i;
+ const char *src;
+ char *dst;
+ foundHost[0] = urlpath[0] = login[0] = '\0';
+
+ if ((l = rawUrl.length()) + Config.appendDomainLen > (MAX_URL - 1)) {
+ debugs(23, DBG_IMPORTANT, MYNAME << "URL too large (" << l << " bytes)");
+ return false;
+ }
- if ((method == Http::METHOD_OPTIONS || method == Http::METHOD_TRACE) &&
- Asterisk().cmp(rawUrl) == 0) {
- // XXX: these methods might also occur in HTTPS traffic. Handle this better.
- setScheme(AnyP::PROTO_HTTP, nullptr);
- port(getScheme().defaultPort());
- path(Asterisk());
- return true;
- }
+ if ((method == Http::METHOD_OPTIONS || method == Http::METHOD_TRACE) &&
+ Asterisk().cmp(rawUrl) == 0) {
+ // XXX: these methods might also occur in HTTPS traffic. Handle this better.
+ setScheme(AnyP::PROTO_HTTP, nullptr);
+ port(getScheme().defaultPort());
+ path(Asterisk());
+ return true;
+ }
- Parser::Tokenizer tok(rawUrl);
- AnyP::UriScheme scheme;
+ Parser::Tokenizer tok(rawUrl);
+ AnyP::UriScheme scheme;
- if (method == Http::METHOD_CONNECT) {
- /*
- * RFC 7230 section 5.3.3: authority-form = authority
- * "excluding any userinfo and its "@" delimiter"
- *
- * RFC 3986 section 3.2: authority = [ userinfo "@" ] host [ ":" port ]
- *
- * As an HTTP(S) proxy we assume HTTPS (443) if no port provided.
- */
- foundPort = 443;
-
- // XXX: use tokenizer
- auto B = tok.buf();
- const char *url = B.c_str();
-
- if (sscanf(url, "[%[^]]]:%d", foundHost, &foundPort) < 1)
- if (sscanf(url, "%[^:]:%d", foundHost, &foundPort) < 1)
- return false;
+ if (method == Http::METHOD_CONNECT) {
+ /*
+ * RFC 7230 section 5.3.3: authority-form = authority
+ * "excluding any userinfo and its "@" delimiter"
+ *
+ * RFC 3986 section 3.2: authority = [ userinfo "@" ] host [ ":" port ]
+ *
+ * As an HTTP(S) proxy we assume HTTPS (443) if no port provided.
+ */
+ foundPort = 443;
- } else {
+ // XXX: use tokenizer
+ auto B = tok.buf();
+ const char *url = B.c_str();
- scheme = uriParseScheme(tok);
+ if (sscanf(url, "[%[^]]]:%d", foundHost, &foundPort) < 1)
+ if (sscanf(url, "%[^:]:%d", foundHost, &foundPort) < 1)
+ return false;
- if (scheme == AnyP::PROTO_NONE)
- return false; // invalid scheme
+ } else {
- if (scheme == AnyP::PROTO_URN) {
- parseUrn(tok); // throws on any error
- return true;
- }
+ scheme = uriParseScheme(tok);
- // URLs then have "//"
- static const SBuf doubleSlash("//");
- if (!tok.skip(doubleSlash))
- return false;
+ if (scheme == AnyP::PROTO_NONE)
+ return false; // invalid scheme
- auto B = tok.remaining();
- const char *url = B.c_str();
+ if (scheme == AnyP::PROTO_URN) {
+ parseUrn(tok); // throws on any error
+ return true;
+ }
- /* Parse the URL: */
- src = url;
- i = 0;
+ // URLs then have "//"
+ static const SBuf doubleSlash("//");
+ if (!tok.skip(doubleSlash))
+ return false;
- /* Then everything until first /; thats host (and port; which we'll look for here later) */
- // bug 1881: If we don't get a "/" then we imply it was there
- // bug 3074: We could just be given a "?" or "#". These also imply "/"
- // bug 3233: whitespace is also a hostname delimiter.
- for (dst = foundHost; i < l && *src != '/' && *src != '?' && *src != '#' && *src != '\0' && !xisspace(*src); ++i, ++src, ++dst) {
- *dst = *src;
- }
+ auto B = tok.remaining();
+ const char *url = B.c_str();
- /*
- * We can't check for "i >= l" here because we could be at the end of the line
- * and have a perfectly valid URL w/ no trailing '/'. In this case we assume we've
- * been -given- a valid URL and the path is just '/'.
- */
- if (i > l)
- return false;
- *dst = '\0';
+ /* Parse the URL: */
+ src = url;
+ i = 0;
- // bug 3074: received 'path' starting with '?', '#', or '\0' implies '/'
- if (*src == '?' || *src == '#' || *src == '\0') {
- urlpath[0] = '/';
- dst = &urlpath[1];
- } else {
- dst = urlpath;
- }
- /* Then everything from / (inclusive) until \r\n or \0 - thats urlpath */
- for (; i < l && *src != '\r' && *src != '\n' && *src != '\0'; ++i, ++src, ++dst) {
- *dst = *src;
- }
+ /* Then everything until first /; thats host (and port; which we'll look for here later) */
+ // bug 1881: If we don't get a "/" then we imply it was there
+ // bug 3074: We could just be given a "?" or "#". These also imply "/"
+ // bug 3233: whitespace is also a hostname delimiter.
+ for (dst = foundHost; i < l && *src != '/' && *src != '?' && *src != '#' && *src != '\0' && !xisspace(*src); ++i, ++src, ++dst) {
+ *dst = *src;
+ }
- /* We -could- be at the end of the buffer here */
- if (i > l)
- return false;
- /* If the URL path is empty we set it to be "/" */
- if (dst == urlpath) {
- *dst = '/';
- ++dst;
- }
- *dst = '\0';
-
- foundPort = scheme.defaultPort(); // may be reset later
-
- /* Is there any login information? (we should eventually parse it above) */
- t = strrchr(foundHost, '@');
- if (t != NULL) {
- strncpy((char *) login, (char *) foundHost, sizeof(login)-1);
- login[sizeof(login)-1] = '\0';
- t = strrchr(login, '@');
- *t = 0;
- strncpy((char *) foundHost, t + 1, sizeof(foundHost)-1);
- foundHost[sizeof(foundHost)-1] = '\0';
- // Bug 4498: URL-unescape the login info after extraction
- rfc1738_unescape(login);
- }
+ /*
+ * We can't check for "i >= l" here because we could be at the end of the line
+ * and have a perfectly valid URL w/ no trailing '/'. In this case we assume we've
+ * been -given- a valid URL and the path is just '/'.
+ */
+ if (i > l)
+ return false;
+ *dst = '\0';
- /* Is there any host information? (we should eventually parse it above) */
- if (*foundHost == '[') {
- /* strip any IPA brackets. valid under IPv6. */
- dst = foundHost;
- /* only for IPv6 sadly, pre-IPv6/URL code can't handle the clean result properly anyway. */
- src = foundHost;
- ++src;
- l = strlen(foundHost);
- i = 1;
- for (; i < l && *src != ']' && *src != '\0'; ++i, ++src, ++dst) {
+ // bug 3074: received 'path' starting with '?', '#', or '\0' implies '/'
+ if (*src == '?' || *src == '#' || *src == '\0') {
+ urlpath[0] = '/';
+ dst = &urlpath[1];
+ } else {
+ dst = urlpath;
+ }
+ /* Then everything from / (inclusive) until \r\n or \0 - thats urlpath */
+ for (; i < l && *src != '\r' && *src != '\n' && *src != '\0'; ++i, ++src, ++dst) {
*dst = *src;
}
- /* we moved in-place, so truncate the actual hostname found */
+ /* We -could- be at the end of the buffer here */
+ if (i > l)
+ return false;
+ /* If the URL path is empty we set it to be "/" */
+ if (dst == urlpath) {
+ *dst = '/';
+ ++dst;
+ }
*dst = '\0';
- ++dst;
- /* skip ahead to either start of port, or original EOS */
- while (*dst != '\0' && *dst != ':')
+ foundPort = scheme.defaultPort(); // may be reset later
+
+ /* Is there any login information? (we should eventually parse it above) */
+ t = strrchr(foundHost, '@');
+ if (t != NULL) {
+ strncpy((char *) login, (char *) foundHost, sizeof(login)-1);
+ login[sizeof(login)-1] = '\0';
+ t = strrchr(login, '@');
+ *t = 0;
+ strncpy((char *) foundHost, t + 1, sizeof(foundHost)-1);
+ foundHost[sizeof(foundHost)-1] = '\0';
+ // Bug 4498: URL-unescape the login info after extraction
+ rfc1738_unescape(login);
+ }
+
+ /* Is there any host information? (we should eventually parse it above) */
+ if (*foundHost == '[') {
+ /* strip any IPA brackets. valid under IPv6. */
+ dst = foundHost;
+ /* only for IPv6 sadly, pre-IPv6/URL code can't handle the clean result properly anyway. */
+ src = foundHost;
+ ++src;
+ l = strlen(foundHost);
+ i = 1;
+ for (; i < l && *src != ']' && *src != '\0'; ++i, ++src, ++dst) {
+ *dst = *src;
+ }
+
+ /* we moved in-place, so truncate the actual hostname found */
+ *dst = '\0';
++dst;
- t = dst;
- } else {
- t = strrchr(foundHost, ':');
- if (t != strchr(foundHost,':') ) {
- /* RFC 2732 states IPv6 "SHOULD" be bracketed. allowing for times when its not. */
- /* RFC 3986 'update' simply modifies this to an "is" with no emphasis at all! */
- /* therefore we MUST accept the case where they are not bracketed at all. */
- t = NULL;
+ /* skip ahead to either start of port, or original EOS */
+ while (*dst != '\0' && *dst != ':')
+ ++dst;
+ t = dst;
+ } else {
+ t = strrchr(foundHost, ':');
+
+ if (t != strchr(foundHost,':') ) {
+ /* RFC 2732 states IPv6 "SHOULD" be bracketed. allowing for times when its not. */
+ /* RFC 3986 'update' simply modifies this to an "is" with no emphasis at all! */
+ /* therefore we MUST accept the case where they are not bracketed at all. */
+ t = NULL;
+ }
}
- }
- // Bug 3183 sanity check: If scheme is present, host must be too.
- if (scheme != AnyP::PROTO_NONE && foundHost[0] == '\0') {
- debugs(23, DBG_IMPORTANT, "SECURITY ALERT: Missing hostname in URL '" << url << "'. see access.log for details.");
- return false;
- }
+ // Bug 3183 sanity check: If scheme is present, host must be too.
+ if (scheme != AnyP::PROTO_NONE && foundHost[0] == '\0') {
+ debugs(23, DBG_IMPORTANT, "SECURITY ALERT: Missing hostname in URL '" << url << "'. see access.log for details.");
+ return false;
+ }
- if (t && *t == ':') {
- *t = '\0';
- ++t;
- foundPort = atoi(t);
+ if (t && *t == ':') {
+ *t = '\0';
+ ++t;
+ foundPort = atoi(t);
+ }
}
- }
- for (t = foundHost; *t; ++t)
- *t = xtolower(*t);
-
- if (stringHasWhitespace(foundHost)) {
- if (URI_WHITESPACE_STRIP == Config.uri_whitespace) {
- t = q = foundHost;
- while (*t) {
- if (!xisspace(*t)) {
- *q = *t;
- ++q;
+ for (t = foundHost; *t; ++t)
+ *t = xtolower(*t);
+
+ if (stringHasWhitespace(foundHost)) {
+ if (URI_WHITESPACE_STRIP == Config.uri_whitespace) {
+ t = q = foundHost;
+ while (*t) {
+ if (!xisspace(*t)) {
+ *q = *t;
+ ++q;
+ }
+ ++t;
}
- ++t;
+ *q = '\0';
}
- *q = '\0';
}
- }
- debugs(23, 3, "Split URL '" << rawUrl << "' into proto='" << scheme.image() << "', host='" << foundHost << "', port='" << foundPort << "', path='" << urlpath << "'");
+ debugs(23, 3, "Split URL '" << rawUrl << "' into proto='" << scheme.image() << "', host='" << foundHost << "', port='" << foundPort << "', path='" << urlpath << "'");
- if (Config.onoff.check_hostnames &&
- strspn(foundHost, Config.onoff.allow_underscore ? valid_hostname_chars_u : valid_hostname_chars) != strlen(foundHost)) {
- debugs(23, DBG_IMPORTANT, MYNAME << "Illegal character in hostname '" << foundHost << "'");
- return false;
- }
+ if (Config.onoff.check_hostnames &&
+ strspn(foundHost, Config.onoff.allow_underscore ? valid_hostname_chars_u : valid_hostname_chars) != strlen(foundHost)) {
+ debugs(23, DBG_IMPORTANT, MYNAME << "Illegal character in hostname '" << foundHost << "'");
+ return false;
+ }
- if (!urlAppendDomain(foundHost))
- return false;
+ if (!urlAppendDomain(foundHost))
+ return false;
- /* remove trailing dots from hostnames */
- while ((l = strlen(foundHost)) > 0 && foundHost[--l] == '.')
- foundHost[l] = '\0';
+ /* remove trailing dots from hostnames */
+ while ((l = strlen(foundHost)) > 0 && foundHost[--l] == '.')
+ foundHost[l] = '\0';
- /* reject duplicate or leading dots */
- if (strstr(foundHost, "..") || *foundHost == '.') {
- debugs(23, DBG_IMPORTANT, MYNAME << "Illegal hostname '" << foundHost << "'");
- return false;
- }
+ /* reject duplicate or leading dots */
+ if (strstr(foundHost, "..") || *foundHost == '.') {
+ debugs(23, DBG_IMPORTANT, MYNAME << "Illegal hostname '" << foundHost << "'");
+ return false;
+ }
- if (foundPort < 1 || foundPort > 65535) {
- debugs(23, 3, "Invalid port '" << foundPort << "'");
- return false;
- }
+ if (foundPort < 1 || foundPort > 65535) {
+ debugs(23, 3, "Invalid port '" << foundPort << "'");
+ return false;
+ }
#if HARDCODE_DENY_PORTS
- /* These ports are filtered in the default squid.conf, but
- * maybe someone wants them hardcoded... */
- if (foundPort == 7 || foundPort == 9 || foundPort == 19) {
- debugs(23, DBG_CRITICAL, MYNAME << "Deny access to port " << foundPort);
- return false;
- }
+ /* These ports are filtered in the default squid.conf, but
+ * maybe someone wants them hardcoded... */
+ if (foundPort == 7 || foundPort == 9 || foundPort == 19) {
+ debugs(23, DBG_CRITICAL, MYNAME << "Deny access to port " << foundPort);
+ return false;
+ }
#endif
- if (stringHasWhitespace(urlpath)) {
- debugs(23, 2, "URI has whitespace: {" << rawUrl << "}");
+ if (stringHasWhitespace(urlpath)) {
+ debugs(23, 2, "URI has whitespace: {" << rawUrl << "}");
- switch (Config.uri_whitespace) {
+ switch (Config.uri_whitespace) {
- case URI_WHITESPACE_DENY:
- return false;
+ case URI_WHITESPACE_DENY:
+ return false;
- case URI_WHITESPACE_ALLOW:
- break;
-
- case URI_WHITESPACE_ENCODE:
- t = rfc1738_escape_unescaped(urlpath);
- xstrncpy(urlpath, t, MAX_URL);
- break;
-
- case URI_WHITESPACE_CHOP:
- *(urlpath + strcspn(urlpath, w_space)) = '\0';
- break;
-
- case URI_WHITESPACE_STRIP:
- default:
- t = q = urlpath;
- while (*t) {
- if (!xisspace(*t)) {
- *q = *t;
- ++q;
+ case URI_WHITESPACE_ALLOW:
+ break;
+
+ case URI_WHITESPACE_ENCODE:
+ t = rfc1738_escape_unescaped(urlpath);
+ xstrncpy(urlpath, t, MAX_URL);
+ break;
+
+ case URI_WHITESPACE_CHOP:
+ *(urlpath + strcspn(urlpath, w_space)) = '\0';
+ break;
+
+ case URI_WHITESPACE_STRIP:
+ default:
+ t = q = urlpath;
+ while (*t) {
+ if (!xisspace(*t)) {
+ *q = *t;
+ ++q;
+ }
+ ++t;
}
- ++t;
+ *q = '\0';
}
- *q = '\0';
}
- }
- setScheme(scheme);
- path(urlpath);
- host(foundHost);
- userInfo(SBuf(login));
- port(foundPort);
- return true;
+ setScheme(scheme);
+ path(urlpath);
+ host(foundHost);
+ userInfo(SBuf(login));
+ port(foundPort);
+ return true;
} catch (...) {
debugs(23, 2, "error: " << CurrentException << " " << Raw("rawUrl", rawUrl.rawContent(), rawUrl.length()));
projects / thirdparty / squid.git / commitdiff
