You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2023/09/13 22:34:16 UTC
[trafficserver] 01/02: Don't set port number as part of hostname (#10386)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit f6df3101753ae91bd53646d565ace2bd13957b13
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Tue Sep 12 00:42:07 2023 +0900
Don't set port number as part of hostname (#10386)
* Don't set port number as part of hostname
* Initialize host_len with 0
(cherry picked from commit 943358110b061a03a84b863260c5d99f29ff9c69)
---
proxy/http/HttpSM.cc | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 66dd58c135..d63aeb1b87 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -4234,10 +4234,43 @@ HttpSM::do_remap_request(bool run_inline)
if (!t_state.unmapped_url.m_url_impl->m_ptr_host) {
MIMEField *host_field = t_state.hdr_info.client_request.field_find(MIME_FIELD_HOST, MIME_LEN_HOST);
if (host_field) {
- int host_len;
+ int host_len = 0;
const char *host_name = host_field->value_get(&host_len);
if (host_name && host_len) {
+ int port = -1;
+ // Host header can contain port number, and if it does we need to set host and port separately to unmapped_url.
+ // If header value starts with '[', the value must contain an IPv6 address, and it may contain a port number as well.
+ if (host_name[0] == '[') { // IPv6
+ host_name = host_name + 1; // Skip '['
+ host_len--;
+ // If header value ends with ']', the value must only contain an IPv6 address (no port number).
+ if (host_name[host_len - 1] == ']') { // Without port number
+ host_len--; // Exclude ']'
+ } else { // With port number
+ for (int idx = host_len - 1; idx > 0; idx--) {
+ if (host_name[idx] == ':') {
+ port = ink_atoi(host_name + idx + 1, host_len - (idx + 1));
+ host_len = idx;
+ break;
+ }
+ }
+ }
+ } else { // Anything else (Hostname or IPv4 address)
+ // If the value contains ':' where it does not have IPv6 address, there must be port number
+ if (const char *colon = static_cast<const char *>(memchr(host_name, ':', host_len));
+ colon == nullptr) { // Without port number
+ // Nothing to adjust. Entire value should be used as hostname.
+ } else { // With port number
+ port = ink_atoi(colon + 1, host_len - ((colon + 1) - host_name));
+ host_len = colon - host_name;
+ }
+ }
+
+ // Set values
t_state.unmapped_url.host_set(host_name, host_len);
+ if (port >= 0) {
+ t_state.unmapped_url.port_set(port);
+ }
}
}
}