
This is the second of two commits in a series that must be picked together. This series of two commits moves parts of lib/krb5/ infrastructure functionality to lib/base/, leaving behind wrappers. Some parts of libkrb5 are entirely generic or easily made so, and could be useful in various parts of Heimdal that are not specific to the krb5 API, such as: - lib/gssapi/ (especially since the integration of NegoEx) - lib/hx509/ - bx509d (which should really move out of kdc/) For the above we need to move these bits of lib/krb5/: - lib/krb5/config_file.c (all of it, leaving forwardings behind) - lib/krb5/config_reg.c (all of it) - lib/krb5/plugin.c (all of it, leaving forwardings behind) - lib/krb5/log.c (all of it, ditto) - lib/krb5/heim_err.et (all of it) And because of those two, these too must also move: - lib/krb5/expand_path.c (all of it, leaving forwardings behind) - lib/krb5/warn.c (just the warning functions, ditto) The changes to the moved files are mostly quite straightforward and are best reviewed with --word-diff=color. We're also creating a heim_context and a heim API to go with it. But it's as thin as possible, with as little state as necessary to enable this move. Functions for dealing with error messages use callbacks. Moving plugin.c does have one knock-on effect on all users of the old krb5 plugin API (which remains), which is that a global search and replace of struct krb5_plugin_data to struct heim_plugin_data was needed, though the layout and size of that structure doesn't change, so the ABI doesn't either. As well, we now build lib/vers/ and lib/com_err/ before lib/base/ so as to be able to move lib/krb5/heim_err.et to lib/base/ so that we can make use of HEIM_ERR_* in lib/base/, specifically in the files that moved. Once this is all done we'll be able to use config files and plugins in lib/hx509/, we'll be able to move bx509d out of kdc/, and so on. Most if not all of the new functions in lib/base/ are Heimdal-private, thus calling conventions for them are not declared. Status: - builds and passes CIs (Travis, Appveyor) - ran make check-valgrind and no new leaks or other memory errors - ready for review HOW TO REVIEW: $ # Review file moves: $ git log --stat -n1 HEAD^ $ $ # Review changes to moved files using --word-diff=color $ git log -p -b -w --word-diff=color HEAD^..HEAD \ lib/base/config_file.c \ lib/base/config_reg.c \ lib/base/expand_path.c \ lib/base/warn.c \ lib/krb5/config_file.c \ lib/krb5/config_reg.c \ lib/krb5/expand_path.c \ lib/krb5/warn.c $ $ # Review the whole thing, possibly adding -b and/or -w, and $ # maybe --word-diff=color: $ git log -p origin/master..HEAD $ git log -p -b -w origin/master..HEAD $ git log -p -b -w --word-diff=color origin/master..HEAD TBD (future commits): - make lib/gssapi use the new heimbase functions - move kx509/bx509d common code to lib/hx509/ or other approp. location - move bx509d out of kdc/
444 lines
12 KiB
C
444 lines
12 KiB
C
/*
|
|
* Copyright (c) 2019 Kungliga Tekniska Högskolan
|
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* 3. Neither the name of the Institute nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
/*
|
|
* This plugin authorizes requested certificate SANs and EKUs by calling a
|
|
* service over IPC (Unix domain sockets on Linux/BSD/Illumos).
|
|
*
|
|
* The IPC protocol is request/response, with requests and responses sent as
|
|
*
|
|
* <length><string>
|
|
*
|
|
* where the <length> is 4 bytes, unsigned binary in network byte order, and
|
|
* <string> is an array of <length> bytes and does NOT include a NUL
|
|
* terminator.
|
|
*
|
|
* Requests are of the form:
|
|
*
|
|
* check <princ> <exttype>=<extvalue> ...
|
|
*
|
|
* where <princ> is a URL-escaped principal name, <exttype> is one of:
|
|
*
|
|
* - san_pkinit
|
|
* - san_xmpp
|
|
* - san_email
|
|
* - san_ms_upn
|
|
* - san_dnsname
|
|
* - eku
|
|
*
|
|
* and <extvalue> is a URL-escaped string representation of the SAN or OID.
|
|
*
|
|
* OIDs are in the form 1.2.3.4.5.6.
|
|
*
|
|
* Only characters other than alphanumeric, '@', '.', '-', '_', and '/' are
|
|
* URL-encoded.
|
|
*
|
|
* Responses are any of:
|
|
*
|
|
* - granted
|
|
* - denied
|
|
* - error message
|
|
*
|
|
* Example:
|
|
*
|
|
* C->S: check jane@TEST.H5L.SE san_dnsname=jane.foo.test.h5l.se eku=1.3.6.1.5.5.7.3.1
|
|
* S->C: granted
|
|
*
|
|
* Only digitalSignature and nonRepudiation key usages are allowed. Requested
|
|
* key usages are not sent to the CSR authorizer IPC server.
|
|
*/
|
|
|
|
#define _GNU_SOURCE 1
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include <roken.h>
|
|
#include <heim-ipc.h>
|
|
#include <krb5.h>
|
|
#include <hx509.h>
|
|
#include <kdc.h>
|
|
#include <common_plugin.h>
|
|
#include <csr_authorizer_plugin.h>
|
|
|
|
/*
|
|
* string_encode_sz() and string_encode() encode principal names and such to be
|
|
* safe for use in our IPC text messages. They function very much like URL
|
|
* encoders, but '~' also gets encoded, and '.' and '@' do not.
|
|
*
|
|
* An unescaper is not needed here.
|
|
*/
|
|
static size_t
|
|
string_encode_sz(const char *in)
|
|
{
|
|
size_t sz = strlen(in);
|
|
|
|
while (*in) {
|
|
char c = *(in++);
|
|
|
|
switch (c) {
|
|
case '@':
|
|
case '.':
|
|
case '-':
|
|
case '_':
|
|
case '/':
|
|
continue;
|
|
default:
|
|
if (isalnum(c))
|
|
continue;
|
|
sz += 2;
|
|
}
|
|
}
|
|
return sz;
|
|
}
|
|
|
|
static char *
|
|
string_encode(const char *in)
|
|
{
|
|
size_t len = strlen(in);
|
|
size_t sz = string_encode_sz(in);
|
|
size_t i, k;
|
|
char *s;
|
|
|
|
if ((s = malloc(sz + 1)) == NULL)
|
|
return NULL;
|
|
s[sz] = '\0';
|
|
|
|
for (i = k = 0; i < len; i++) {
|
|
unsigned char c = ((const unsigned char *)in)[i];
|
|
|
|
switch (c) {
|
|
case '@':
|
|
case '.':
|
|
case '-':
|
|
case '_':
|
|
case '/':
|
|
s[k++] = c;
|
|
break;
|
|
default:
|
|
if (isalnum(c)) {
|
|
s[k++] = c;
|
|
} else {
|
|
s[k++] = '%';
|
|
s[k++] = "0123456789abcdef"[(c&0xff)>>4];
|
|
s[k++] = "0123456789abcdef"[(c&0x0f)];
|
|
}
|
|
}
|
|
}
|
|
return s;
|
|
}
|
|
|
|
static int
|
|
cmd_append(struct rk_strpool **cmd, const char *s0, ...)
|
|
{
|
|
va_list ap;
|
|
const char *arg;
|
|
|
|
if ((*cmd = rk_strpoolprintf(*cmd, "%s", s0)) == NULL)
|
|
return ENOMEM;
|
|
|
|
va_start(ap, s0);
|
|
while ((arg = va_arg(ap, const char *))) {
|
|
char *s;
|
|
|
|
if ((s = string_encode(arg)) == NULL)
|
|
return rk_strpoolfree(*cmd), *cmd = NULL, ENOMEM;
|
|
*cmd = rk_strpoolprintf(*cmd, "%s", s);
|
|
free(s);
|
|
if (*cmd == NULL)
|
|
return ENOMEM;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
call_svc(krb5_context context, heim_ipc ipc, const char *cmd)
|
|
{
|
|
heim_octet_string req, resp;
|
|
int ret;
|
|
|
|
req.data = (void *)(uintptr_t)cmd;
|
|
req.length = strlen(cmd);
|
|
resp.length = 0;
|
|
resp.data = NULL;
|
|
if ((ret = heim_ipc_call(ipc, &req, &resp, NULL))) {
|
|
if (resp.length && resp.length < INT_MAX) {
|
|
krb5_set_error_message(context, ret, "CSR denied: %.*s",
|
|
(int)resp.length, (const char *)resp.data);
|
|
ret = EACCES;
|
|
} else {
|
|
krb5_set_error_message(context, EACCES, "CSR denied because could "
|
|
"not reach CSR authorizer IPC service");
|
|
ret = EACCES;
|
|
}
|
|
return ret;
|
|
}
|
|
if (resp.data == NULL || resp.length == 0) {
|
|
free(resp.data);
|
|
krb5_set_error_message(context, ret, "CSR authorizer IPC service "
|
|
"failed silently");
|
|
return EACCES;
|
|
}
|
|
if (resp.length == sizeof("denied") - 1 &&
|
|
strncasecmp(resp.data, "denied", sizeof("denied") - 1) == 0) {
|
|
free(resp.data);
|
|
krb5_set_error_message(context, ret, "CSR authorizer rejected %s",
|
|
cmd);
|
|
return EACCES;
|
|
}
|
|
if (resp.length == sizeof("granted") - 1 &&
|
|
strncasecmp(resp.data, "granted", sizeof("granted") - 1) == 0) {
|
|
free(resp.data);
|
|
return 0;
|
|
}
|
|
krb5_set_error_message(context, ret, "CSR authorizer failed %s: %.*s",
|
|
cmd, resp.length < INT_MAX ? (int)resp.length : 0,
|
|
resp.data);
|
|
return EACCES;
|
|
}
|
|
|
|
static void
|
|
frees(char **s)
|
|
{
|
|
free(*s);
|
|
*s = NULL;
|
|
}
|
|
|
|
static krb5_error_code
|
|
mark_authorized(hx509_request csr)
|
|
{
|
|
size_t i;
|
|
char *s;
|
|
int ret = 0;
|
|
|
|
for (i = 0; ret == 0; i++) {
|
|
ret = hx509_request_get_eku(csr, i, &s);
|
|
if (ret == 0)
|
|
hx509_request_authorize_eku(csr, i);
|
|
frees(&s);
|
|
}
|
|
if (ret == HX509_NO_ITEM)
|
|
ret = 0;
|
|
|
|
for (i = 0; ret == 0; i++) {
|
|
hx509_san_type san_type;
|
|
ret = hx509_request_get_san(csr, i, &san_type, &s);
|
|
if (ret == 0)
|
|
hx509_request_authorize_san(csr, i);
|
|
frees(&s);
|
|
}
|
|
return ret == HX509_NO_ITEM ? 0 : ret;
|
|
}
|
|
|
|
static KRB5_LIB_CALL krb5_error_code
|
|
authorize(void *ctx,
|
|
krb5_context context,
|
|
krb5_kdc_configuration *config,
|
|
hx509_request csr,
|
|
krb5_const_principal client,
|
|
krb5_boolean *result)
|
|
{
|
|
struct rk_strpool *cmd = NULL;
|
|
krb5_error_code ret;
|
|
hx509_context hx509ctx = NULL;
|
|
heim_ipc ipc = NULL;
|
|
const char *svc;
|
|
KeyUsage ku;
|
|
size_t i;
|
|
char *princ = NULL;
|
|
char *s = NULL;
|
|
int do_check = 0;
|
|
|
|
if ((svc = krb5_config_get_string(context, NULL,
|
|
config->app ? config->app : "kdc",
|
|
"ipc_csr_authorizer", "service",
|
|
NULL)) == NULL)
|
|
return KRB5_PLUGIN_NO_HANDLE;
|
|
|
|
if ((ret = heim_ipc_init_context(svc, &ipc))) {
|
|
krb5_set_error_message(context, ret, "Could not set up IPC client "
|
|
"end-point for service %s", svc);
|
|
return ret;
|
|
}
|
|
|
|
if ((ret = hx509_context_init(&hx509ctx)))
|
|
goto out;
|
|
|
|
if ((ret = krb5_unparse_name(context, client, &princ)))
|
|
goto out;
|
|
|
|
if ((ret = cmd_append(&cmd, "check ", princ, NULL)))
|
|
goto enomem;
|
|
frees(&princ);
|
|
|
|
for (i = 0; ret == 0; i++) {
|
|
hx509_san_type san_type;
|
|
|
|
ret = hx509_request_get_san(csr, i, &san_type, &s);
|
|
if (ret)
|
|
break;
|
|
switch (san_type) {
|
|
case HX509_SAN_TYPE_EMAIL:
|
|
if ((ret = cmd_append(&cmd, " san_email=", s, NULL)))
|
|
goto enomem;
|
|
do_check = 1;
|
|
break;
|
|
case HX509_SAN_TYPE_DNSNAME:
|
|
if ((ret = cmd_append(&cmd, " san_dnsname=", s, NULL)))
|
|
goto enomem;
|
|
do_check = 1;
|
|
break;
|
|
case HX509_SAN_TYPE_XMPP:
|
|
if ((ret = cmd_append(&cmd, " san_xmpp=", s, NULL)))
|
|
goto enomem;
|
|
do_check = 1;
|
|
break;
|
|
case HX509_SAN_TYPE_PKINIT:
|
|
if ((ret = cmd_append(&cmd, " san_pkinit=", s, NULL)))
|
|
goto enomem;
|
|
do_check = 1;
|
|
break;
|
|
case HX509_SAN_TYPE_MS_UPN:
|
|
if ((ret = cmd_append(&cmd, " san_ms_upn=", s, NULL)))
|
|
goto enomem;
|
|
do_check = 1;
|
|
break;
|
|
default:
|
|
if ((ret = hx509_request_reject_san(csr, i)))
|
|
goto out;
|
|
break;
|
|
}
|
|
frees(&s);
|
|
}
|
|
if (ret == HX509_NO_ITEM)
|
|
ret = 0;
|
|
if (ret)
|
|
goto out;
|
|
|
|
for (i = 0; ret == 0; i++) {
|
|
ret = hx509_request_get_eku(csr, i, &s);
|
|
if (ret)
|
|
break;
|
|
if ((ret = cmd_append(&cmd, " eku=", s, NULL)))
|
|
goto enomem;
|
|
do_check = 1;
|
|
frees(&s);
|
|
}
|
|
if (ret == HX509_NO_ITEM)
|
|
ret = 0;
|
|
if (ret)
|
|
goto out;
|
|
|
|
ku = int2KeyUsage(0);
|
|
ku.digitalSignature = 1;
|
|
ku.nonRepudiation = 1;
|
|
hx509_request_authorize_ku(csr, ku);
|
|
|
|
if (do_check) {
|
|
if ((s = rk_strpoolcollect(cmd)) == NULL)
|
|
goto enomem;
|
|
cmd = NULL;
|
|
if ((ret = call_svc(context, ipc, s)))
|
|
goto out;
|
|
} /* else -> permit */
|
|
|
|
if ((ret = mark_authorized(csr)))
|
|
goto out;
|
|
|
|
*result = TRUE;
|
|
ret = 0;
|
|
goto out;
|
|
|
|
enomem:
|
|
ret = krb5_enomem(context);
|
|
goto out;
|
|
|
|
out:
|
|
heim_ipc_free_context(ipc);
|
|
hx509_context_free(&hx509ctx);
|
|
if (cmd)
|
|
rk_strpoolfree(cmd);
|
|
free(princ);
|
|
free(s);
|
|
return ret;
|
|
}
|
|
|
|
static KRB5_LIB_CALL krb5_error_code
|
|
ipc_csr_authorizer_init(krb5_context context, void **c)
|
|
{
|
|
*c = NULL;
|
|
return 0;
|
|
}
|
|
|
|
static KRB5_LIB_CALL void
|
|
ipc_csr_authorizer_fini(void *c)
|
|
{
|
|
}
|
|
|
|
static krb5plugin_csr_authorizer_ftable plug_desc =
|
|
{ 1, ipc_csr_authorizer_init, ipc_csr_authorizer_fini, authorize };
|
|
|
|
static krb5plugin_csr_authorizer_ftable *plugs[] = { &plug_desc };
|
|
|
|
static uintptr_t
|
|
ipc_csr_authorizer_get_instance(const char *libname)
|
|
{
|
|
if (strcmp(libname, "krb5") == 0)
|
|
return krb5_get_instance(libname);
|
|
if (strcmp(libname, "kdc") == 0)
|
|
return kdc_get_instance(libname);
|
|
if (strcmp(libname, "hx509") == 0)
|
|
return hx509_get_instance(libname);
|
|
return 0;
|
|
}
|
|
|
|
krb5_plugin_load_ft kdc_csr_authorizer_plugin_load;
|
|
|
|
krb5_error_code KRB5_CALLCONV
|
|
kdc_csr_authorizer_plugin_load(heim_pcontext context,
|
|
krb5_get_instance_func_t *get_instance,
|
|
size_t *num_plugins,
|
|
krb5_plugin_common_ftable_cp **plugins)
|
|
{
|
|
*get_instance = ipc_csr_authorizer_get_instance;
|
|
*num_plugins = sizeof(plugs) / sizeof(plugs[0]);
|
|
*plugins = (krb5_plugin_common_ftable_cp *)plugs;
|
|
return 0;
|
|
}
|