aniani/gophernicus
1
0
Fork 0
mirror of https://github.com/gophernicus/gophernicus.git synced 2024-09-01 04:14:15 -04:00
Code

Selector /server-status can now be disabled and no longer leaks IP addresses by default

Browse Source
This commit is contained in:
Kim Holviala 2018-01-28 17:43:35 +02:00
parent ff90756b80
commit 2b522069cd
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -40,11 +40,12 @@ Command line options:
-nq Disable HTTP-style query strings (?query) -nq Disable HTTP-style query strings (?query)
-ns Disable logging to syslog -ns Disable logging to syslog
-na Disable autogenerated caps.txt -na Disable autogenerated caps.txt
-nt Disable /server-status
-nm Disable shared memory use (for debugging) -nm Disable shared memory use (for debugging)
-nr Disable root user checking (for debugging) -nr Disable root user checking (for debugging)
-np Disable HAproxy proxy protocol -np Disable HAproxy proxy protocol
-d Debug to syslog (not for production use) -d Debug output in syslog and /server-status
-v Display version number and build date -v Display version number and build date
-b Display the BSD license -b Display the BSD license
-? Display this help -? Display this help

22
file.c
View File

@ -204,16 +204,18 @@ void server_status(state *st, shm_state *shm, int shmid)
if ((now - shm->session[i].req_atime) < st->session_timeout) { if ((now - shm->session[i].req_atime) < st->session_timeout) {
sessions++; sessions++;
printf("Session: %-4i %-40s %-4li %-7li gopher%s://%s:%i/%c%s" CRLF, if (st->debug) {
(int) (now - shm->session[i].req_atime), printf("Session: %-4i %-40s %-4li %-7li gopher%s://%s:%i/%c%s" CRLF,
shm->session[i].req_remote_addr, (int) (now - shm->session[i].req_atime),
shm->session[i].hits, shm->session[i].req_remote_addr,
shm->session[i].kbytes, shm->session[i].hits,
(shm->session[i].server_port == st->server_tls_port ? "s" : ""), shm->session[i].kbytes,
shm->session[i].server_host, (shm->session[i].server_port == st->server_tls_port ? "s" : ""),
shm->session[i].server_port, shm->session[i].server_host,
shm->session[i].req_filetype, shm->session[i].server_port,
shm->session[i].req_selector); shm->session[i].req_filetype,
shm->session[i].req_selector);
}
} }
} }

3
gophernicus.c
View File

@ -450,6 +450,7 @@ void init_state(state *st)
st->opt_iconv = TRUE; st->opt_iconv = TRUE;
st->opt_query = TRUE; st->opt_query = TRUE;
st->opt_caps = TRUE; st->opt_caps = TRUE;
st->opt_status = TRUE;
st->opt_shm = TRUE; st->opt_shm = TRUE;
st->opt_root = TRUE; st->opt_root = TRUE;
st->opt_proxy = TRUE; st->opt_proxy = TRUE;
@ -676,7 +677,7 @@ get_selector:
/* Handle /server-status requests */ /* Handle /server-status requests */
#ifdef HAVE_SHMEM #ifdef HAVE_SHMEM
if (sstrncmp(st.req_selector, SERVER_STATUS) == MATCH) { if (st.opt_status && sstrncmp(st.req_selector, SERVER_STATUS) == MATCH) {
if (shm) server_status(&st, shm, shmid); if (shm) server_status(&st, shm, shmid);
return OK; return OK;
} }

1
gophernicus.h
View File

@ -348,6 +348,7 @@ typedef struct {
char opt_vhost; char opt_vhost;
char opt_query; char opt_query;
char opt_caps; char opt_caps;
char opt_status;
char opt_shm; char opt_shm;
char opt_root; char opt_root;
char opt_proxy; char opt_proxy;

1
options.c
View File

@ -140,6 +140,7 @@ void parse_args(state *st, int argc, char *argv[])
if (*optarg == 'q') { st->opt_query = FALSE; break; } if (*optarg == 'q') { st->opt_query = FALSE; break; }
if (*optarg == 's') { st->opt_syslog = FALSE; break; } if (*optarg == 's') { st->opt_syslog = FALSE; break; }
if (*optarg == 'a') { st->opt_caps = FALSE; break; } if (*optarg == 'a') { st->opt_caps = FALSE; break; }
if (*optarg == 't') { st->opt_status = FALSE; break; }
if (*optarg == 'm') { st->opt_shm = FALSE; break; } if (*optarg == 'm') { st->opt_shm = FALSE; break; }
if (*optarg == 'r') { st->opt_root = FALSE; break; } if (*optarg == 'r') { st->opt_root = FALSE; break; }
if (*optarg == 'p') { st->opt_proxy = FALSE; break; } if (*optarg == 'p') { st->opt_proxy = FALSE; break; }