--- a/src/server/daemon/config.c Mon Aug 24 12:50:16 2020 +0200
+++ b/src/server/daemon/config.c Mon Aug 24 17:07:41 2020 +0200
@@ -128,10 +128,12 @@
ServerConfiguration* load_server_conf(char *file) {
log_ereport(LOG_VERBOSE, "load_server_conf");
- ServerConfig2 *serverconf2 = load_server_config(file);
- if(serverconf2 == NULL) {
+ ServerConfig *serverconf = serverconfig_load(file);
+ if(!serverconf) {
log_ereport(LOG_FAILURE, "Cannot load server.conf");
+ return NULL;
}
+
pool_handle_t *pool = pool_create();
@@ -167,49 +169,54 @@
*/
// init logfile first
- UcxList *lfl = ucx_map_sstr_get(serverconf2->objects, sstrn("LogFile", 7));
- if(lfl != NULL) {
- ServerConfigObject *logobj = lfl->data;
- if(logobj == NULL) {
+ UcxList *list = NULL;
+
+ list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("LogFile"));
+ if(list) {
+ ConfigNode *logobj = list->data;
+ if(!logobj) {
// error
- return NULL;
+ return NULL; // TODO: fix memory leak
}
int ret = cfg_handle_logfile(serverconfig, logobj);
if(ret != 0) {
// cannot initialize log file
- return NULL;
+ return NULL; // TODO: fix memory leak
}
} else {
// horrible error
return NULL;
}
+ ucx_list_free(list);
- UcxList *list = ucx_map_sstr_get(serverconf2->objects, sstrn("Runtime", 7));
+ list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("Runtime"));
UCX_FOREACH(elm, list) {
- ServerConfigObject *scfgobj = elm->data;
- if(cfg_handle_runtime(serverconfig, scfgobj)) {
+ ConfigNode *runtimeobj = elm->data;
+ if(cfg_handle_runtime(serverconfig, runtimeobj)) {
// error
return NULL;
}
}
+ ucx_list_free(list);
- list = ucx_map_sstr_get(serverconf2->objects, sstrn("Threadpool", 10));
+ list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("Threadpool"));
UCX_FOREACH(elm, list) {
if(cfg_handle_threadpool(serverconfig, elm->data)) {
return NULL;
}
}
+ ucx_list_free(list);
// check thread pool config
if(check_thread_pool_cfg() != 0) {
/* critical error */
return NULL;
}
- list = ucx_map_sstr_get(serverconf2->objects, sstrn("EventHandler", 12));
+ list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("EventHandler"));
UCX_FOREACH(elm, list) {
if(cfg_handle_eventhandler(
- serverconfig, (ServerConfigObject*)elm->data)) {
+ serverconfig, elm->data)) {
// error
return NULL;
}
@@ -219,38 +226,43 @@
/* critical error */
return NULL;
}
+ ucx_list_free(list);
- list = ucx_map_sstr_get(serverconf2->objects, sstrn("AccessLog", 9));
+ list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("AccessLog"));
UCX_FOREACH(elm, list) {
- ServerConfigObject *scfgobj = elm->data;
+ ConfigNode *scfgobj = elm->data;
if(cfg_handle_accesslog(serverconfig, scfgobj)) {
return NULL;
}
}
+ ucx_list_free(list);
- list = ucx_map_sstr_get(serverconf2->objects, sstrn("AuthDB", 6));
+ list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("AuthDB"));
UCX_FOREACH(elm, list) {
- ServerConfigObject *scfgobj = elm->data;
+ ConfigNode *scfgobj = elm->data;
if(cfg_handle_authdb(serverconfig, scfgobj)) {
return NULL;
}
}
+ ucx_list_free(list);
- list = ucx_map_sstr_get(serverconf2->objects, sstrn("Listener", 8));
+ list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("Listener"));
UCX_FOREACH(elm, list) {
- ServerConfigObject *scfgobj = elm->data;
+ ConfigNode *scfgobj = elm->data;
if(cfg_handle_listener(serverconfig, scfgobj)) {
return NULL;
}
}
+ ucx_list_free(list);
- list = ucx_map_sstr_get(serverconf2->objects, sstrn("VirtualServer", 13));
+ list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("VirtualServer"));
UCX_FOREACH(elm, list) {
- ServerConfigObject *scfgobj = elm->data;
+ ConfigNode *scfgobj = elm->data;
if(cfg_handle_vs(serverconfig, scfgobj)) {
return NULL;
}
}
+ ucx_list_free(list);
// set VirtualServer for all listeners
@@ -274,7 +286,8 @@
ls = ls->next;
}
- free_server_config(serverconf2);
+ serverconfig_free(serverconf);
+
return serverconfig;
}
@@ -294,22 +307,23 @@
}
-int cfg_handle_runtime(ServerConfiguration *cfg, ServerConfigObject *obj) {
- sstr_t user = cfg_directivelist_get_str(obj->directives, sstr("User"));
+int cfg_handle_runtime(ServerConfiguration *cfg, ConfigNode *obj) {
+ scstr_t user = serverconfig_directive_value(obj, SC("User"));
if(user.ptr) {
- cfg->user = sstrdup_pool(cfg->pool, user);
+ cfg->user = sstrdup_a(cfg->a, user);
}
- sstr_t tmp = cfg_directivelist_get_str(obj->directives, sstr("Temp"));
+ scstr_t tmp = serverconfig_directive_value(obj, SC("Temp"));
if(tmp.ptr) {
- cfg->tmp = sstrdup_pool(cfg->pool, tmp);
+ cfg->tmp = sstrdup_a(cfg->a, tmp);
} else {
+ // TODO: do this check after all config loading is done
log_ereport(LOG_MISCONFIG, "no temporary directory specified");
return -1;
}
// mime file
- sstr_t mf = cfg_directivelist_get_str(obj->directives, sstr("MimeFile"));
- sstr_t base = sstr("config/");
+ scstr_t mf = serverconfig_directive_value(obj, SC("MimeFile"));
+ scstr_t base = SC("config/");
sstr_t file = sstrcat(2, base, mf);
if(mime_conf_load(cfg, file)) {
@@ -320,9 +334,9 @@
return 0;
}
-int cfg_handle_logfile(ServerConfiguration *cfg, ServerConfigObject *obj) {
- sstr_t file = cfg_directivelist_get_str(obj->directives, sstr("File"));
- sstr_t lvl = cfg_directivelist_get_str(obj->directives, sstr("Level"));
+int cfg_handle_logfile(ServerConfiguration *cfg, ConfigNode *obj) {
+ scstr_t file = serverconfig_directive_value(obj, SC("File"));
+ scstr_t lvl = serverconfig_directive_value(obj, SC("Level"));
if(file.ptr == NULL || lvl.ptr == NULL) {
/* missing log file parameters */
@@ -330,21 +344,18 @@
}
LogConfig logcfg;
- logcfg.file = sstrdup(file).ptr;
- logcfg.level = sstrdup(lvl).ptr;
+ logcfg.file = file.ptr;
+ logcfg.level = lvl.ptr;
logcfg.log_stdout = 0;
logcfg.log_stderr = 0;
/* TODO: stdout, stderr config */
int ret = init_log_file(&logcfg);
-
- free(logcfg.file);
- free(logcfg.level);
return ret;
}
-int cfg_handle_threadpool(ServerConfiguration *cfg, ServerConfigObject *obj) {
+int cfg_handle_threadpool(ServerConfiguration *cfg, ConfigNode *obj) {
ThreadPoolConfig poolcfg;
poolcfg.min_threads = 4;
poolcfg.min_threads = 4;
@@ -352,21 +363,11 @@
poolcfg.queue_size = 64;
poolcfg.stack_size = 262144;
- sstr_t name = cfg_directivelist_get_str(
- obj->directives,
- sstr("Name"));
- sstr_t min = cfg_directivelist_get_str(
- obj->directives,
- sstr("MinThreads"));
- sstr_t max = cfg_directivelist_get_str(
- obj->directives,
- sstr("MaxThreads"));
- sstr_t stack = cfg_directivelist_get_str(
- obj->directives,
- sstr("StackSize"));
- sstr_t queue = cfg_directivelist_get_str(
- obj->directives,
- sstr("QueueSize"));
+ scstr_t name = serverconfig_directive_value(obj, SC("Name"));
+ scstr_t min = serverconfig_directive_value(obj, SC("MinThreads"));
+ scstr_t max = serverconfig_directive_value(obj, SC("MaxThreads"));
+ scstr_t stack = serverconfig_directive_value(obj, SC("StackSize"));
+ scstr_t queue = serverconfig_directive_value(obj, SC("QueueSize"));
// TODO: Type
if(name.length == 0) {
@@ -375,27 +376,19 @@
}
if(min.length != 0) {
- min = sstrdup(min);
poolcfg.min_threads = atoi(min.ptr);
- free(min.ptr);
}
if(max.length != 0) {
- max = sstrdup(max);
poolcfg.max_threads = atoi(max.ptr);
- free(max.ptr);
}
if(stack.length != 0) {
- stack = sstrdup(stack);
poolcfg.stack_size = atoi(stack.ptr);
- free(stack.ptr);
}
if(queue.length != 0) {
- queue = sstrdup(queue);
poolcfg.queue_size = atoi(queue.ptr);
- free(queue.ptr);
}
create_threadpool(name, &poolcfg);
@@ -403,32 +396,26 @@
return 0;
}
-int cfg_handle_eventhandler(ServerConfiguration *c, ServerConfigObject *obj) {
+int cfg_handle_eventhandler(ServerConfiguration *c, ConfigNode *obj) {
EventHandlerConfig evcfg;
- sstr_t name = cfg_directivelist_get_str(obj->directives, sstr("Name"));
- sstr_t threads = cfg_directivelist_get_str(
- obj->directives,
- sstr("Threads"));
- sstr_t isdefault = cfg_directivelist_get_str(
- obj->directives,
- sstr("Default"));
+ scstr_t name = serverconfig_directive_value(obj, SC("Name"));
+ scstr_t threads = serverconfig_directive_value(obj, SC("Threads"));
+ scstr_t isdefault = serverconfig_directive_value(obj, SC("Default"));
evcfg.name = name;
- sstr_t s = sstrdup(threads);
- evcfg.nthreads = atoi(s.ptr);
- free(s.ptr);
+ evcfg.nthreads = atoi(threads.ptr);
evcfg.isdefault = util_getboolean(isdefault.ptr, 0);
return create_event_handler(&evcfg);
}
-int cfg_handle_accesslog(ServerConfiguration *cfg, ServerConfigObject *obj) {
+int cfg_handle_accesslog(ServerConfiguration *cfg, ConfigNode *obj) {
// TODO: use a name to identify the log file
- sstr_t file = cfg_directivelist_get_str(obj->directives, sstr("File"));
+ scstr_t file = serverconfig_directive_value(obj, SC("File"));
if(file.ptr == NULL) {
return 0;
}
@@ -443,10 +430,10 @@
return 0;
}
AccessLog *log = pool_malloc(cfg->pool, sizeof(AccessLog));
- log->file = sstrdup_pool(cfg->pool, file);
+ log->file = sstrdup_a(cfg->a, file);
log->format = format;
log->log = log_file;
- cfg->logfiles = ucx_list_append(cfg->logfiles, log);
+ cfg->logfiles = ucx_list_append_a(cfg->a, cfg->logfiles, log);
if(!cfg->default_log) {
cfg->default_log = log;
@@ -455,62 +442,31 @@
return 0;
}
-int cfg_handle_authdb(ServerConfiguration *cfg, ServerConfigObject *obj) {
- sstr_t name = cfg_directivelist_get_str(obj->directives, sstr("Name"));
- sstr_t type = cfg_directivelist_get_str(obj->directives, sstr("Type"));
+int cfg_handle_authdb(ServerConfiguration *cfg, ConfigNode *obj) {
+ scstr_t name = serverconfig_directive_value(obj, SC("Name"));
+ scstr_t type = serverconfig_directive_value(obj, SC("Type"));
AuthDB *authdb = NULL;
if(!sstrcmp(type, sstr("ldap"))) {
LDAPConfig conf;
- sstr_t host = cfg_directivelist_get_str(
- obj->directives,
- sstr("Host"));
- sstr_t port = cfg_directivelist_get_str(
- obj->directives,
- sstr("Port"));
- sstr_t basedn = cfg_directivelist_get_str(
- obj->directives,
- sstr("BaseDN"));
- sstr_t binddn = cfg_directivelist_get_str(
- obj->directives,
- sstr("BindDN"));
- sstr_t basepw = cfg_directivelist_get_str(
- obj->directives,
- sstr("BindPW"));
+ scstr_t host = serverconfig_directive_value(obj, SC("Host"));
+ scstr_t port = serverconfig_directive_value( obj, SC("Port"));
+ scstr_t basedn = serverconfig_directive_value(obj, SC("BaseDN"));
+ scstr_t binddn = serverconfig_directive_value(obj, SC("BindDN"));
+ scstr_t basepw = serverconfig_directive_value(obj, SC("BindPW"));
- host = sstrdup(host);
- port = sstrdup(port);
- basedn = sstrdup(basedn);
- binddn = sstrdup(binddn);
- basepw = sstrdup(basepw);
-
- conf.hostname = host.ptr;
+ conf.hostname = sstrdup_a(cfg->a, host).ptr;
conf.port = atoi(port.ptr);
- conf.basedn = basedn.ptr;
- conf.binddn = binddn.ptr;
- conf.bindpw = basepw.ptr;
+ conf.basedn = sstrdup_a(cfg->a, basedn).ptr;
+ conf.binddn = sstrdup_a(cfg->a, binddn).ptr;
+ conf.bindpw = sstrdup_a(cfg->a, basepw).ptr;
- name = sstrdup(name);
-
- authdb = create_ldap_authdb(name.ptr, &conf);
-
- // TODO: create_ldap_authdb should copy the strings
- /*
- free(host.ptr);
- free(port.ptr);
- free(basedn.ptr);
- free(binddn.ptr);
- free(basepw.ptr);
- free(name.ptr);
- */
-
+ authdb = create_ldap_authdb(cfg, name.ptr, &conf);
} else if(!sstrcmp(type, sstr("keyfile"))) {
// we only need the file parameter
- sstr_t file = cfg_directivelist_get_str(
- obj->directives,
- sstr("File"));
+ scstr_t file = serverconfig_directive_value(obj, SC("File"));
if(file.length == 0) {
log_ereport(
LOG_MISCONFIG,
@@ -531,42 +487,33 @@
return 0;
}
-int cfg_handle_listener(ServerConfiguration *cfg, ServerConfigObject *obj) {
+int cfg_handle_listener(ServerConfiguration *cfg, ConfigNode *obj) {
ListenerConfig lc;
ZERO(&lc, sizeof(ListenerConfig));
lc.cfg = cfg;
lc.port = 8080;
lc.nacceptors = 1;
- // TODO: use sstrdup_pool?
- lc.name = sstrdup(cfg_directivelist_get_str(
- obj->directives,
- sstr("Name")));
- lc.port = atoi(cfg_directivelist_get_str(
- obj->directives,
- sstr("Port")).ptr);
- lc.vs = sstrdup(cfg_directivelist_get_str(
- obj->directives,
- sstr("DefaultVS")));
- lc.threadpool = sstrdup(cfg_directivelist_get_str(
- obj->directives,
- sstr("Threadpool")));
+ scstr_t name = serverconfig_directive_value(obj, SC("Name"));
+ scstr_t port = serverconfig_directive_value(obj, SC("Port"));
+ scstr_t vs = serverconfig_directive_value(obj, SC("DefaultVS"));
+ scstr_t thrp = serverconfig_directive_value(obj, SC("Threadpool"));
+ scstr_t blck = serverconfig_directive_value(obj, SC("BlockingIO"));
- sstr_t blockingio = cfg_directivelist_get_str(
- obj->directives,
- sstr("BlockingIO"));
- if(blockingio.ptr) {
- lc.blockingio = util_getboolean_s(blockingio, WS_FALSE);
- }
+ // TODO: use sstrdup_pool?
+ lc.name = sstrdup(name);
+ lc.port = atoi(port.ptr);
+ lc.vs = sstrdup(vs);
+ lc.threadpool = sstrdup(thrp);
- sstr_t ssl = cfg_directivelist_get_str(obj->directives, S("SSL"));
+ lc.blockingio = util_getboolean_s(blck, WS_FALSE);
+
+ scstr_t ssl = serverconfig_directive_value(obj, SC("SSL"));
if(util_getboolean_s(ssl, WS_FALSE)) {
- sstr_t cert = cfg_directivelist_get_str(obj->directives, S("Cert"));
- sstr_t privkey = cfg_directivelist_get_str(obj->directives, S("Key"));
- sstr_t chain = cfg_directivelist_get_str(obj->directives, S("CertChain"));
- sstr_t disableprot = cfg_directivelist_get_str(
- obj->directives,
- S("SSLDisableProtocol"));
+ scstr_t cert = serverconfig_directive_value(obj, SC("Cert"));
+ scstr_t privkey = serverconfig_directive_value(obj, SC("Key"));
+ scstr_t chain = serverconfig_directive_value(obj, SC("CertChain"));
+ scstr_t disableprot = serverconfig_directive_value(obj, SC("SSLDisableProtocol"));
WSBool config_ok = WS_TRUE;
// TODO: log error
@@ -603,30 +550,21 @@
return 1;
}
- listener->default_vs.vs_name = lc.vs.ptr;
- cfg->listeners = ucx_list_append(cfg->listeners, listener);
+ listener->default_vs.vs_name = sstrdup_a(cfg->a, lc.vs).ptr;
+ cfg->listeners = ucx_list_append_a(cfg->a, cfg->listeners, listener);
return 0;
}
-int cfg_handle_vs(ServerConfiguration *cfg, ServerConfigObject *obj) {
+int cfg_handle_vs(ServerConfiguration *cfg, ConfigNode *obj) {
VirtualServer *vs = vs_new();
- vs->name = sstrdup(cfg_directivelist_get_str(
- obj->directives,
- sstr("Name")));
- vs->host = sstrdup(cfg_directivelist_get_str(
- obj->directives,
- sstr("Host")));
- vs->document_root = sstrdup(cfg_directivelist_get_str(
- obj->directives,
- sstr("DocRoot")));
- sstr_t objfile = cfg_directivelist_get_str(
- obj->directives,
- sstr("ObjectFile"));
- sstr_t aclfile = cfg_directivelist_get_str(
- obj->directives,
- sstr("ACLFile"));
+ vs->name = sstrdup_a(cfg->a, serverconfig_directive_value(obj, SC("Name")));
+ vs->host = sstrdup_a(cfg->a, serverconfig_directive_value(obj, SC("Host")));
+ vs->document_root = sstrdup_a(cfg->a, serverconfig_directive_value(obj, SC("DocRoot")));
+
+ scstr_t objfile = serverconfig_directive_value(obj, SC("ObjectFile"));
+ scstr_t aclfile = serverconfig_directive_value(obj, SC("ACLFile"));
// load the object config file
sstr_t base = sstr("config/");
@@ -916,7 +854,7 @@
return &acllist->acl;
}
-AuthDB* keyfile_load(ServerConfiguration *cfg, sstr_t file) {
+AuthDB* keyfile_load(ServerConfiguration *cfg, scstr_t file) {
Keyfile *keyfile = keyfile_new(cfg->a);
if(!keyfile) {
return NULL;