diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am index 74d8ae171..47ecf8f38 100644 --- a/lib/krb5/Makefile.am +++ b/lib/krb5/Makefile.am @@ -235,6 +235,7 @@ dist_libkrb5_la_SOURCES = \ store_fd.c \ store_mem.c \ store_sock.c \ + store_stdio.c \ plugin.c \ ticket.c \ time.c \ diff --git a/lib/krb5/NTMakefile b/lib/krb5/NTMakefile index b0848716c..2378bfbc9 100644 --- a/lib/krb5/NTMakefile +++ b/lib/krb5/NTMakefile @@ -1,6 +1,6 @@ ######################################################################## # -# Copyright (c) 2009 - 2016, Secure Endpoints Inc. +# Copyright (c) 2009 - 2017, Secure Endpoints Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -152,6 +152,7 @@ libkrb5_OBJS = \ $(OBJ)\store_fd.obj \ $(OBJ)\store_mem.obj \ $(OBJ)\store_sock.obj \ + $(OBJ)\store_stdio.obj \ $(OBJ)\ticket.obj \ $(OBJ)\time.obj \ $(OBJ)\transited.obj \ @@ -307,6 +308,7 @@ dist_libkrb5_la_SOURCES = \ store_fd.c \ store_mem.c \ store_sock.c \ + store_stdio.c \ pcache.c \ plugin.c \ ticket.c \ diff --git a/lib/krb5/libkrb5-exports.def.in b/lib/krb5/libkrb5-exports.def.in index 01f9f78c3..614308dfc 100644 --- a/lib/krb5/libkrb5-exports.def.in +++ b/lib/krb5/libkrb5-exports.def.in @@ -615,6 +615,7 @@ EXPORTS krb5_storage_get_eof_code krb5_storage_is_flags krb5_storage_read + krb5_storage_stdio_from_fd krb5_storage_seek krb5_storage_set_byteorder krb5_storage_set_eof_code diff --git a/lib/krb5/store_fd.c b/lib/krb5/store_fd.c index 44cd73f74..b1d41d0db 100644 --- a/lib/krb5/store_fd.c +++ b/lib/krb5/store_fd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2017 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * diff --git a/lib/krb5/store_stdio.c b/lib/krb5/store_stdio.c new file mode 100644 index 000000000..76f7710e5 --- /dev/null +++ b/lib/krb5/store_stdio.c @@ -0,0 +1,229 @@ +/* + * Copyright (c) 2017 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 "krb5_locl.h" +#include "store-int.h" + +typedef struct stdio_storage { + FILE *f; +} stdio_storage; + +#define F(S) (((stdio_storage*)(S)->data)->f) + +static ssize_t +stdio_fetch(krb5_storage * sp, void *data, size_t size) +{ + char *cbuf = (char *)data; + ssize_t count; + size_t rem = size; + + /* similar pattern to net_read() to support pipes */ + while (rem > 0) { + count = fread(cbuf, 1, rem, F(sp)); + if (count < 0) { + if (errno == EINTR) + continue; + else + return count; + } else if (count == 0) { + return size - rem; + } + cbuf += count; + rem -= count; + } + return size; +} + +static ssize_t +stdio_store(krb5_storage * sp, const void *data, size_t size) +{ + const char *cbuf = (const char *)data; + ssize_t count; + size_t rem = size; + + /* similar pattern to net_write() to support pipes */ + while (rem > 0) { + count = fwrite(cbuf, 1, rem, F(sp)); + if (count < 0) { + if (errno == EINTR) + continue; + /* + * What does it mean to have a short write when using stdio? + * + * It can't mean much. After all stdio is buffering, so + * earlier writes that appeared complete may have failed, + * and so we don't know how much we really failed to write. + */ + return -1; + } + if (count == 0) + return -1; + cbuf += count; + rem -= count; + } + return size; +} + +static off_t +stdio_seek(krb5_storage * sp, off_t offset, int whence) +{ + int save_errno = errno; + + if (fseeko(F(sp), offset, whence) != 0) + return -1; + errno = save_errno; + return ftello(F(sp)); +} + +static int +stdio_trunc(krb5_storage * sp, off_t offset) +{ + int save_errno = errno; + + if (fflush(F(sp)) == EOF) + return errno; + if (ftruncate(fileno(F(sp)), offset) == -1) + return errno; + if (fseeko(F(sp), offset, SEEK_SET) == -1) + return errno; + errno = save_errno; + return 0; +} + +static int +stdio_sync(krb5_storage * sp) +{ + if (fflush(F(sp)) == EOF) + return errno; + if (fsync(fileno(F(sp))) == -1) + return errno; + return 0; +} + +static void +stdio_free(krb5_storage * sp) +{ + int save_errno = errno; + + if (F(sp) != NULL && fclose(F(sp)) == 0) + errno = save_errno; + F(sp) = NULL; +} + +/** + * Open a krb5_storage using stdio for buffering. + * + * @return A krb5_storage on success, or NULL on out of memory error. + * + * @ingroup krb5_storage + * + * @sa krb5_storage_emem() + * @sa krb5_storage_from_fd() + * @sa krb5_storage_from_mem() + * @sa krb5_storage_from_readonly_mem() + * @sa krb5_storage_from_data() + * @sa krb5_storage_from_socket() + */ + +KRB5_LIB_FUNCTION krb5_storage * KRB5_LIB_CALL +krb5_storage_stdio_from_fd(int fd_in, const char *mode) +{ + krb5_storage *sp; + off_t off; + FILE *f; + int saved_errno = errno; + int fd; + + off = lseek(fd_in, 0, SEEK_CUR); + if (off == -1) + return NULL; + +#ifdef _MSC_VER + /* + * This function used to try to pass the input to + * _get_osfhandle() to test if the value is a HANDLE + * but this doesn't work because doing so throws an + * exception that will result in Watson being triggered + * to file a Windows Error Report. + */ + fd = _dup(fd_in); +#else + fd = dup(fd_in); +#endif + + if (fd < 0) + return NULL; + + f = fdopen(fd, mode); + if (f == NULL) + return NULL; + + errno = saved_errno; + + if (fseeko(f, off, SEEK_SET) == -1) { + saved_errno = errno; + (void) fclose(f); + errno = saved_errno; + return NULL; + } + + errno = ENOMEM; + sp = malloc(sizeof(krb5_storage)); + if (sp == NULL) { + saved_errno = errno; + (void) fclose(f); + errno = saved_errno; + return NULL; + } + + errno = ENOMEM; + sp->data = malloc(sizeof(stdio_storage)); + if (sp->data == NULL) { + saved_errno = errno; + (void) fclose(f); + free(sp); + errno = saved_errno; + return NULL; + } + sp->flags = 0; + sp->eof_code = HEIM_ERR_EOF; + F(sp) = f; + sp->fetch = stdio_fetch; + sp->store = stdio_store; + sp->seek = stdio_seek; + sp->trunc = stdio_trunc; + sp->fsync = stdio_sync; + sp->free = stdio_free; + sp->max_alloc = UINT_MAX/8; + return sp; +} diff --git a/lib/krb5/version-script.map b/lib/krb5/version-script.map index 6c49368a8..db3eff7d0 100644 --- a/lib/krb5/version-script.map +++ b/lib/krb5/version-script.map @@ -608,6 +608,7 @@ HEIMDAL_KRB5_2.0 { krb5_storage_get_eof_code; krb5_storage_is_flags; krb5_storage_read; + krb5_storage_stdio_from_fd; krb5_storage_seek; krb5_storage_set_byteorder; krb5_storage_set_eof_code;