
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/
233 lines
6.3 KiB
C
233 lines
6.3 KiB
C
/*
|
|
* Copyright (c) 2007 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.
|
|
*/
|
|
|
|
#include "kdc_locl.h"
|
|
|
|
static int have_plugin = 0;
|
|
|
|
/*
|
|
* Pick the first WINDC module that we find.
|
|
*/
|
|
|
|
static const char *windc_plugin_deps[] = {
|
|
"kdc",
|
|
"krb5",
|
|
"hdb",
|
|
NULL
|
|
};
|
|
|
|
static struct heim_plugin_data windc_plugin_data = {
|
|
"krb5",
|
|
"windc",
|
|
KRB5_WINDC_PLUGIN_MINOR,
|
|
windc_plugin_deps,
|
|
kdc_get_instance
|
|
};
|
|
|
|
static krb5_error_code KRB5_LIB_CALL
|
|
load(krb5_context context, const void *plug, void *plugctx, void *userctx)
|
|
{
|
|
have_plugin = 1;
|
|
return KRB5_PLUGIN_NO_HANDLE;
|
|
}
|
|
|
|
krb5_error_code
|
|
krb5_kdc_windc_init(krb5_context context)
|
|
{
|
|
(void)_krb5_plugin_run_f(context, &windc_plugin_data, 0, NULL, load);
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct generate_uc {
|
|
hdb_entry_ex *client;
|
|
krb5_pac *pac;
|
|
};
|
|
|
|
static krb5_error_code KRB5_LIB_CALL
|
|
generate(krb5_context context, const void *plug, void *plugctx, void *userctx)
|
|
{
|
|
krb5plugin_windc_ftable *ft = (krb5plugin_windc_ftable *)plug;
|
|
struct generate_uc *uc = (struct generate_uc *)userctx;
|
|
|
|
if (ft->pac_generate == NULL)
|
|
return KRB5_PLUGIN_NO_HANDLE;
|
|
return ft->pac_generate((void *)plug, context, uc->client, uc->pac);
|
|
}
|
|
|
|
|
|
krb5_error_code
|
|
_kdc_pac_generate(krb5_context context,
|
|
hdb_entry_ex *client,
|
|
krb5_pac *pac)
|
|
{
|
|
struct generate_uc uc;
|
|
|
|
if (!have_plugin)
|
|
return 0;
|
|
|
|
uc.client = client;
|
|
uc.pac = pac;
|
|
|
|
(void)_krb5_plugin_run_f(context, &windc_plugin_data,
|
|
0, &uc, generate);
|
|
return 0;
|
|
}
|
|
|
|
struct verify_uc {
|
|
krb5_principal client_principal;
|
|
krb5_principal delegated_proxy_principal;
|
|
hdb_entry_ex *client;
|
|
hdb_entry_ex *server;
|
|
hdb_entry_ex *krbtgt;
|
|
krb5_pac *pac;
|
|
int *verified;
|
|
};
|
|
|
|
static krb5_error_code KRB5_LIB_CALL
|
|
verify(krb5_context context, const void *plug, void *plugctx, void *userctx)
|
|
{
|
|
krb5plugin_windc_ftable *ft = (krb5plugin_windc_ftable *)plug;
|
|
struct verify_uc *uc = (struct verify_uc *)userctx;
|
|
krb5_error_code ret;
|
|
|
|
if (ft->pac_verify == NULL)
|
|
return KRB5_PLUGIN_NO_HANDLE;
|
|
ret = ft->pac_verify((void *)plug, context,
|
|
uc->client_principal,
|
|
uc->delegated_proxy_principal,
|
|
uc->client, uc->server, uc->krbtgt, uc->pac);
|
|
if (ret == 0)
|
|
(*uc->verified) = 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
krb5_error_code
|
|
_kdc_pac_verify(krb5_context context,
|
|
const krb5_principal client_principal,
|
|
const krb5_principal delegated_proxy_principal,
|
|
hdb_entry_ex *client,
|
|
hdb_entry_ex *server,
|
|
hdb_entry_ex *krbtgt,
|
|
krb5_pac *pac,
|
|
int *verified)
|
|
{
|
|
struct verify_uc uc;
|
|
|
|
if (!have_plugin)
|
|
return 0;
|
|
|
|
uc.client_principal = client_principal;
|
|
uc.delegated_proxy_principal = delegated_proxy_principal;
|
|
uc.client = client;
|
|
uc.server = server;
|
|
uc.krbtgt = krbtgt;
|
|
uc.pac = pac;
|
|
uc.verified = verified;
|
|
|
|
(void)_krb5_plugin_run_f(context, &windc_plugin_data,
|
|
0, &uc, verify);
|
|
return 0;
|
|
}
|
|
|
|
struct check_uc {
|
|
krb5_kdc_configuration *config;
|
|
hdb_entry_ex *client_ex;
|
|
const char *client_name;
|
|
hdb_entry_ex *server_ex;
|
|
const char *server_name;
|
|
KDC_REQ *req;
|
|
METHOD_DATA *method_data;
|
|
};
|
|
|
|
static krb5_error_code KRB5_LIB_CALL
|
|
check(krb5_context context, const void *plug, void *plugctx, void *userctx)
|
|
{
|
|
krb5plugin_windc_ftable *ft = (krb5plugin_windc_ftable *)plug;
|
|
struct check_uc *uc = (struct check_uc *)userctx;
|
|
|
|
if (ft->client_access == NULL)
|
|
return KRB5_PLUGIN_NO_HANDLE;
|
|
return ft->client_access((void *)plug, context, uc->config,
|
|
uc->client_ex, uc->client_name,
|
|
uc->server_ex, uc->server_name,
|
|
uc->req, uc->method_data);
|
|
}
|
|
|
|
|
|
krb5_error_code
|
|
_kdc_check_access(astgs_request_t r, KDC_REQ *req, METHOD_DATA *method_data)
|
|
{
|
|
krb5_context context = r->context;
|
|
krb5_kdc_configuration *config = r->config;
|
|
hdb_entry_ex *client_ex = r->client;
|
|
const char *client_name = r->cname;
|
|
hdb_entry_ex *server_ex = r->server;
|
|
const char *server_name = r->sname;
|
|
krb5_error_code ret = KRB5_PLUGIN_NO_HANDLE;
|
|
struct check_uc uc;
|
|
|
|
if (have_plugin) {
|
|
uc.config = config;
|
|
uc.client_ex = client_ex;
|
|
uc.client_name = client_name;
|
|
uc.server_ex = server_ex;
|
|
uc.server_name = server_name;
|
|
uc.req = req;
|
|
uc.method_data = method_data;
|
|
|
|
ret = _krb5_plugin_run_f(context, &windc_plugin_data,
|
|
0, &uc, check);
|
|
}
|
|
|
|
if (ret == KRB5_PLUGIN_NO_HANDLE)
|
|
return kdc_check_flags(r, req->msg_type == krb_as_req);
|
|
return ret;
|
|
}
|
|
|
|
uintptr_t KRB5_CALLCONV
|
|
kdc_get_instance(const char *libname)
|
|
{
|
|
static const char *instance = "libkdc";
|
|
|
|
if (strcmp(libname, "kdc") == 0)
|
|
return (uintptr_t)instance;
|
|
else if (strcmp(libname, "hdb") == 0)
|
|
return hdb_get_instance(libname);
|
|
else if (strcmp(libname, "krb5") == 0)
|
|
return krb5_get_instance(libname);
|
|
|
|
return 0;
|
|
}
|