oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

kadm5: Fix auth_context leak on reconnect

Browse Source
This commit is contained in:
Nicolas Williams
2020-09-14 16:38:54 -05:00
parent 096888fe31
commit f2f2cd18b6
1 changed files with 51 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
lib/kadm5/init_c.c
View File

@@ -475,20 +475,25 @@ static kadm5_ret_t
kadm_connect(kadm5_client_context *ctx) kadm_connect(kadm5_client_context *ctx)
{ {
kadm5_ret_t ret; kadm5_ret_t ret;
krb5_principal server; krb5_principal server = NULL;
krb5_ccache cc; krb5_ccache cc = NULL;
rk_socket_t s = rk_INVALID_SOCKET; rk_socket_t s = rk_INVALID_SOCKET;
struct addrinfo *ai, *a; struct addrinfo *ai, *a;
struct addrinfo hints; struct addrinfo hints;
int free_ai = 0;
int error; int error;
int kadmin_port = 0; int kadmin_port = 0;
const char *admin_server = NULL; const char *admin_server = NULL;
char portstr[NI_MAXSERV]; char portstr[NI_MAXSERV];
char *hostname, *slash; const char *hostname, *slash;
char *service_name; char *service_name = NULL;
krb5_context context = ctx->context; krb5_context context = ctx->context;
int writable = 0; int writable = 0;
if (ctx->ac)
krb5_auth_con_free(context, ctx->ac);
ctx->ac = NULL;
if (!ctx->want_write) { if (!ctx->want_write) {
admin_server = ctx->readonly_admin_server; admin_server = ctx->readonly_admin_server;
kadmin_port = ctx->readonly_kadmind_port; kadmin_port = ctx->readonly_kadmind_port;
@@ -500,52 +505,47 @@ kadm_connect(kadm5_client_context *ctx)
if (kadmin_port < 1) if (kadmin_port < 1)
kadmin_port = ctx->kadmind_port; kadmin_port = ctx->kadmind_port;
memset (&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP; hints.ai_protocol = IPPROTO_TCP;
snprintf (portstr, sizeof(portstr), "%u", ntohs(ctx->kadmind_port)); snprintf(portstr, sizeof(portstr), "%u", ntohs(ctx->kadmind_port));
hostname = ctx->admin_server; hostname = ctx->admin_server;
slash = strchr (hostname, '/'); slash = strchr(hostname, '/');
if (slash != NULL) if (slash != NULL)
hostname = slash + 1; hostname = slash + 1;
error = getaddrinfo (hostname, portstr, &hints, &ai); error = getaddrinfo(hostname, portstr, &hints, &ai);
if (error) { if (error) {
krb5_clear_error_message(context); ret = KADM5_BAD_SERVER_NAME;
return KADM5_BAD_SERVER_NAME; goto out;
} }
free_ai = 1;
for (a = ai; a != NULL; a = a->ai_next) { for (a = ai; a != NULL; a = a->ai_next) {
s = socket (a->ai_family, a->ai_socktype, a->ai_protocol); s = socket(a->ai_family, a->ai_socktype, a->ai_protocol);
if (s < 0) if (s < 0)
continue; continue;
if (connect (s, a->ai_addr, a->ai_addrlen) < 0) { if (connect(s, a->ai_addr, a->ai_addrlen) < 0) {
krb5_clear_error_message(context); krb5_warn(context, errno, "connect(%s)", hostname);
krb5_warn (context, errno, "connect(%s)", hostname); rk_closesocket(s);
rk_closesocket (s);
continue; continue;
} }
break; break;
} }
if (a == NULL) { if (a == NULL) {
freeaddrinfo (ai); krb5_set_error_message(context, ret = KADM5_FAILURE,
krb5_clear_error_message(context); "failed to contact %s", hostname);
krb5_warnx (context, "failed to contact %s", hostname); goto out;
return KADM5_FAILURE;
} }
ret = _kadm5_c_get_cred_cache(context, ret = _kadm5_c_get_cred_cache(context,
ctx->client_name, ctx->client_name,
ctx->service_name, ctx->service_name,
NULL, ctx->prompter, ctx->keytab, NULL, ctx->prompter, ctx->keytab,
ctx->ccache, &cc); ctx->ccache, &cc);
if (ret)
if(ret) { goto out;
freeaddrinfo (ai);
rk_closesocket(s);
return ret;
}
if (ctx->realm) if (ctx->realm)
error = asprintf(&service_name, "%s@%s", KADM5_ADMIN_SERVICE, error = asprintf(&service_name, "%s@%s", KADM5_ADMIN_SERVICE,
@@ -554,27 +554,19 @@ kadm_connect(kadm5_client_context *ctx)
error = asprintf(&service_name, "%s", KADM5_ADMIN_SERVICE); error = asprintf(&service_name, "%s", KADM5_ADMIN_SERVICE);
if (error == -1 || service_name == NULL) { if (error == -1 || service_name == NULL) {
freeaddrinfo (ai); ret = krb5_enomem(context);
rk_closesocket(s); goto out;
return krb5_enomem(context);
} }
ret = krb5_parse_name(context, service_name, &server); ret = krb5_parse_name(context, service_name, &server);
free(service_name); if (ret)
if(ret) { goto out;
freeaddrinfo (ai);
if(ctx->ccache == NULL)
krb5_cc_close(context, cc);
rk_closesocket(s);
return ret;
}
ctx->ac = NULL;
ret = krb5_sendauth(context, &ctx->ac, &s, ret = krb5_sendauth(context, &ctx->ac, &s,
KADMIN_APPL_VERSION, NULL, KADMIN_APPL_VERSION, NULL,
server, AP_OPTS_MUTUAL_REQUIRED, server, AP_OPTS_MUTUAL_REQUIRED,
NULL, NULL, cc, NULL, NULL, NULL); NULL, NULL, cc, NULL, NULL, NULL);
if(ret == 0) { if (ret == 0) {
krb5_data params; krb5_data params;
kadm5_config_params p; kadm5_config_params p;
memset(&p, 0, sizeof(p)); memset(&p, 0, sizeof(p));
@@ -583,49 +575,30 @@ kadm_connect(kadm5_client_context *ctx)
p.realm = ctx->realm; p.realm = ctx->realm;
} }
ret = _kadm5_marshal_params(context, &p, &params); ret = _kadm5_marshal_params(context, &p, &params);
if (ret == 0) {
ret = krb5_write_priv_message(context, ctx->ac, &s, &params); ret = krb5_write_priv_message(context, ctx->ac, &s, &params);
krb5_data_free(&params); krb5_data_free(&params);
if(ret) { }
freeaddrinfo (ai);
rk_closesocket(s);
if(ctx->ccache == NULL)
krb5_cc_close(context, cc);
return ret;
}
} else if(ret == KRB5_SENDAUTH_BADAPPLVERS) {
rk_closesocket(s);
s = socket (a->ai_family, a->ai_socktype, a->ai_protocol);
if (s < 0) {
freeaddrinfo (ai);
krb5_clear_error_message(context);
return errno;
}
if (connect (s, a->ai_addr, a->ai_addrlen) < 0) {
rk_closesocket (s);
freeaddrinfo (ai);
krb5_clear_error_message(context);
return errno;
}
ret = krb5_sendauth(context, &ctx->ac, &s,
KADMIN_OLD_APPL_VERSION, NULL,
server, AP_OPTS_MUTUAL_REQUIRED,
NULL, NULL, cc, NULL, NULL, NULL);
}
freeaddrinfo (ai);
if(ret) {
rk_closesocket(s);
return ret;
} }
if (ret == 0) {
ctx->sock = s;
ctx->connected_to_writable = !!writable;
}
out:
free(service_name);
krb5_cc_close(context, cc);
krb5_free_principal(context, server); krb5_free_principal(context, server);
if(ctx->ccache == NULL) if (free_ai)
krb5_cc_close(context, cc); freeaddrinfo(ai);
ctx->sock = s; if (ret) {
if (s != rk_INVALID_SOCKET)
ctx->connected_to_writable = !!writable; rk_closesocket(s);
return 0; krb5_auth_con_free(context, ctx->ac);
ctx->ac = NULL;
}
return ret;
} }
kadm5_ret_t kadm5_ret_t