
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/
235 lines
6.6 KiB
C
235 lines
6.6 KiB
C
/*
|
|
* Copyright (c) 2020 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 "baselocl.h"
|
|
|
|
#undef __attribute__
|
|
#define __attribute__(X)
|
|
|
|
struct heim_context_s {
|
|
heim_log_facility *warn_dest; /* XXX Move warn.c into lib/base as well */
|
|
heim_log_facility *debug_dest;
|
|
char *time_fmt;
|
|
unsigned int log_utc:1;
|
|
unsigned int homedir_access:1;
|
|
heim_err_cb_context error_context;
|
|
heim_err_cb_clear_msg clear_error_message;
|
|
heim_err_cb_free_msg free_error_message;
|
|
heim_err_cb_get_msg get_error_message;
|
|
heim_err_cb_set_msg set_error_message;
|
|
const char *unknown_error;
|
|
const char *success;
|
|
};
|
|
|
|
heim_context
|
|
heim_context_init(void)
|
|
{
|
|
heim_context context;
|
|
|
|
if ((context = calloc(1, sizeof(*context))) == NULL)
|
|
return NULL;
|
|
|
|
context->log_utc = 1;
|
|
context->clear_error_message = NULL;
|
|
context->free_error_message = NULL;
|
|
context->get_error_message = NULL;
|
|
context->set_error_message = NULL;
|
|
context->error_context = NULL;
|
|
context->unknown_error = "Unknown error";
|
|
context->success = "Success";
|
|
context->debug_dest = NULL;
|
|
context->warn_dest = NULL;
|
|
context->time_fmt = NULL;
|
|
return context;
|
|
}
|
|
|
|
void
|
|
heim_context_free(heim_context *contextp)
|
|
{
|
|
heim_context context = *contextp;
|
|
|
|
*contextp = NULL;
|
|
if (!context)
|
|
return;
|
|
heim_closelog(context, context->debug_dest);
|
|
heim_closelog(context, context->warn_dest);
|
|
free(context->time_fmt);
|
|
free(context);
|
|
}
|
|
|
|
void
|
|
heim_context_set_msg_cb(heim_context context,
|
|
heim_err_cb_context cb_context,
|
|
heim_err_cb_clear_msg cb_clear_msg,
|
|
heim_err_cb_free_msg cb_free_msg,
|
|
heim_err_cb_get_msg cb_get_msg,
|
|
heim_err_cb_set_msg cb_set_msg)
|
|
{
|
|
context->error_context = cb_context;
|
|
context->clear_error_message = cb_clear_msg;
|
|
context->free_error_message = cb_free_msg;
|
|
context->set_error_message = cb_set_msg;
|
|
context->get_error_message = cb_get_msg;
|
|
}
|
|
|
|
heim_error_code
|
|
heim_context_set_time_fmt(heim_context context, const char *fmt)
|
|
{
|
|
char *s;
|
|
|
|
if (fmt == NULL) {
|
|
free(context->time_fmt);
|
|
return 0;
|
|
}
|
|
if ((s = strdup(fmt)) == NULL)
|
|
return heim_enomem(context);
|
|
free(context->time_fmt);
|
|
context->time_fmt = s;
|
|
return 0;
|
|
}
|
|
|
|
const char *
|
|
heim_context_get_time_fmt(heim_context context)
|
|
{
|
|
return context->time_fmt ? context->time_fmt : "%Y-%m-%dT%H:%M:%S";
|
|
}
|
|
|
|
unsigned int
|
|
heim_context_set_log_utc(heim_context context, unsigned int log_utc)
|
|
{
|
|
unsigned int old = context->log_utc;
|
|
|
|
context->log_utc = log_utc ? 1 : 0;
|
|
return old;
|
|
}
|
|
|
|
int
|
|
heim_context_get_log_utc(heim_context context)
|
|
{
|
|
return context->log_utc;
|
|
}
|
|
|
|
unsigned int
|
|
heim_context_set_homedir_access(heim_context context, unsigned int homedir_access)
|
|
{
|
|
unsigned int old = context->homedir_access;
|
|
|
|
context->homedir_access = homedir_access ? 1 : 0;
|
|
return old;
|
|
}
|
|
|
|
unsigned int
|
|
heim_context_get_homedir_access(heim_context context)
|
|
{
|
|
return context->homedir_access;
|
|
}
|
|
|
|
void
|
|
heim_clear_error_message(heim_context context)
|
|
{
|
|
if (context != NULL && context->clear_error_message != NULL)
|
|
context->clear_error_message(context->error_context);
|
|
}
|
|
|
|
void
|
|
heim_free_error_message(heim_context context, const char *msg)
|
|
{
|
|
if (context != NULL && context->free_error_message != NULL &&
|
|
msg != context->unknown_error && msg != context->success)
|
|
context->free_error_message(context->error_context, msg);
|
|
}
|
|
|
|
const char *
|
|
heim_get_error_message(heim_context context, heim_error_code ret)
|
|
{
|
|
if (context != NULL && context->get_error_message != NULL)
|
|
return context->get_error_message(context->error_context, ret);
|
|
if (ret)
|
|
return context->unknown_error;
|
|
return context->success;
|
|
}
|
|
|
|
void
|
|
heim_set_error_message(heim_context context, heim_error_code ret,
|
|
const char *fmt, ...)
|
|
__attribute__ ((__format__ (__printf__, 3, 4)))
|
|
{
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
heim_vset_error_message(context, ret, fmt, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
heim_vset_error_message(heim_context context, heim_error_code ret,
|
|
const char *fmt, va_list args)
|
|
__attribute__ ((__format__ (__printf__, 3, 0)))
|
|
{
|
|
if (context != NULL && context->set_error_message != NULL)
|
|
context->set_error_message(context->error_context, ret, fmt, args);
|
|
}
|
|
|
|
heim_error_code
|
|
heim_enomem(heim_context context)
|
|
{
|
|
heim_set_error_message(context, ENOMEM, "malloc: out of memory");
|
|
return ENOMEM;
|
|
}
|
|
|
|
heim_log_facility *
|
|
heim_get_warn_dest(heim_context context)
|
|
{
|
|
return context->warn_dest;
|
|
}
|
|
|
|
heim_log_facility *
|
|
heim_get_debug_dest(heim_context context)
|
|
{
|
|
return context->debug_dest;
|
|
}
|
|
|
|
heim_error_code
|
|
heim_set_warn_dest(heim_context context, heim_log_facility *fac)
|
|
{
|
|
context->warn_dest = fac;
|
|
return 0;
|
|
}
|
|
|
|
heim_error_code
|
|
heim_set_debug_dest(heim_context context, heim_log_facility *fac)
|
|
{
|
|
context->debug_dest = fac;
|
|
return 0;
|
|
}
|