Fri, 30 Dec 2016 18:47:26 +0100
adds new a pathcheck saf and improves content type matchin and improves content type matching
/* * 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. */ #ifndef SERVERCONF_H #define SERVERCONF_H #include "conf.h" #ifdef __cplusplus extern "C" { #endif typedef struct _server_conf_obj { ConfigLine *begin; ConfigLine *end; sstr_t type; UcxList *directives; } ServerConfigObject; typedef struct _server_conf { ConfigParser parser; char *file; UcxMap *objects; // contains UcxList of ServerConfigObject // parser temp vars ServerConfigObject *obj; } ServerConfig; // server.conf objects typedef struct _cfg_listener { ServerConfigObject *cfgobj; sstr_t name; sstr_t vs; sstr_t threadpool; sstr_t address; int port; int nacceptors; int cfg_correct; } CfgListener; typedef struct _cfg_keyfile_authdb { sstr_t file; } CfgKeyfileAuthDB; typedef struct _cfg_ldap_authdb { sstr_t host; int port; sstr_t basedn; sstr_t binddn; sstr_t bindpw; } CfgLDAPAuthDB; union authdb { CfgKeyfileAuthDB keyfile; CfgLDAPAuthDB ldap; }; enum authdb_type { AUTHDB_TYPE_KEYFILE, AUTHDB_TYPE_LDAP }; typedef struct _cfg_authdb { sstr_t name; enum authdb_type type; union authdb cfg; int cfg_correct; } CfgAuthDB; /* * Loads and parses a server configuration file. The function only structures * the file content to configuration objects with directives. The semantics * of the objects and directives can be extracted with the srvcfg_* funcsions. */ ServerConfig *load_server_config(char *file); /* * frees the ServerConfig object */ void free_server_config(ServerConfig *conf); // private - parses a server.conf line int serverconf_parse(void *p, ConfigLine *begin, ConfigLine *end, sstr_t line); UcxList* srvcfg_get_listeners(ServerConfig *cfg, UcxAllocator *mp, int *error); #ifdef __cplusplus } #endif #endif /* SERVERCONF_H */