dany/ant-http
1
0
Fork 0
mirror of https://github.com/lxsang/ant-http synced 2024-11-18 01:08:21 +01:00
Code Issues Actions Projects Releases Wiki Activity

query realpathes from configurations
All checks were successful
gitea-sync/ant-http/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Dany LE 2022-10-04 12:30:35 +02:00 committed by GitHub
parent a96523c218
commit 0d9d6b5497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
http_server.c
View File

@ -10,6 +10,8 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h>
#include <stdlib.h>
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
#include <openssl/ssl.h> #include <openssl/ssl.h>
@ -101,6 +103,7 @@ static int config_handler(void *conf, const char *section, const char *name,
{ {
config_t *pconfig = (config_t *)conf; config_t *pconfig = (config_t *)conf;
regmatch_t port_matches[2]; regmatch_t port_matches[2];
char * tmp;
struct stat st; struct stat st;
// trim(section, ' '); // trim(section, ' ');
// trim(value,' '); // trim(value,' ');
@ -121,23 +124,43 @@ static int config_handler(void *conf, const char *section, const char *name,
pconfig->plugins_ext = strdup(value); pconfig->plugins_ext = strdup(value);
} }
else if (MATCH("SERVER", "database")) else if (MATCH("SERVER", "database"))
{
if (stat(value, &st) == -1)
mkdirp(value, 0700);
tmp = realpath(value, NULL);
if(!tmp)
{
ERROR("Unable to query real path for %s: %s", value, strerror(errno));
}
else
{ {
if (pconfig->db_path) if (pconfig->db_path)
free(pconfig->db_path); free(pconfig->db_path);
pconfig->db_path = strdup(value); pconfig->db_path = tmp;
if (stat(pconfig->db_path, &st) == -1) LOG("Database root is %s", pconfig->db_path);
mkdirp(pconfig->db_path, 0700); }
} }
else if (MATCH("SERVER", "tmpdir")) else if (MATCH("SERVER", "tmpdir"))
{ {
if (pconfig->tmpdir) if (stat(value, &st) == -1)
free(pconfig->tmpdir); {
pconfig->tmpdir = strdup(value); mkdirp(value, 0755);
if (stat(pconfig->tmpdir, &st) == -1) }
mkdirp(pconfig->tmpdir, 0755);
else else
{ {
removeAll(pconfig->tmpdir, 0); removeAll(value, 0);
}
tmp = realpath(value, NULL);
if(!tmp)
{
ERROR("Unable to query real path for %s: %s", value, strerror(errno));
}
else
{
if (pconfig->tmpdir)
free(pconfig->tmpdir);
pconfig->tmpdir = tmp;
LOG("TMP root is %s", pconfig->tmpdir);
} }
} }
else if (MATCH("SERVER", "statistic_fifo")) else if (MATCH("SERVER", "statistic_fifo"))
@ -232,10 +255,19 @@ static int config_handler(void *conf, const char *section, const char *name,
} }
if (strcmp(name, "htdocs") == 0) if (strcmp(name, "htdocs") == 0)
{ {
p->htdocs = strdup(value); if (stat(value, &st) == -1)
if (stat(p->htdocs, &st) == -1)
{ {
mkdirp(p->htdocs, 0755); mkdirp(value, 0755);
}
p->htdocs = realpath(value, NULL);
if(!p->htdocs)
{
ERROR("Unable to query real path for %s: %s", value, strerror(errno));
p->htdocs = strdup(value);
}
else
{
LOG("Server root is %s", p->htdocs);
} }
} }
else if (strcmp(name, "ssl.enable") == 0) else if (strcmp(name, "ssl.enable") == 0)
@ -261,10 +293,10 @@ void load_config(const char *file)
{ {
server_config.ports = dict(); server_config.ports = dict();
server_config.plugins_dir = strdup("plugins/"); server_config.plugins_dir = strdup("plugins/");
server_config.plugins_ext = strdup(".dylib"); server_config.plugins_ext = strdup(".so");
server_config.db_path = strdup("databases/"); server_config.db_path = strdup("databases/");
// server_config.htdocs = "htdocs/"; // server_config.htdocs = "htdocs/";
server_config.tmpdir = strdup("tmp/"); server_config.tmpdir = strdup("/tmp/");
server_config.stat_fifo_path = strdup("/var/run/antd_stat"); server_config.stat_fifo_path = strdup("/var/run/antd_stat");
server_config.n_workers = 4; server_config.n_workers = 4;
server_config.backlog = 1000; server_config.backlog = 1000;