isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set server_name before initiating TLS connection so verify function works.

Browse Source 
Fixes a crash in the SSL_VERIFY_PEER callback.  Also call inet_ntop(3)
with addr pointer, not sockaddr pointer so we get the correct IP address.
This commit is contained in:
Todd C. Miller
2020-11-02 09:30:45 -07:00
parent 6286ce1d16
commit de58c11dba
2 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
logsrvd/sendlog.c
View File

@@ -152,7 +152,7 @@ static int
connect_server(const char *host, const char *port) connect_server(const char *host, const char *port)
{ {
struct addrinfo hints, *res, *res0; struct addrinfo hints, *res, *res0;
const char *cause = "getaddrinfo"; const char *addr, *cause = "getaddrinfo";
int error, sock, save_errno; int error, sock, save_errno;
debug_decl(connect_server, SUDO_DEBUG_UTIL); debug_decl(connect_server, SUDO_DEBUG_UTIL);
@@ -182,7 +182,22 @@ connect_server(const char *host, const char *port)
continue; continue;
} }
if (*server_ip == '\0') { if (*server_ip == '\0') {
if (inet_ntop(res->ai_family, res->ai_addr, server_ip, switch (res->ai_family) {
case AF_INET:
addr = (char *)&((struct sockaddr_in *)res->ai_addr)->sin_addr;
break;
case AF_INET6:
addr = (char *)&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
break;
default:
cause = "ai_family";
save_errno = EAFNOSUPPORT;
close(sock);
errno = save_errno;
sock = -1;
continue;
}
if (inet_ntop(res->ai_family, addr, server_ip,
sizeof(server_ip)) == NULL) { sizeof(server_ip)) == NULL) {
sudo_warnx("%s", U_("unable to get server IP addr")); sudo_warnx("%s", U_("unable to get server IP addr"));
} }

36
plugins/sudoers/iolog_client.c
View File

@@ -412,7 +412,7 @@ connect_server(const char *host, const char *port, bool tls,
{ {
const struct timespec *timo = &closure->log_details->server_timeout; const struct timespec *timo = &closure->log_details->server_timeout;
struct addrinfo hints, *res, *res0; struct addrinfo hints, *res, *res0;
const char *cause = NULL; const char *addr, *cause = NULL;
int error, sock = -1; int error, sock = -1;
debug_decl(connect_server, SUDOERS_DEBUG_UTIL); debug_decl(connect_server, SUDOERS_DEBUG_UTIL);
@@ -479,7 +479,22 @@ connect_server(const char *host, const char *port, bool tls,
sock = -1; sock = -1;
continue; continue;
} }
if (inet_ntop(res->ai_family, res->ai_addr, closure->server_ip, switch (res->ai_family) {
case AF_INET:
addr = (char *)&((struct sockaddr_in *)res->ai_addr)->sin_addr;
break;
case AF_INET6:
addr = (char *)&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
break;
default:
cause = "ai_family";
save_errno = EAFNOSUPPORT;
close(sock);
errno = save_errno;
sock = -1;
continue;
}
if (inet_ntop(res->ai_family, addr, closure->server_ip,
sizeof(closure->server_ip)) == NULL) { sizeof(closure->server_ip)) == NULL) {
cause = "inet_ntop"; cause = "inet_ntop";
save_errno = errno; save_errno = errno;
@@ -488,6 +503,15 @@ connect_server(const char *host, const char *port, bool tls,
sock = -1; sock = -1;
continue; continue;
} }
free(closure->server_name);
if ((closure->server_name = strdup(host)) == NULL) {
cause = "strdup";
save_errno = errno;
close(sock);
errno = save_errno;
sock = -1;
continue;
}
#if defined(HAVE_OPENSSL) #if defined(HAVE_OPENSSL)
if (tls) { if (tls) {
@@ -544,7 +568,7 @@ log_server_connect(struct client_closure *closure)
STAILQ_FOREACH(server, closure->log_details->log_servers, entries) { STAILQ_FOREACH(server, closure->log_details->log_servers, entries) {
free(copy); free(copy);
if ((copy = strdup(server->str)) == NULL) { if ((copy = strdup(server->str)) == NULL) {
cause = U_("unable to allocate memory"); cause = "strdup";
break; break;
} }
if (!iolog_parse_host_port(copy, &host, &port, &tls, DEFAULT_PORT, if (!iolog_parse_host_port(copy, &host, &port, &tls, DEFAULT_PORT,
@@ -557,12 +581,6 @@ log_server_connect(struct client_closure *closure)
"connecting to %s port %s%s", host, port, tls ? " (tls)" : ""); "connecting to %s port %s%s", host, port, tls ? " (tls)" : "");
sock = connect_server(host, port, tls, closure, &cause); sock = connect_server(host, port, tls, closure, &cause);
if (sock != -1) { if (sock != -1) {
if ((closure->server_name = strdup(host)) == NULL) {
cause = U_("unable to allocate memory");
close(sock);
break;
}
if (closure->read_ev->set(closure->read_ev, sock, if (closure->read_ev->set(closure->read_ev, sock,
SUDO_PLUGIN_EV_READ|SUDO_PLUGIN_EV_PERSIST, SUDO_PLUGIN_EV_READ|SUDO_PLUGIN_EV_PERSIST,
server_msg_cb, closure) == -1) { server_msg_cb, closure) == -1) {