bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed to rotating the log file instead of truncating it. Also using the

Browse Source 
create_file_safely() function to eliminate potential security problems.
This commit is contained in:
Robert James Kaes 2001-09-15 21:29:22 +00:00
parent d2ddca583e
commit d3213f193c
1 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/tinyproxy.c
View File

@ -1,4 +1,4 @@
/* $Id: tinyproxy.c,v 1.14 2001-09-07 04:20:26 rjkaes Exp $ /* $Id: tinyproxy.c,v 1.15 2001-09-15 21:29:22 rjkaes Exp $
* *
* The initialise routine. Basically sets up all the initial stuff (logfile, * The initialise routine. Basically sets up all the initial stuff (logfile,
* listening socket, config options, etc.) and then sits there and loops * listening socket, config options, etc.) and then sits there and loops
@ -62,11 +62,40 @@ void takesig(int sig)
{ {
switch (sig) { switch (sig) {
case SIGHUP: case SIGHUP:
if (config.logf)
ftruncate(fileno(config.logf), 0);
log_message(LOG_NOTICE, "SIGHUP received, cleaning up."); log_message(LOG_NOTICE, "SIGHUP received, cleaning up.");
if (config.logf) {
char *rename_file;
int log_file_fd;
rename_file = safemalloc(strlen(config.logf_name) + 5);
if (!rename_file) {
fprintf(stderr, "Could not allocate memory in signal handler!\n");
exit(EX_OSERR);
}
strcpy(rename_file, config.logf_name);
strcat(rename_file, ".rot");
rename(config.logf_name, rename_file);
log_file_fd = create_file_safely(config.logf_name);
if (log_file_fd < 0) {
fprintf(stderr, "Could not safely create new log file.\n");
exit(EX_OSERR);
}
fclose(config.logf);
if (!(config.logf = fdopen(log_file_fd, "w"))) {
fprintf(stderr, "Could not create new log file.\n");
exit(EX_CANTCREAT);
}
log_message(LOG_NOTICE, "Log file rotated.");
safefree(rename_file);
}
#ifdef FILTER_ENABLE #ifdef FILTER_ENABLE
if (config.filter) { if (config.filter) {
filter_destroy(); filter_destroy();
@ -219,15 +248,22 @@ int main(int argc, char **argv)
/* Open the log file if not using syslog */ /* Open the log file if not using syslog */
if (config.syslog == FALSE) { if (config.syslog == FALSE) {
int log_file_fd;
if (!config.logf_name) { if (!config.logf_name) {
fprintf(stderr, "%s: You MUST set a LogFile in the configuration file.\n", argv[0]); fprintf(stderr, "%s: You MUST set a LogFile in the configuration file.\n", argv[0]);
exit(EX_SOFTWARE); exit(EX_SOFTWARE);
} }
if (!(config.logf = fopen(config.logf_name, "a"))) { log_file_fd = create_file_safely(config.logf_name);
fprintf(stderr, if (log_file_fd < 0) {
"Could not append to log file \"%s\".\n", fprintf(stderr, "Could not safely create logfile \"%s\".\n", config.logf_name);
config.logf_name); exit(EX_CANTCREAT);
}
config.logf = fdopen(log_file_fd, "w");
if (!config.logf) {
fprintf(stderr, "Could not write to log file \"%s\".\n", config.logf_name);
exit(EX_CANTCREAT); exit(EX_CANTCREAT);
} }
} else { } else {