
[Code reviewed by Love Hörnquist Åstrand <lha@kth.se>] Added heim_db_*() entry points for dealing with databases, and make krb5_aname_to_localname() use it. The following enhancements to libheimbase are included: - Add heim_data_t and heim_string_t "reference" variants to avoid memory copies of potentially large data/strings. See heim_data_ref_create() and heim_string_ref_create(). - Added enhancements to heim_array_t to allow their use for queues and stacks, and to improve performance. See heim_array_insert_value(). - Added XPath-like accessors for heim_object_t. See heim_path_get(), heim_path_copy(), heim_path_create(), and heim_path_delete(). These are used extensively in the DB framework's generic composition of ACID support and in the test_base program - Made libheimbase more consistent with Core Foundation naming conventions. See heim_{dict, array}_{get, copy}_value() and heim_path_{get, copy}(). - Added functionality to and fixed bugs in base/json.c: - heim_serialize(); - depth limit for JSON parsing (for DoS protection); - pretty-printing; - JSON compliance (see below); - flag options for parsing and serializing; these are needed because of impedance mismatches between heim_object_t and JSON (e.g., heim_dict_t allows non-string keys, but JSON does not; heimbase supports binary data, while JSON does not). - Added heim_error_enomem(). - Enhanced the test_base program to test new functionality and to use heim_path*() to better test JSON encoding. This includes some fuzz testing of JSON parsing, and running the test under valgrind. - Started to add doxygen documentation for libheimbase (but doc build for libheimbase is still incomplete). Note that there's still some incomplete JSON support: - JSON string quoting is not fully implemented; - libheimbase lacks support for real numbers, while JSON has it -- otherwise libheimbase is a superset of JSON, specifically in that any heim_object_t can be a key for an associative array. The following DB backends are supported natively: - "sorted-text", a binary search of sorted (in C locale), flat text files; - "json", a backend that stores DB contents serialized as JSON (this is intended for configuration-like contents). The DB framework supports: - multiple key/value tables per-DB - ACID transactions The DB framework also natively implements ACID transactions for any DB backends that a) do not provide transactions natively, b) do provide lock/unlock/sync methods (even on Windows). This includes autocommit of DB updates outside transactions. Future DB enhancements may include: - add backends for various DB types (BDB, CDB, MDB, ...); - make libhdb use heim_db_t; - add a command-line tool for interfacing to databases via libheimbase (e.g., to get/set/delete values, create/copy/ backup DBs, inspect history, check integrity); - framework-level transaction logging (with redo and undo logging), for generic incremental replication; - framework-level DB integrity checking. We could store a MAC of the XOR of a hash function applied to {key, value} for every entry in the DB, then use this to check DB integrity incrementally during incremental replication, as well as for the whole DB.
164 lines
4.3 KiB
C
164 lines
4.3 KiB
C
/*
|
|
* Copyright (c) 2010 Kungliga Tekniska Högskolan
|
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
|
* All rights reserved.
|
|
*
|
|
* Portions Copyright (c) 2010 Apple Inc. 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"
|
|
|
|
struct heim_error {
|
|
int error_code;
|
|
heim_string_t msg;
|
|
struct heim_error *next;
|
|
};
|
|
|
|
static void
|
|
error_dealloc(void *ptr)
|
|
{
|
|
struct heim_error *p = ptr;
|
|
heim_release(p->msg);
|
|
heim_release(p->next);
|
|
}
|
|
|
|
static int
|
|
error_cmp(void *a, void *b)
|
|
{
|
|
struct heim_error *ap = a, *bp = b;
|
|
if (ap->error_code == ap->error_code)
|
|
return ap->error_code - ap->error_code;
|
|
return heim_cmp(ap->msg, bp->msg);
|
|
}
|
|
|
|
static unsigned long
|
|
error_hash(void *ptr)
|
|
{
|
|
struct heim_error *p = ptr;
|
|
return p->error_code;
|
|
}
|
|
|
|
struct heim_type_data _heim_error_object = {
|
|
HEIM_TID_ERROR,
|
|
"error-object",
|
|
NULL,
|
|
error_dealloc,
|
|
NULL,
|
|
error_cmp,
|
|
error_hash
|
|
};
|
|
|
|
heim_error_t
|
|
heim_error_enomem(void)
|
|
{
|
|
/* This is an immediate object; see heim_number_create() */
|
|
return (heim_error_t)heim_number_create(ENOMEM);
|
|
}
|
|
|
|
heim_error_t
|
|
heim_error_create(int error_code, const char *fmt, ...)
|
|
{
|
|
heim_error_t e;
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
e = heim_error_createv(error_code, fmt, ap);
|
|
va_end(ap);
|
|
|
|
return e;
|
|
}
|
|
|
|
heim_error_t
|
|
heim_error_createv(int error_code, const char *fmt, va_list ap)
|
|
{
|
|
heim_error_t e;
|
|
char *str;
|
|
int len;
|
|
int save_errno = errno;
|
|
|
|
str = malloc(1024);
|
|
errno = save_errno;
|
|
if (str == NULL)
|
|
return heim_error_enomem();
|
|
len = vsnprintf(str, 1024, fmt, ap);
|
|
errno = save_errno;
|
|
if (len < 0) {
|
|
free(str);
|
|
return NULL; /* XXX We should have a special heim_error_t for this */
|
|
}
|
|
|
|
e = _heim_alloc_object(&_heim_error_object, sizeof(struct heim_error));
|
|
if (e) {
|
|
e->msg = heim_string_create(str);
|
|
e->error_code = error_code;
|
|
}
|
|
free(str);
|
|
|
|
errno = save_errno;
|
|
return e;
|
|
}
|
|
|
|
heim_string_t
|
|
heim_error_copy_string(heim_error_t error)
|
|
{
|
|
if (heim_get_tid(error) != HEIM_TID_ERROR) {
|
|
if (heim_get_tid(error) == heim_number_get_type_id())
|
|
return __heim_string_constant(strerror(heim_number_get_int((heim_number_t)error)));
|
|
heim_abort("invalid heim_error_t");
|
|
}
|
|
/* XXX concat all strings */
|
|
return heim_retain(error->msg);
|
|
}
|
|
|
|
int
|
|
heim_error_get_code(heim_error_t error)
|
|
{
|
|
if (heim_get_tid(error) != HEIM_TID_ERROR) {
|
|
if (heim_get_tid(error) == heim_number_get_type_id())
|
|
return heim_number_get_int((heim_number_t)error);
|
|
heim_abort("invalid heim_error_t");
|
|
}
|
|
return error->error_code;
|
|
}
|
|
|
|
heim_error_t
|
|
heim_error_append(heim_error_t top, heim_error_t append)
|
|
{
|
|
if (heim_get_tid(top) != HEIM_TID_ERROR) {
|
|
if (heim_get_tid(top) == heim_number_get_type_id())
|
|
return top;
|
|
heim_abort("invalid heim_error_t");
|
|
}
|
|
if (top->next)
|
|
heim_release(top->next);
|
|
top->next = heim_retain(append);
|
|
return top;
|
|
}
|