From 0c41c19cbf71f918625f218349fe5afa75c297f8 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 10 Aug 2020 14:54:50 -0700 Subject: [PATCH] fixup! nghttp2-based HTTP client with DoH support --- COPYRIGHT | 22 + lib/isc/include/isc/netmgr.h | 4 + lib/isc/netmgr/http.c | 2 +- lib/isc/netmgr/url-parser/url_parser.c | 999 +++++++++++++------------ lib/isc/netmgr/url-parser/url_parser.h | 62 +- util/copyrights | 3 + 6 files changed, 589 insertions(+), 503 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 7dbab935d5..9169f25bd9 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -367,3 +367,25 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------- + +Copyright Joyent, Inc. and other Node contributors. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +IN THE SOFTWARE. diff --git a/lib/isc/include/isc/netmgr.h b/lib/isc/include/isc/netmgr.h index d6dbea6148..10dfb108d6 100644 --- a/lib/isc/include/isc/netmgr.h +++ b/lib/isc/include/isc/netmgr.h @@ -429,3 +429,7 @@ isc_nm_tlsdnsconnect(isc_nm_t *mgr, isc_nmiface_t *local, isc_nmiface_t *peer, /*% * Establish a DNS client connection over either a TCP or a TLS socket. */ + +isc_result_t +isc_nm_doh_request(isc_nm_t *mgr, const char *uri, isc_region_t *message, + isc_nm_recv_cb_t cb, void *cbarg, SSL_CTX *ctx); diff --git a/lib/isc/netmgr/http.c b/lib/isc/netmgr/http.c index 5efcea967b..b23e551d98 100644 --- a/lib/isc/netmgr/http.c +++ b/lib/isc/netmgr/http.c @@ -225,7 +225,7 @@ static int on_stream_close_callback(nghttp2_session *ngsession, int32_t stream_id, uint32_t error_code, void *user_data) { UNUSED(error_code); - + http2_session *session = (http2_session *)user_data; int rv; if (session->stream->stream_id == stream_id) { diff --git a/lib/isc/netmgr/url-parser/url_parser.c b/lib/isc/netmgr/url-parser/url_parser.c index 92b8cf94c5..cd0e6473f6 100644 --- a/lib/isc/netmgr/url-parser/url_parser.c +++ b/lib/isc/netmgr/url-parser/url_parser.c @@ -1,4 +1,16 @@ -/* Copyright Joyent, Inc. and other Node contributors. +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +/* + * Copyright Joyent, Inc. and other Node contributors. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -18,186 +30,211 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ + #include "url_parser.h" #include -#include #include -#include #include +#include +#include #ifndef BIT_AT -# define BIT_AT(a, i) \ - (!!((unsigned int) (a)[(unsigned int) (i) >> 3] & \ - (1 << ((unsigned int) (i) & 7)))) +#define BIT_AT(a, i) \ + (!!((unsigned int)(a)[(unsigned int)(i) >> 3] & \ + (1 << ((unsigned int)(i)&7)))) #endif #if HTTP_PARSER_STRICT -# define T(v) 0 +#define T(v) 0 #else -# define T(v) v +#define T(v) v #endif static const uint8_t normal_url_char[32] = { -/* 0 nul 1 soh 2 stx 3 etx 4 eot 5 enq 6 ack 7 bel */ - 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0, -/* 8 bs 9 ht 10 nl 11 vt 12 np 13 cr 14 so 15 si */ - 0 | T(2) | 0 | 0 | T(16) | 0 | 0 | 0, -/* 16 dle 17 dc1 18 dc2 19 dc3 20 dc4 21 nak 22 syn 23 etb */ - 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0, -/* 24 can 25 em 26 sub 27 esc 28 fs 29 gs 30 rs 31 us */ - 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0, -/* 32 sp 33 ! 34 " 35 # 36 $ 37 % 38 & 39 ' */ - 0 | 2 | 4 | 0 | 16 | 32 | 64 | 128, -/* 40 ( 41 ) 42 * 43 + 44 , 45 - 46 . 47 / */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 48 0 49 1 50 2 51 3 52 4 53 5 54 6 55 7 */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 56 8 57 9 58 : 59 ; 60 < 61 = 62 > 63 ? */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 0, -/* 64 @ 65 A 66 B 67 C 68 D 69 E 70 F 71 G */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 72 H 73 I 74 J 75 K 76 L 77 M 78 N 79 O */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 80 P 81 Q 82 R 83 S 84 T 85 U 86 V 87 W */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 88 X 89 Y 90 Z 91 [ 92 \ 93 ] 94 ^ 95 _ */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 96 ` 97 a 98 b 99 c 100 d 101 e 102 f 103 g */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 104 h 105 i 106 j 107 k 108 l 109 m 110 n 111 o */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 112 p 113 q 114 r 115 s 116 t 117 u 118 v 119 w */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 120 x 121 y 122 z 123 { 124 | 125 } 126 ~ 127 del */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 0, }; + /* 0 nul 1 soh 2 stx 3 etx 4 eot 5 enq 6 ack 7 + bel */ + 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0, + /* 8 bs 9 ht 10 nl 11 vt 12 np 13 cr 14 so 15 si + */ + 0 | T(2) | 0 | 0 | T(16) | 0 | 0 | 0, + /* 16 dle 17 dc1 18 dc2 19 dc3 20 dc4 21 nak 22 syn 23 + etb */ + 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0, + /* 24 can 25 em 26 sub 27 esc 28 fs 29 gs 30 rs 31 us + */ + 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0, + /* 32 sp 33 ! 34 " 35 # 36 $ 37 % 38 & 39 ' + */ + 0 | 2 | 4 | 0 | 16 | 32 | 64 | 128, + /* 40 ( 41 ) 42 * 43 + 44 , 45 - 46 . 47 / + */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + /* 48 0 49 1 50 2 51 3 52 4 53 5 54 6 55 7 + */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + /* 56 8 57 9 58 : 59 ; 60 < 61 = 62 > 63 ? + */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 0, + /* 64 @ 65 A 66 B 67 C 68 D 69 E 70 F 71 G + */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + /* 72 H 73 I 74 J 75 K 76 L 77 M 78 N 79 O + */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + /* 80 P 81 Q 82 R 83 S 84 T 85 U 86 V 87 W + */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + /* 88 X 89 Y 90 Z 91 [ 92 \ 93 ] 94 ^ 95 _ + */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + /* 96 ` 97 a 98 b 99 c 100 d 101 e 102 f 103 g + */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + /* 104 h 105 i 106 j 107 k 108 l 109 m 110 n 111 o + */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + /* 112 p 113 q 114 r 115 s 116 t 117 u 118 v 119 w + */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + /* 120 x 121 y 122 z 123 { 124 | 125 } 126 ~ 127 + del */ + 1 | 2 | 4 | 8 | 16 | 32 | 64 | 0, +}; #undef T -enum state - { s_dead = 1 /* important that this is > 0 */ +enum state { + s_dead = 1 /* important that this is > 0 */ - , s_start_req_or_res - , s_res_or_resp_H - , s_start_res - , s_res_H - , s_res_HT - , s_res_HTT - , s_res_HTTP - , s_res_http_major - , s_res_http_dot - , s_res_http_minor - , s_res_http_end - , s_res_first_status_code - , s_res_status_code - , s_res_status_start - , s_res_status - , s_res_line_almost_done + , + s_start_req_or_res, + s_res_or_resp_H, + s_start_res, + s_res_H, + s_res_HT, + s_res_HTT, + s_res_HTTP, + s_res_http_major, + s_res_http_dot, + s_res_http_minor, + s_res_http_end, + s_res_first_status_code, + s_res_status_code, + s_res_status_start, + s_res_status, + s_res_line_almost_done - , s_start_req + , + s_start_req - , s_req_method - , s_req_spaces_before_url - , s_req_schema - , s_req_schema_slash - , s_req_schema_slash_slash - , s_req_server_start - , s_req_server - , s_req_server_with_at - , s_req_path - , s_req_query_string_start - , s_req_query_string - , s_req_fragment_start - , s_req_fragment - , s_req_http_start - , s_req_http_H - , s_req_http_HT - , s_req_http_HTT - , s_req_http_HTTP - , s_req_http_I - , s_req_http_IC - , s_req_http_major - , s_req_http_dot - , s_req_http_minor - , s_req_http_end - , s_req_line_almost_done + , + s_req_method, + s_req_spaces_before_url, + s_req_schema, + s_req_schema_slash, + s_req_schema_slash_slash, + s_req_server_start, + s_req_server, + s_req_server_with_at, + s_req_path, + s_req_query_string_start, + s_req_query_string, + s_req_fragment_start, + s_req_fragment, + s_req_http_start, + s_req_http_H, + s_req_http_HT, + s_req_http_HTT, + s_req_http_HTTP, + s_req_http_I, + s_req_http_IC, + s_req_http_major, + s_req_http_dot, + s_req_http_minor, + s_req_http_end, + s_req_line_almost_done - , s_header_field_start - , s_header_field - , s_header_value_discard_ws - , s_header_value_discard_ws_almost_done - , s_header_value_discard_lws - , s_header_value_start - , s_header_value - , s_header_value_lws + , + s_header_field_start, + s_header_field, + s_header_value_discard_ws, + s_header_value_discard_ws_almost_done, + s_header_value_discard_lws, + s_header_value_start, + s_header_value, + s_header_value_lws - , s_header_almost_done + , + s_header_almost_done - , s_chunk_size_start - , s_chunk_size - , s_chunk_parameters - , s_chunk_size_almost_done + , + s_chunk_size_start, + s_chunk_size, + s_chunk_parameters, + s_chunk_size_almost_done - , s_headers_almost_done - , s_headers_done + , + s_headers_almost_done, + s_headers_done - /* Important: 's_headers_done' must be the last 'header' state. All - * states beyond this must be 'body' states. It is used for overflow - * checking. See the PARSING_HEADER() macro. - */ + /* Important: 's_headers_done' must be the last 'header' state. All + * states beyond this must be 'body' states. It is used for overflow + * checking. See the PARSING_HEADER() macro. + */ - , s_chunk_data - , s_chunk_data_almost_done - , s_chunk_data_done + , + s_chunk_data, + s_chunk_data_almost_done, + s_chunk_data_done - , s_body_identity - , s_body_identity_eof + , + s_body_identity, + s_body_identity_eof - , s_message_done - }; + , + s_message_done +}; -enum http_host_state - { - s_http_host_dead = 1 - , s_http_userinfo_start - , s_http_userinfo - , s_http_host_start - , s_http_host_v6_start - , s_http_host - , s_http_host_v6 - , s_http_host_v6_end - , s_http_host_v6_zone_start - , s_http_host_v6_zone - , s_http_host_port_start - , s_http_host_port +enum http_host_state { + s_http_host_dead = 1, + s_http_userinfo_start, + s_http_userinfo, + s_http_host_start, + s_http_host_v6_start, + s_http_host, + s_http_host_v6, + s_http_host_v6_end, + s_http_host_v6_zone_start, + s_http_host_v6_zone, + s_http_host_port_start, + s_http_host_port }; /* Macros for character classes; depends on strict-mode */ -#define CR '\r' -#define LF '\n' -#define LOWER(c) (unsigned char)(c | 0x20) -#define IS_ALPHA(c) (LOWER(c) >= 'a' && LOWER(c) <= 'z') -#define IS_NUM(c) ((c) >= '0' && (c) <= '9') -#define IS_ALPHANUM(c) (IS_ALPHA(c) || IS_NUM(c)) -#define IS_HEX(c) (IS_NUM(c) || (LOWER(c) >= 'a' && LOWER(c) <= 'f')) -#define IS_MARK(c) ((c) == '-' || (c) == '_' || (c) == '.' || \ - (c) == '!' || (c) == '~' || (c) == '*' || (c) == '\'' || (c) == '(' || \ - (c) == ')') -#define IS_USERINFO_CHAR(c) (IS_ALPHANUM(c) || IS_MARK(c) || (c) == '%' || \ - (c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' || \ - (c) == '$' || (c) == ',') +#define LOWER(c) (unsigned char)(c | 0x20) +#define IS_ALPHA(c) (LOWER(c) >= 'a' && LOWER(c) <= 'z') +#define IS_NUM(c) ((c) >= '0' && (c) <= '9') +#define IS_ALPHANUM(c) (IS_ALPHA(c) || IS_NUM(c)) +#define IS_HEX(c) (IS_NUM(c) || (LOWER(c) >= 'a' && LOWER(c) <= 'f')) +#define IS_MARK(c) \ + ((c) == '-' || (c) == '_' || (c) == '.' || (c) == '!' || (c) == '~' || \ + (c) == '*' || (c) == '\'' || (c) == '(' || (c) == ')') +#define IS_USERINFO_CHAR(c) \ + (IS_ALPHANUM(c) || IS_MARK(c) || (c) == '%' || (c) == ';' || \ + (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' || (c) == '$' || \ + (c) == ',') -#define STRICT_TOKEN(c) ((c == ' ') ? 0 : tokens[(unsigned char)c]) +#define STRICT_TOKEN(c) ((c == ' ') ? 0 : tokens[(unsigned char)c]) #if HTTP_PARSER_STRICT -#define TOKEN(c) STRICT_TOKEN(c) -#define IS_URL_CHAR(c) (BIT_AT(normal_url_char, (unsigned char)c)) -#define IS_HOST_CHAR(c) (IS_ALPHANUM(c) || (c) == '.' || (c) == '-') +#define TOKEN(c) STRICT_TOKEN(c) +#define IS_URL_CHAR(c) (BIT_AT(normal_url_char, (unsigned char)c)) +#define IS_HOST_CHAR(c) (IS_ALPHANUM(c) || (c) == '.' || (c) == '-') #else -#define TOKEN(c) tokens[(unsigned char)c] -#define IS_URL_CHAR(c) \ - (BIT_AT(normal_url_char, (unsigned char)c) || ((c) & 0x80)) -#define IS_HOST_CHAR(c) \ - (IS_ALPHANUM(c) || (c) == '.' || (c) == '-' || (c) == '_') +#define TOKEN(c) tokens[(unsigned char)c] +#define IS_URL_CHAR(c) (BIT_AT(normal_url_char, (unsigned char)c) || ((c)&0x80)) +#define IS_HOST_CHAR(c) \ + (IS_ALPHANUM(c) || (c) == '.' || (c) == '-' || (c) == '_') #endif /* Our URL parser. @@ -212,441 +249,447 @@ enum http_host_state * URL and non-URL states by looking for these. */ static enum state -parse_url_char(enum state s, const char ch) -{ - if (ch == ' ' || ch == '\r' || ch == '\n') { - return s_dead; - } +parse_url_char(enum state s, const char ch) { + if (ch == ' ' || ch == '\r' || ch == '\n') { + return s_dead; + } #if HTTP_PARSER_STRICT - if (ch == '\t' || ch == '\f') { - return s_dead; - } + if (ch == '\t' || ch == '\f') { + return s_dead; + } #endif - switch (s) { - case s_req_spaces_before_url: - /* Proxied requests are followed by scheme of an absolute URI (alpha). - * All methods except CONNECT are followed by '/' or '*'. - */ + switch (s) { + case s_req_spaces_before_url: + /* Proxied requests are followed by scheme of an absolute URI + * (alpha). All methods except CONNECT are followed by '/' or + * '*'. + */ - if (ch == '/' || ch == '*') { - return s_req_path; - } + if (ch == '/' || ch == '*') { + return s_req_path; + } - if (IS_ALPHA(ch)) { - return s_req_schema; - } + if (IS_ALPHA(ch)) { + return s_req_schema; + } - break; + break; - case s_req_schema: - if (IS_ALPHA(ch)) { - return s; - } + case s_req_schema: + if (IS_ALPHA(ch)) { + return s; + } - if (ch == ':') { - return s_req_schema_slash; - } + if (ch == ':') { + return s_req_schema_slash; + } - break; + break; - case s_req_schema_slash: - if (ch == '/') { - return s_req_schema_slash_slash; - } + case s_req_schema_slash: + if (ch == '/') { + return s_req_schema_slash_slash; + } - break; + break; - case s_req_schema_slash_slash: - if (ch == '/') { - return s_req_server_start; - } + case s_req_schema_slash_slash: + if (ch == '/') { + return s_req_server_start; + } - break; + break; - case s_req_server_with_at: - if (ch == '@') { - return s_dead; - } + case s_req_server_with_at: + if (ch == '@') { + return s_dead; + } - /* fall through */ - case s_req_server_start: - case s_req_server: - if (ch == '/') { - return s_req_path; - } + /* fall through */ + case s_req_server_start: + case s_req_server: + if (ch == '/') { + return s_req_path; + } - if (ch == '?') { - return s_req_query_string_start; - } + if (ch == '?') { + return s_req_query_string_start; + } - if (ch == '@') { - return s_req_server_with_at; - } + if (ch == '@') { + return s_req_server_with_at; + } - if (IS_USERINFO_CHAR(ch) || ch == '[' || ch == ']') { - return s_req_server; - } + if (IS_USERINFO_CHAR(ch) || ch == '[' || ch == ']') { + return s_req_server; + } - break; + break; - case s_req_path: - if (IS_URL_CHAR(ch)) { - return s; - } + case s_req_path: + if (IS_URL_CHAR(ch)) { + return s; + } - switch (ch) { - case '?': - return s_req_query_string_start; + switch (ch) { + case '?': + return s_req_query_string_start; - case '#': - return s_req_fragment_start; - } + case '#': + return s_req_fragment_start; + } - break; + break; - case s_req_query_string_start: - case s_req_query_string: - if (IS_URL_CHAR(ch)) { - return s_req_query_string; - } + case s_req_query_string_start: + case s_req_query_string: + if (IS_URL_CHAR(ch)) { + return s_req_query_string; + } - switch (ch) { - case '?': - /* allow extra '?' in query string */ - return s_req_query_string; + switch (ch) { + case '?': + /* allow extra '?' in query string */ + return s_req_query_string; - case '#': - return s_req_fragment_start; - } + case '#': + return s_req_fragment_start; + } - break; + break; - case s_req_fragment_start: - if (IS_URL_CHAR(ch)) { - return s_req_fragment; - } + case s_req_fragment_start: + if (IS_URL_CHAR(ch)) { + return s_req_fragment; + } - switch (ch) { - case '?': - return s_req_fragment; + switch (ch) { + case '?': + return s_req_fragment; - case '#': - return s; - } + case '#': + return s; + } - break; + break; - case s_req_fragment: - if (IS_URL_CHAR(ch)) { - return s; - } + case s_req_fragment: + if (IS_URL_CHAR(ch)) { + return s; + } - switch (ch) { - case '?': - case '#': - return s; - } + switch (ch) { + case '?': + case '#': + return s; + } - break; + break; - default: - break; - } + default: + break; + } - /* We should never fall out of the switch above unless there's an error */ - return s_dead; + /* We should never fall out of the switch above unless there's an error + */ + return s_dead; } static enum http_host_state http_parse_host_char(enum http_host_state s, const char ch) { - switch(s) { - case s_http_userinfo: - case s_http_userinfo_start: - if (ch == '@') { - return s_http_host_start; - } + switch (s) { + case s_http_userinfo: + case s_http_userinfo_start: + if (ch == '@') { + return s_http_host_start; + } - if (IS_USERINFO_CHAR(ch)) { - return s_http_userinfo; - } - break; + if (IS_USERINFO_CHAR(ch)) { + return s_http_userinfo; + } + break; - case s_http_host_start: - if (ch == '[') { - return s_http_host_v6_start; - } + case s_http_host_start: + if (ch == '[') { + return s_http_host_v6_start; + } - if (IS_HOST_CHAR(ch)) { - return s_http_host; - } + if (IS_HOST_CHAR(ch)) { + return s_http_host; + } - break; + break; - case s_http_host: - if (IS_HOST_CHAR(ch)) { - return s_http_host; - } + case s_http_host: + if (IS_HOST_CHAR(ch)) { + return s_http_host; + } - /* fall through */ - case s_http_host_v6_end: - if (ch == ':') { - return s_http_host_port_start; - } + /* fall through */ + case s_http_host_v6_end: + if (ch == ':') { + return s_http_host_port_start; + } - break; + break; - case s_http_host_v6: - if (ch == ']') { - return s_http_host_v6_end; - } + case s_http_host_v6: + if (ch == ']') { + return s_http_host_v6_end; + } - /* fall through */ - case s_http_host_v6_start: - if (IS_HEX(ch) || ch == ':' || ch == '.') { - return s_http_host_v6; - } + /* fall through */ + case s_http_host_v6_start: + if (IS_HEX(ch) || ch == ':' || ch == '.') { + return s_http_host_v6; + } - if (s == s_http_host_v6 && ch == '%') { - return s_http_host_v6_zone_start; - } - break; + if (s == s_http_host_v6 && ch == '%') { + return s_http_host_v6_zone_start; + } + break; - case s_http_host_v6_zone: - if (ch == ']') { - return s_http_host_v6_end; - } + case s_http_host_v6_zone: + if (ch == ']') { + return s_http_host_v6_end; + } - /* fall through */ - case s_http_host_v6_zone_start: - /* RFC 6874 Zone ID consists of 1*( unreserved / pct-encoded) */ - if (IS_ALPHANUM(ch) || ch == '%' || ch == '.' || ch == '-' || ch == '_' || - ch == '~') { - return s_http_host_v6_zone; - } - break; + /* fall through */ + case s_http_host_v6_zone_start: + /* RFC 6874 Zone ID consists of 1*( unreserved / pct-encoded) */ + if (IS_ALPHANUM(ch) || ch == '%' || ch == '.' || ch == '-' || + ch == '_' || ch == '~') + { + return s_http_host_v6_zone; + } + break; - case s_http_host_port: - case s_http_host_port_start: - if (IS_NUM(ch)) { - return s_http_host_port; - } + case s_http_host_port: + case s_http_host_port_start: + if (IS_NUM(ch)) { + return s_http_host_port; + } - break; + break; - default: - break; - } - return s_http_host_dead; + default: + break; + } + return s_http_host_dead; } static int -http_parse_host(const char * buf, struct http_parser_url *u, int found_at) { - enum http_host_state s; +http_parse_host(const char *buf, struct http_parser_url *u, int found_at) { + enum http_host_state s; - const char *p; - size_t buflen = u->field_data[UF_HOST].off + u->field_data[UF_HOST].len; + const char *p; + size_t buflen = u->field_data[UF_HOST].off + u->field_data[UF_HOST].len; - assert(u->field_set & (1 << UF_HOST)); + assert(u->field_set & (1 << UF_HOST)); - u->field_data[UF_HOST].len = 0; + u->field_data[UF_HOST].len = 0; - s = found_at ? s_http_userinfo_start : s_http_host_start; + s = found_at ? s_http_userinfo_start : s_http_host_start; - for (p = buf + u->field_data[UF_HOST].off; p < buf + buflen; p++) { - enum http_host_state new_s = http_parse_host_char(s, *p); + for (p = buf + u->field_data[UF_HOST].off; p < buf + buflen; p++) { + enum http_host_state new_s = http_parse_host_char(s, *p); - if (new_s == s_http_host_dead) { - return 1; - } + if (new_s == s_http_host_dead) { + return 1; + } - switch(new_s) { - case s_http_host: - if (s != s_http_host) { - u->field_data[UF_HOST].off = (uint16_t)(p - buf); - } - u->field_data[UF_HOST].len++; - break; + switch (new_s) { + case s_http_host: + if (s != s_http_host) { + u->field_data[UF_HOST].off = + (uint16_t)(p - buf); + } + u->field_data[UF_HOST].len++; + break; - case s_http_host_v6: - if (s != s_http_host_v6) { - u->field_data[UF_HOST].off = (uint16_t)(p - buf); - } - u->field_data[UF_HOST].len++; - break; + case s_http_host_v6: + if (s != s_http_host_v6) { + u->field_data[UF_HOST].off = + (uint16_t)(p - buf); + } + u->field_data[UF_HOST].len++; + break; - case s_http_host_v6_zone_start: - case s_http_host_v6_zone: - u->field_data[UF_HOST].len++; - break; + case s_http_host_v6_zone_start: + case s_http_host_v6_zone: + u->field_data[UF_HOST].len++; + break; - case s_http_host_port: - if (s != s_http_host_port) { - u->field_data[UF_PORT].off = (uint16_t)(p - buf); - u->field_data[UF_PORT].len = 0; - u->field_set |= (1 << UF_PORT); - } - u->field_data[UF_PORT].len++; - break; + case s_http_host_port: + if (s != s_http_host_port) { + u->field_data[UF_PORT].off = + (uint16_t)(p - buf); + u->field_data[UF_PORT].len = 0; + u->field_set |= (1 << UF_PORT); + } + u->field_data[UF_PORT].len++; + break; - case s_http_userinfo: - if (s != s_http_userinfo) { - u->field_data[UF_USERINFO].off = (uint16_t)(p - buf); - u->field_data[UF_USERINFO].len = 0; - u->field_set |= (1 << UF_USERINFO); - } - u->field_data[UF_USERINFO].len++; - break; + case s_http_userinfo: + if (s != s_http_userinfo) { + u->field_data[UF_USERINFO].off = + (uint16_t)(p - buf); + u->field_data[UF_USERINFO].len = 0; + u->field_set |= (1 << UF_USERINFO); + } + u->field_data[UF_USERINFO].len++; + break; - default: - break; - } - s = new_s; - } + default: + break; + } + s = new_s; + } - /* Make sure we don't end somewhere unexpected */ - switch (s) { - case s_http_host_start: - case s_http_host_v6_start: - case s_http_host_v6: - case s_http_host_v6_zone_start: - case s_http_host_v6_zone: - case s_http_host_port_start: - case s_http_userinfo: - case s_http_userinfo_start: - return 1; - default: - break; - } + /* Make sure we don't end somewhere unexpected */ + switch (s) { + case s_http_host_start: + case s_http_host_v6_start: + case s_http_host_v6: + case s_http_host_v6_zone_start: + case s_http_host_v6_zone: + case s_http_host_port_start: + case s_http_userinfo: + case s_http_userinfo_start: + return 1; + default: + break; + } - return 0; + return 0; } void http_parser_url_init(struct http_parser_url *u) { - memset(u, 0, sizeof(*u)); + memset(u, 0, sizeof(*u)); } int http_parser_parse_url(const char *buf, size_t buflen, int is_connect, - struct http_parser_url *u) -{ - enum state s; - const char *p; - enum http_parser_url_fields uf, old_uf; - int found_at = 0; + struct http_parser_url *u) { + enum state s; + const char *p; + enum http_parser_url_fields uf, old_uf; + int found_at = 0; - if (buflen == 0) { - return 1; - } + if (buflen == 0) { + return 1; + } - u->port = u->field_set = 0; - s = is_connect ? s_req_server_start : s_req_spaces_before_url; - old_uf = UF_MAX; + u->port = u->field_set = 0; + s = is_connect ? s_req_server_start : s_req_spaces_before_url; + old_uf = UF_MAX; - for (p = buf; p < buf + buflen; p++) { - s = parse_url_char(s, *p); + for (p = buf; p < buf + buflen; p++) { + s = parse_url_char(s, *p); - /* Figure out the next field that we're operating on */ - switch (s) { - case s_dead: - return 1; + /* Figure out the next field that we're operating on */ + switch (s) { + case s_dead: + return 1; - /* Skip delimeters */ - case s_req_schema_slash: - case s_req_schema_slash_slash: - case s_req_server_start: - case s_req_query_string_start: - case s_req_fragment_start: - continue; + /* Skip delimeters */ + case s_req_schema_slash: + case s_req_schema_slash_slash: + case s_req_server_start: + case s_req_query_string_start: + case s_req_fragment_start: + continue; - case s_req_schema: - uf = UF_SCHEMA; - break; + case s_req_schema: + uf = UF_SCHEMA; + break; - case s_req_server_with_at: - found_at = 1; + case s_req_server_with_at: + found_at = 1; - /* fall through */ - case s_req_server: - uf = UF_HOST; - break; + /* fall through */ + case s_req_server: + uf = UF_HOST; + break; - case s_req_path: - uf = UF_PATH; - break; + case s_req_path: + uf = UF_PATH; + break; - case s_req_query_string: - uf = UF_QUERY; - break; + case s_req_query_string: + uf = UF_QUERY; + break; - case s_req_fragment: - uf = UF_FRAGMENT; - break; + case s_req_fragment: + uf = UF_FRAGMENT; + break; - default: - assert(!"Unexpected state"); - return 1; - } + default: + assert(!"Unexpected state"); + return 1; + } - /* Nothing's changed; soldier on */ - if (uf == old_uf) { - u->field_data[uf].len++; - continue; - } + /* Nothing's changed; soldier on */ + if (uf == old_uf) { + u->field_data[uf].len++; + continue; + } - u->field_data[uf].off = (uint16_t)(p - buf); - u->field_data[uf].len = 1; + u->field_data[uf].off = (uint16_t)(p - buf); + u->field_data[uf].len = 1; - u->field_set |= (1 << uf); - old_uf = uf; - } + u->field_set |= (1 << uf); + old_uf = uf; + } - /* host must be present if there is a schema */ - /* parsing http:///toto will fail */ - if ((u->field_set & (1 << UF_SCHEMA)) && - (u->field_set & (1 << UF_HOST)) == 0) { - return 1; - } + /* host must be present if there is a schema */ + /* parsing http:///toto will fail */ + if ((u->field_set & (1 << UF_SCHEMA)) && + (u->field_set & (1 << UF_HOST)) == 0) { + return 1; + } - if (u->field_set & (1 << UF_HOST)) { - if (http_parse_host(buf, u, found_at) != 0) { - return 1; - } - } + if (u->field_set & (1 << UF_HOST)) { + if (http_parse_host(buf, u, found_at) != 0) { + return 1; + } + } - /* CONNECT requests can only contain "hostname:port" */ - if (is_connect && u->field_set != ((1 << UF_HOST)|(1 << UF_PORT))) { - return 1; - } + /* CONNECT requests can only contain "hostname:port" */ + if (is_connect && u->field_set != ((1 << UF_HOST) | (1 << UF_PORT))) { + return 1; + } - if (u->field_set & (1 << UF_PORT)) { - uint16_t off; - uint16_t len; - const char* pp; - const char* end; - unsigned long v; + if (u->field_set & (1 << UF_PORT)) { + uint16_t off; + uint16_t len; + const char *pp; + const char *end; + unsigned long v; - off = u->field_data[UF_PORT].off; - len = u->field_data[UF_PORT].len; - end = buf + off + len; + off = u->field_data[UF_PORT].off; + len = u->field_data[UF_PORT].len; + end = buf + off + len; - /* NOTE: The characters are already validated and are in the [0-9] range */ - assert(off + len <= buflen && "Port number overflow"); - v = 0; - for (pp = buf + off; pp < end; p++) { - v *= 10; - v += *pp - '0'; + /* NOTE: The characters are already validated and are in the + * [0-9] range */ + assert(off + len <= buflen && "Port number overflow"); + v = 0; + for (pp = buf + off; pp < end; p++) { + v *= 10; + v += *pp - '0'; - /* Ports have a max value of 2^16 */ - if (v > 0xffff) { - return 1; - } - } + /* Ports have a max value of 2^16 */ + if (v > 0xffff) { + return 1; + } + } - u->port = (uint16_t) v; - } + u->port = (uint16_t)v; + } - return 0; + return 0; } diff --git a/lib/isc/netmgr/url-parser/url_parser.h b/lib/isc/netmgr/url-parser/url_parser.h index 78b3096c53..3ad7e4d06e 100644 --- a/lib/isc/netmgr/url-parser/url_parser.h +++ b/lib/isc/netmgr/url-parser/url_parser.h @@ -1,4 +1,16 @@ -/* Copyright Joyent, Inc. and other Node contributors. All rights reserved. +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +/* + * Copyright Joyent, Inc. and other Node contributors. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -18,6 +30,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ + #ifndef url_parser_h #define url_parser_h #ifdef __cplusplus @@ -31,7 +44,7 @@ extern "C" { #include #if defined(_WIN32) && !defined(__MINGW32__) && \ - (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__) + (!defined(_MSC_VER) || _MSC_VER < 1600) && !defined(__WINE__) #include typedef __int8 int8_t; typedef unsigned __int8 uint8_t; @@ -49,20 +62,19 @@ typedef unsigned __int64 uint64_t; * faster */ #ifndef HTTP_PARSER_STRICT -# define HTTP_PARSER_STRICT 1 +#define HTTP_PARSER_STRICT 1 #endif -enum http_parser_url_fields - { UF_SCHEMA = 0 - , UF_HOST = 1 - , UF_PORT = 2 - , UF_PATH = 3 - , UF_QUERY = 4 - , UF_FRAGMENT = 5 - , UF_USERINFO = 6 - , UF_MAX = 7 - }; - +enum http_parser_url_fields { + UF_SCHEMA = 0, + UF_HOST = 1, + UF_PORT = 2, + UF_PATH = 3, + UF_QUERY = 4, + UF_FRAGMENT = 5, + UF_USERINFO = 6, + UF_MAX = 7 +}; /* Result structure for http_parser_parse_url(). * @@ -72,22 +84,24 @@ enum http_parser_url_fields * a uint16_t. */ struct http_parser_url { - uint16_t field_set; /* Bitmask of (1 << UF_*) values */ - uint16_t port; /* Converted UF_PORT string */ + uint16_t field_set; /* Bitmask of (1 << UF_*) values */ + uint16_t port; /* Converted UF_PORT string */ - struct { - uint16_t off; /* Offset into buffer in which field starts */ - uint16_t len; /* Length of run in buffer */ - } field_data[UF_MAX]; + struct { + uint16_t off; /* Offset into buffer in which field starts */ + uint16_t len; /* Length of run in buffer */ + } field_data[UF_MAX]; }; /* Initialize all http_parser_url members to 0 */ -void http_parser_url_init(struct http_parser_url *u); +void +http_parser_url_init(struct http_parser_url *u); /* Parse a URL; return nonzero on failure */ -int http_parser_parse_url(const char *buf, size_t buflen, - int is_connect, - struct http_parser_url *u); +int +http_parser_parse_url(const char *buf, size_t buflen, int is_connect, + struct http_parser_url *u); + #ifdef __cplusplus } #endif diff --git a/util/copyrights b/util/copyrights index 04f34f5138..0284de8021 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1878,12 +1878,15 @@ ./lib/isc/mem_p.h C 2018,2019,2020 ./lib/isc/mutexblock.c C 1999,2000,2001,2004,2005,2007,2011,2012,2016,2018,2019,2020 ./lib/isc/netaddr.c C 1999,2000,2001,2002,2004,2005,2007,2010,2011,2012,2014,2015,2016,2017,2018,2019,2020 +./lib/isc/netmgr/http.c C 2020 ./lib/isc/netmgr/netmgr-int.h C 2019,2020 ./lib/isc/netmgr/netmgr.c C 2019,2020 ./lib/isc/netmgr/tcp.c C 2019,2020 ./lib/isc/netmgr/tcpdns.c C 2019,2020 ./lib/isc/netmgr/tls.c C 2020 ./lib/isc/netmgr/udp.c C 2019,2020 +./lib/isc/netmgr/url-parser/url_parser.c C 2020 +./lib/isc/netmgr/url-parser/url_parser.h C 2020 ./lib/isc/netmgr/uv-compat.c C 2020 ./lib/isc/netmgr/uv-compat.h C 2019,2020 ./lib/isc/netmgr/uverr2result.c C 2019,2020