Skip to content

ProxyProtocol: add missing proxy protocol on clear http/1.1 private session #12336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ProxyProtocol: add missing proxy protocol on clear http/1.1 private session #12336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/proxy/http/HttpSM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ class HttpSM : public Continuation, public PluginUserArgs<TS_USER_ARGS_TXN>
int state_http_server_open(int event, void *data);
int state_raw_http_server_open(int event, void *data);
int state_send_server_request_header(int event, void *data);
int state_send_server_proxy_protocol(int event, void *data);
int state_read_server_response_header(int event, void *data);

// API
Expand Down Expand Up @@ -440,6 +441,7 @@ class HttpSM : public Continuation, public PluginUserArgs<TS_USER_ARGS_TXN>
void setup_push_read_response_header();
void setup_server_read_response_header();
void setup_cache_lookup_complete_api();
void setup_server_send_proxy_protocol();
void setup_server_send_request();
void setup_server_send_request_api();
HttpTunnelProducer *setup_server_transfer();
Expand Down
1 change: 1 addition & 0 deletions include/proxy/http/HttpTransact.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@ class HttpTransact
CONTINUE,

API_SM_START,
API_SEND_PROXY_PROTOCOL,
API_READ_REQUEST_HDR,
API_TUNNEL_START,
API_PRE_REMAP,
Expand Down
3 changes: 3 additions & 0 deletions src/proxy/http/HttpDebugNames.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,9 @@ HttpDebugNames::get_action_name(HttpTransact::StateMachineAction_t e)
case HttpTransact::StateMachineAction_t::API_OS_DNS:
return ("StateMachineAction_t::API_OS_DNS");

case HttpTransact::StateMachineAction_t::API_SEND_PROXY_PROTOCOL:
return ("StateMachineAction_t::API_SEND_PROXY_PROTOCOL");

case HttpTransact::StateMachineAction_t::API_SEND_REQUEST_HDR:
return ("StateMachineAction_t::API_SEND_REQUEST_HDR");

Expand Down
85 changes: 83 additions & 2 deletions src/proxy/http/HttpSM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,6 +1585,14 @@ HttpSM::handle_api_return()
// Finished the Tunnel start callback. Go ahead and do the HandleBlindTunnel
call_transact_and_set_next_state(HttpTransact::HandleBlindTunnel);
return;

case HttpTransact::StateMachineAction_t::API_SEND_PROXY_PROTOCOL:
t_state.api_next_action = HttpTransact::StateMachineAction_t::API_SEND_REQUEST_HDR;
if (is_private() && t_state.txn_conf->proxy_protocol_out >= 0) {
setup_server_send_proxy_protocol();
return;
}
// if proxy procotol not needed, move to API_SEND_REQUEST_HDR
case HttpTransact::StateMachineAction_t::API_SEND_REQUEST_HDR:
setup_server_send_request();
return;
Expand Down Expand Up @@ -2076,6 +2084,49 @@ HttpSM::state_read_server_response_header(int event, void *data)
return 0;
}

int
HttpSM::state_send_server_proxy_protocol(int event, void *data)
{
ink_assert(server_entry != nullptr);
ink_assert(server_entry->eos == false);
ink_assert(server_entry->write_vio == (VIO *)data);
STATE_ENTER(&HttpSM::state_send_server_proxy_protocol, event);

switch (event) {
case VC_EVENT_WRITE_READY:
server_entry->write_vio->reenable();
break;

case VC_EVENT_WRITE_COMPLETE:
// We are done sending the proxy protocol, deallocate
// our buffer and then send the server request
if (server_entry->write_buffer) {
free_MIOBuffer(server_entry->write_buffer);
server_entry->write_buffer = nullptr;
}
setup_server_send_request();
break;
case VC_EVENT_EOS:
server_entry->eos = true;

case VC_EVENT_ERROR:
case VC_EVENT_ACTIVE_TIMEOUT:
case VC_EVENT_INACTIVITY_TIMEOUT:
handle_server_setup_error(event, data);
break;

case VC_EVENT_READ_COMPLETE:
SMDbg(dbg_ctl_http_ss, "read complete due to 0 byte do_io_read");
break;

default:
ink_release_assert(0);
break;
}

return 0;
}

int
HttpSM::state_send_server_request_header(int event, void *data)
{
Expand Down Expand Up @@ -5775,6 +5826,9 @@ HttpSM::do_api_callout_internal()
case HttpTransact::StateMachineAction_t::API_OS_DNS:
cur_hook_id = TS_HTTP_OS_DNS_HOOK;
break;
case HttpTransact::StateMachineAction_t::API_SEND_PROXY_PROTOCOL:
cur_hook_id = TS_HTTP_SEND_REQUEST_HDR_HOOK;
break;
case HttpTransact::StateMachineAction_t::API_SEND_REQUEST_HDR:
cur_hook_id = TS_HTTP_SEND_REQUEST_HDR_HOOK;
break;
Expand Down Expand Up @@ -6690,10 +6744,32 @@ HttpSM::setup_server_send_request_api()
{
// Make sure the VC is on the correct timeout
server_txn->set_inactivity_timeout(get_server_inactivity_timeout());
t_state.api_next_action = HttpTransact::StateMachineAction_t::API_SEND_REQUEST_HDR;
t_state.api_next_action = HttpTransact::StateMachineAction_t::API_SEND_PROXY_PROTOCOL;
do_api_callout();
}

void
HttpSM::setup_server_send_proxy_protocol()
{
int64_t nbytes = 0;
int hdr_length;

server_entry->vc_write_handler = &HttpSM::state_send_server_proxy_protocol;
server_entry->write_buffer = new_MIOBuffer(BUFFER_SIZE_INDEX_32K);
nbytes = do_outbound_proxy_protocol(server_entry->write_buffer, static_cast<NetVConnection *>(server_entry->vc), _ua.get_txn()->get_netvc(), t_state.txn_conf->proxy_protocol_out);
hdr_length = nbytes;

IOBufferReader *buf_start = server_entry->write_buffer->alloc_reader();

server_entry->write_vio = server_entry->vc->do_io_write(this, hdr_length, buf_start);

milestones[TS_MILESTONE_SERVER_BEGIN_WRITE] = ink_get_hrtime();

server_txn->set_inactivity_timeout(get_server_inactivity_timeout());

t_state.api_next_action = HttpTransact::StateMachineAction_t::API_SEND_REQUEST_HDR;
}

void
HttpSM::setup_server_send_request()
{
Expand Down Expand Up @@ -6728,7 +6804,11 @@ HttpSM::setup_server_send_request()
}

ATS_PROBE1(milestone_server_begin_write, sm_id);
milestones[TS_MILESTONE_SERVER_BEGIN_WRITE] = ink_get_hrtime();

if (milestones[TS_MILESTONE_SERVER_BEGIN_WRITE] == 0) {
milestones[TS_MILESTONE_SERVER_BEGIN_WRITE] = ink_get_hrtime();
}

server_entry->write_vio = server_entry->vc->do_io_write(this, hdr_length, buf_start);

// Make sure the VC is using correct timeouts. We may be reusing a previously used server session
Expand Down Expand Up @@ -7927,6 +8007,7 @@ HttpSM::set_next_state()
break;
}

case HttpTransact::StateMachineAction_t::API_SEND_PROXY_PROTOCOL:
case HttpTransact::StateMachineAction_t::POST_REMAP_SKIP: {
call_transact_and_set_next_state(nullptr);
break;
Expand Down