mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bug14018'

Browse Source
This commit is contained in:
Nick Mathewson 2015-03-24 14:36:23 -04:00
commit 112c554fcf
2 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug14018 Normal file
View File

@ -0,0 +1,4 @@
o Minor features:
- Complain (i.e. print a warning) whenever we find a relative
file path being used as torrc option. Resolves issue 14018.

64
src/or/config.c
View File

@ -2566,6 +2566,62 @@ options_validate_cb(void *old_options, void *options, void *default_options,
from_setconf, msg);
}
#define REJECT(arg) \
STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END
#define COMPLAIN(args...) \
STMT_BEGIN log_warn(LD_CONFIG, args); STMT_END
/** Log a warning message iff <b>filepath</b> is not absolute.
* Warning message must contain option name <b>option</b> and
* an absolute path that <b>filepath<b> will resolve to.
*
* In case <b>filepath</b> is absolute, do nothing.
*/
static void
warn_if_option_path_is_relative(const char *option,
char *filepath)
{
if (filepath &&path_is_relative(filepath))
COMPLAIN("Path for %s (%s) is relative and will resolve to %s."
" Is this what you wanted?",option,filepath,
make_path_absolute(filepath));
}
/** Scan <b>options</b> for occurances of relative file/directory
* path and log a warning whenever it is found.
*/
static void
warn_about_relative_paths(or_options_t *options)
{
tor_assert(options);
warn_if_option_path_is_relative("CookieAuthFile",
options->CookieAuthFile);
warn_if_option_path_is_relative("ExtORPortCookieAuthFile",
options->ExtORPortCookieAuthFile);
warn_if_option_path_is_relative("DirPortFrontPage",
options->DirPortFrontPage);
warn_if_option_path_is_relative("PortForwardingHelper",
options->PortForwardingHelper);
warn_if_option_path_is_relative("V3BandwidthsFile",
options->V3BandwidthsFile);
warn_if_option_path_is_relative("ControlPortWriteToFile",
options->ControlPortWriteToFile);
warn_if_option_path_is_relative("GeoIPFile",options->GeoIPFile);
warn_if_option_path_is_relative("GeoIPv6File",options->GeoIPv6File);
warn_if_option_path_is_relative("Log",options->DebugLogFile);
warn_if_option_path_is_relative("AccelDir",options->AccelDir);
warn_if_option_path_is_relative("Log",options->DebugLogFile);
warn_if_option_path_is_relative("DataDirectory",options->DataDirectory);
warn_if_option_path_is_relative("PidFile",options->PidFile);
for (config_line_t *hs_line = options->RendConfigLines; hs_line;
hs_line = hs_line->next) {
if (!strcasecmp(hs_line->key, "HiddenServiceDir"))
warn_if_option_path_is_relative("HiddenServiceDir",hs_line->value);
}
}
/** Return 0 if every setting in <b>options</b> is reasonable, is a
* permissible transition from <b>old_options</b>, and none of the
* testing-only settings differ from <b>default_options</b> unless in
@ -2587,13 +2643,12 @@ options_validate(or_options_t *old_options, or_options_t *options,
config_line_t *cl;
const char *uname = get_uname();
int n_ports=0;
#define REJECT(arg) \
STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END
#define COMPLAIN(arg) STMT_BEGIN log_warn(LD_CONFIG, arg); STMT_END
tor_assert(msg);
*msg = NULL;
warn_about_relative_paths(options);
if (server_mode(options) &&
(!strcmpstart(uname, "Windows 95") ||
!strcmpstart(uname, "Windows 98") ||
@ -3755,9 +3810,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
"combination.");
return 0;
}
#undef REJECT
#undef COMPLAIN
}
/* Given the value that the user has set for MaxMemInQueues, compute the
* actual maximum value. We clip this value if it's too low, and autodetect