Skip to content
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

Jump to bottom

Add Host HTTP header to MS-KKDCP requests #507

Closed
wants to merge 1 commit into from
Closed

Add Host HTTP header to MS-KKDCP requests #507

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/lib/krb5/os/sendto_kdc.c
View file
Open in desktop
Expand Up @@ -78,6 +78,7 @@
#define MAX_PASS 3
#define DEFAULT_UDP_PREF_LIMIT 1465
#define HARD_UDP_LIMIT 32700 /* could probably do 64K-epsilon ? */
#define PORT_LENGTH 6 /* decimal repr of UINT16_MAX */

/* Select state flags. */
#define SSF_READ 0x01
Expand Down Expand Up @@ -138,6 +139,7 @@ struct conn_state {
struct {
const char *uri_path;
const char *servername;
char port[PORT_LENGTH];
char *https_request;
k5_tls_handle tls;
} http;
Expand Down Expand Up @@ -611,6 +613,8 @@ make_proxy_request(struct conn_state *state, const krb5_data *realm,
k5_buf_init_dynamic(&buf);
uri_path = (state->http.uri_path != NULL) ? state->http.uri_path : "";
k5_buf_add_fmt(&buf, "POST /%s HTTP/1.0\r\n", uri_path);
k5_buf_add_fmt(&buf, "Host: %s:%s\r\n", state->http.servername,
state->http.port);
k5_buf_add(&buf, "Cache-Control: no-cache\r\n");
k5_buf_add(&buf, "Pragma: no-cache\r\n");
k5_buf_add(&buf, "User-Agent: kerberos/1.0\r\n");
Expand Down Expand Up @@ -673,7 +677,7 @@ static krb5_error_code
add_connection(struct conn_state **conns, k5_transport transport,
krb5_boolean defer, struct addrinfo *ai, size_t server_index,
const krb5_data *realm, const char *hostname,
const char *uri_path, char **udpbufp)
const char *port, const char *uri_path, char **udpbufp)
{
struct conn_state *state, **tailptr;

Expand All @@ -695,11 +699,13 @@ add_connection(struct conn_state **conns, k5_transport transport,
state->service_write = service_tcp_write;
state->service_read = service_tcp_read;
} else if (transport == HTTPS) {
assert(hostname != NULL && port != NULL);
state->service_connect = service_tcp_connect;
state->service_write = service_https_write;
state->service_read = service_https_read;
state->http.uri_path = uri_path;
state->http.servername = hostname;
strlcpy(state->http.port, port, PORT_LENGTH);
} else {
state->service_connect = NULL;
state->service_write = NULL;
Expand Down Expand Up @@ -785,7 +791,7 @@ resolve_server(krb5_context context, const krb5_data *realm,
struct addrinfo *addrs, *a, hint, ai;
krb5_boolean defer;
int err, result;
char portbuf[64];
char portbuf[PORT_LENGTH];

/* Skip UDP entries if we don't want UDP. */
if (strategy == NO_UDP && entry->transport == UDP)
Expand All @@ -800,7 +806,7 @@ resolve_server(krb5_context context, const krb5_data *realm,
ai.ai_addr = (struct sockaddr *)&entry->addr;
defer = (entry->transport != transport);
return add_connection(conns, entry->transport, defer, &ai, ind, realm,
NULL, entry->uri_path, udpbufp);
NULL, NULL, entry->uri_path, udpbufp);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Port is NULL here. Leading to a crash above.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is HTTPS transport supported for entry->hostname == NULL? I argue that the HTTPS transport requires a hostname for SNI and virtual hosting.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I think this is all right. It was just hard to tell from the diff.

}

/* If the entry has a specified transport, use it. */
Expand All @@ -826,7 +832,8 @@ resolve_server(krb5_context context, const krb5_data *realm,
retval = 0;
for (a = addrs; a != 0 && retval == 0; a = a->ai_next) {
retval = add_connection(conns, transport, FALSE, a, ind, realm,
entry->hostname, entry->uri_path, udpbufp);
entry->hostname, portbuf, entry->uri_path,
udpbufp);
}

/* For TCP_OR_UDP entries, add each address again with the non-preferred
Expand All @@ -836,7 +843,8 @@ resolve_server(krb5_context context, const krb5_data *realm,
for (a = addrs; a != 0 && retval == 0; a = a->ai_next) {
a->ai_socktype = socktype_for_transport(transport);
retval = add_connection(conns, transport, TRUE, a, ind, realm,
entry->hostname, entry->uri_path, udpbufp);
entry->hostname, portbuf,
entry->uri_path, udpbufp);
}
}
freeaddrinfo(addrs);
Expand Down