Mon, 26 Dec 2016 16:46:55 +0100
adds support for ssl cert chain files and improves ssl error handling
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2013 Olaf Wintermann. 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. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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. */ #define _POSIX_PTHREAD_SEMANTIS #include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <sys/types.h> #include <ucx/map.h> #include "../util/pool.h" #include "acl.h" #include "vfs.h" static UcxMap *vfs_map; static VFS_IO sys_file_io = { sys_file_read, sys_file_write, sys_file_seek, sys_file_close }; static VFS_DIRIO sys_dir_io = { sys_dir_read, sys_dir_close }; int vfs_init() { vfs_map = ucx_map_new(16); if(!vfs_map) { return -1; } return 0; } void vfs_add(char *name, VFS *vfs) { WS_ASSERT(name); if(!vfs_map) { vfs_init(); } ucx_map_cstr_put(vfs_map, name, vfs); } VFSContext* vfs_request_context(Session *sn, Request *rq) { WS_ASSERT(sn); WS_ASSERT(rq); VFSContext *ctx = pool_malloc(sn->pool, sizeof(VFSContext)); ctx->sn = sn; ctx->rq = rq; ctx->vfs = rq->vfs; ctx->user = acllist_getuser(sn, rq, rq->acllist); ctx->acllist = rq->acllist; ctx->aclreqaccess = rq->aclreqaccess; ctx->pool = sn->pool; ctx->vfs_errno = 0; return ctx; } SYS_FILE vfs_open(VFSContext *ctx, char *path, int oflags) { WS_ASSERT(path); Session *sn; Request *rq; pool_handle_t *pool; uint32_t access_mask; if(ctx) { access_mask = ctx->aclreqaccess; access_mask |= acl_oflag2mask(oflags); if(!ctx->pool) { // TODO: log warning // broken VFSContext } if(ctx->vfs) { // ctx->aclreqaccess should be the complete access mask uint32_t m = ctx->aclreqaccess; // save original access mask ctx->aclreqaccess = access_mask; // set mask for vfs->open call SYS_FILE file = ctx->vfs->open(ctx, path, oflags); ctx->aclreqaccess = m; // restore original access mask return file; } else { pool = ctx->pool; } } else { sn = NULL; rq = NULL; pool = NULL; access_mask = acl_oflag2mask(oflags); } // check ACLs SysACL sysacl; if(sys_acl_check(ctx, access_mask, &sysacl)) { return NULL; } if(sysacl.acl) { if(!fs_acl_check(&sysacl, ctx->user, path, access_mask)) { acl_set_error_status(ctx->sn, ctx->rq, sysacl.acl, ctx->user); return NULL; } } // open file mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; int fd = open(path, oflags, mode); if(fd == -1) { if(ctx) { ctx->vfs_errno = errno; sys_set_error_status(ctx); } return NULL; } // if a file system acl is active, we set the owner for newly created files if(((oflags & O_CREAT) == O_CREAT) && sysacl.user_uid != -1) { if(fchown(fd, sysacl.user_uid, sysacl.user_gid)) { perror("vfs_open: fchown"); close(fd); return NULL; } } VFSFile *file = pool ? pool_malloc(pool, sizeof(VFSFile)) : malloc(sizeof(VFSFile)); if(!file) { close(fd); return NULL; } file->ctx = ctx; file->data = NULL; file->fd = fd; file->io = &sys_file_io; return file; } SYS_FILE vfs_openRO(VFSContext *ctx, char *path) { return vfs_open(ctx, path, O_RDONLY); } SYS_FILE vfs_openWO(VFSContext *ctx, char *path) { return vfs_open(ctx, path, O_WRONLY | O_CREAT); } SYS_FILE vfs_openRW(VFSContext *ctx, char *path) { return vfs_open(ctx, path, O_RDONLY | O_WRONLY | O_CREAT); } int vfs_stat(VFSContext *ctx, char *path, struct stat *buf) { Session *sn; Request *rq; uint32_t access_mask; if(ctx) { access_mask = ctx->aclreqaccess; access_mask |= ACL_READ_ATTRIBUTES; if(!ctx->pool) { // TODO: log warning // broken VFSContext } if(ctx->vfs) { // ctx->aclreqaccess should be the complete access mask uint32_t m = ctx->aclreqaccess; // save original access mask ctx->aclreqaccess = access_mask; // set mask for vfs->fstat call int ret = ctx->vfs->stat(ctx, path, buf); ctx->aclreqaccess = m; // restore original access mask return ret; } } else { sn = NULL; rq = NULL; access_mask = ACL_READ_ATTRIBUTES; } // check ACLs SysACL sysacl; if(sys_acl_check(ctx, access_mask, &sysacl)) { return -1; } if(sysacl.acl) { if(!fs_acl_check(&sysacl, ctx->user, path, access_mask)) { acl_set_error_status(ctx->sn, ctx->rq, sysacl.acl, ctx->user); return -1; } } // stat if(stat(path, buf)) { if(ctx) { ctx->vfs_errno = errno; sys_set_error_status(ctx); } return -1; } return 0; } int vfs_fstat(VFSContext *ctx, SYS_FILE fd, struct stat *buf) { if(ctx) { if(!ctx->pool) { // TODO: log warning // broken VFSContext } if(ctx->vfs) { return ctx->vfs->fstat(ctx, fd, buf); } } // stat if(fstat(fd->fd, buf)) { if(ctx) { ctx->vfs_errno = errno; } return -1; } return 0; } void vfs_close(SYS_FILE fd) { fd->io->close(fd); if(fd->ctx) { pool_free(fd->ctx->pool, fd); } else { free(fd); } } VFS_DIR vfs_opendir(VFSContext *ctx, char *path) { WS_ASSERT(path); Session *sn; Request *rq; pool_handle_t *pool; uint32_t access_mask; if(ctx) { access_mask = ctx->aclreqaccess; access_mask |= ACL_LIST; if(!ctx->pool) { // TODO: log warning // broken VFSContext } if(ctx->vfs) { // ctx->aclreqaccess should be the complete access mask uint32_t m = ctx->aclreqaccess; // save original access mask ctx->aclreqaccess = access_mask; // set mask for vfs->opendir call VFS_DIR dir = ctx->vfs->opendir(ctx, path); ctx->aclreqaccess = m; // restore original access mask return dir; } else { pool = ctx->pool; } } else { sn = NULL; rq = NULL; pool = NULL; access_mask = ACL_LIST; } // check ACLs SysACL sysacl; if(sys_acl_check(ctx, access_mask, &sysacl)) { return NULL; } if(sysacl.acl) { if(!fs_acl_check(&sysacl, ctx->user, path, access_mask)) { acl_set_error_status(ctx->sn, ctx->rq, sysacl.acl, ctx->user); return NULL; } } // open directory #ifdef BSD DIR *sys_dir = opendir(path); int dir_fd = sys_dir ? dirfd(sys_dir) : 0; #else int dir_fd = open(path, O_RDONLY); if(dir_fd == -1) { if(ctx) { ctx->vfs_errno = errno; sys_set_error_status(ctx); } return NULL; } DIR *sys_dir = fdopendir(dir_fd); #endif if(!sys_dir) { if(ctx) { ctx->vfs_errno = errno; sys_set_error_status(ctx); } return NULL; } SysVFSDir *dir_data = pool ? pool_malloc(pool, sizeof(SysVFSDir)) : malloc(sizeof(SysVFSDir)); if(!dir_data) { closedir(sys_dir); return NULL; } long maxfilelen = fpathconf(dir_fd, _PC_NAME_MAX); size_t entry_len = offsetof(struct dirent, d_name) + maxfilelen + 1; dir_data->cur = pool ? pool_malloc(pool, entry_len) : malloc(entry_len); if(!dir_data->cur) { closedir(sys_dir); return NULL; } dir_data->dir = sys_dir; VFSDir *dir = pool ? pool_malloc(pool, sizeof(VFSDir)) : malloc(sizeof(VFSDir)); if(!dir) { closedir(sys_dir); return NULL; } dir->ctx = ctx; dir->data = dir_data; dir->fd = dir_fd; dir->io = &sys_dir_io; return dir; } int vfs_readdir(VFS_DIR dir, VFS_ENTRY *entry) { return dir->io->readdir(dir, entry, 0); } int vfs_readdir_stat(VFS_DIR dir, VFS_ENTRY *entry) { return dir->io->readdir(dir, entry, 1); } void vfs_closedir(VFS_DIR dir) { dir->io->close(dir); if(dir->ctx) { pool_free(dir->ctx->pool, dir); } else { free(dir); } } int vfs_mkdir(VFSContext *ctx, char *path) { if(ctx && ctx->vfs) { return vfs_path_op(ctx, path, ctx->vfs->mkdir, ACL_ADD_FILE); } else { return sys_path_op(ctx, path, sys_mkdir, ACL_ADD_FILE); } } int vfs_unlink(VFSContext *ctx, char *path) { if(ctx && ctx->vfs) { return vfs_path_op(ctx, path, ctx->vfs->unlink, ACL_DELETE); } else { return sys_path_op(ctx, path, sys_unlink, ACL_DELETE); } } // private int vfs_path_op(VFSContext *ctx, char *path, vfs_op_f op, uint32_t access) { Session *sn; Request *rq; uint32_t access_mask = ctx->aclreqaccess; access_mask |= access; if(!ctx->pool) { // TODO: log warning // broken VFSContext return -1; } // ctx->aclreqaccess should be the complete access mask uint32_t m = ctx->aclreqaccess; // save original access mask ctx->aclreqaccess = access_mask; // set mask for vfs function call int ret = op(ctx, path); ctx->aclreqaccess = m; // restore original access mask return ret; } int sys_path_op(VFSContext *ctx, char *path, sys_op_f op, uint32_t access) { if(ctx) { access |= ctx->aclreqaccess; } // check ACLs SysACL sysacl; if(sys_acl_check(ctx, access, &sysacl)) { return -1; } if(sysacl.acl) { if(!fs_acl_check(&sysacl, ctx->user, path, access)) { acl_set_error_status(ctx->sn, ctx->rq, sysacl.acl, ctx->user); return -1; } } // do path operation if(op(ctx, path, &sysacl)) { // error if(ctx) { ctx->vfs_errno = errno; sys_set_error_status(ctx); } return -1; } return 0; } int sys_acl_check(VFSContext *ctx, uint32_t access_mask, SysACL *sysacl) { if(sysacl) { sysacl->acl = NULL; } if(!ctx) { return 0; } ACLListHandle *acllist = ctx->acllist; if(acllist) { ACLList *acl = acl_evallist( acllist, ctx->user, access_mask, &sysacl->acl); if(acl) { acl_set_error_status(ctx->sn, ctx->rq, acl, ctx->user); return 1; } } return 0; } void sys_set_error_status(VFSContext *ctx) { if(ctx->sn && ctx->rq) { int status = util_errno2status(ctx->vfs_errno); protocol_status(ctx->sn, ctx->rq, status, NULL); } } ssize_t sys_file_read(SYS_FILE fd, void *buf, size_t nbyte) { return read(fd->fd, buf, nbyte); } ssize_t sys_file_write(SYS_FILE fd, const void *buf, size_t nbyte) { return write(fd->fd, buf, nbyte); } off_t sys_file_seek(SYS_FILE fd, off_t offset, int whence) { return lseek(fd->fd, offset, whence); } void sys_file_close(SYS_FILE fd) { close(fd->fd); } int sys_dir_read(VFS_DIR dir, VFS_ENTRY *entry, int getstat) { SysVFSDir *dirdata = dir->data; struct dirent *result = NULL; int s = readdir_r(dirdata->dir, dirdata->cur, &result); if(!s && result) { char *name = result->d_name; if(!strcmp(name, ".") || !strcmp(name, "..")) { return sys_dir_read(dir, entry, getstat); } else { entry->name = name; #ifndef OSX /* TODO: * implement alternative for fstat for OS X and other crappy * Unices */ if(getstat) { // TODO: check ACLs again for new path if(fstatat(dir->fd, result->d_name, &entry->stat, 0)) { entry->stat_errno = errno; } entry->stat_extra = NULL; } #endif return 1; } } else { return 0; } } void sys_dir_close(VFS_DIR dir) { SysVFSDir *dirdata = dir->data; closedir(dirdata->dir); pool_handle_t *pool = dir->ctx->pool; if(pool) { pool_free(pool, dirdata->cur); pool_free(pool, dirdata); pool_free(pool, dir); } else { free(dirdata->cur); free(dirdata); free(dir); } } int sys_mkdir(VFSContext *ctx, char *path, SysACL *sysacl) { mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; int ret = mkdir(path, mode); if(ret == 0) { if(sysacl->user_uid != -1) { if(chown(path, sysacl->user_uid, sysacl->user_gid)) { // TODO: error } } } return ret; } int sys_unlink(VFSContext *ctx, char *path, SysACL *sysacl) { return unlink(path); } /* public file api */ NSAPI_PUBLIC int system_fread(SYS_FILE fd, void *buf, int nbyte) { return fd->io->read(fd, buf, nbyte); } NSAPI_PUBLIC int system_fwrite(SYS_FILE fd, const void *buf, int nbyte) { return fd->io->write(fd, buf, nbyte); } NSAPI_PUBLIC off_t system_lseek(SYS_FILE fd, off_t offset, int whence) { return fd->io->seek(fd, offset, whence); } NSAPI_PUBLIC int system_fclose(SYS_FILE fd) { vfs_close(fd); return 0; }