commit a3fe8b11663a32f1f007bd7cb0b9656825093544 Author: Sathyanarayanan Gunasekaran gsathya.ceg@gmail.com Date: Mon Jul 21 21:16:58 2014 -0700
Warn if Tor is a relay and a HS
Closes 12908; see #8742 --- changes/bug12908 | 4 ++++ src/or/config.c | 7 +++++++ 2 files changed, 11 insertions(+)
diff --git a/changes/bug12908 b/changes/bug12908 new file mode 100644 index 0000000..bd6784c --- /dev/null +++ b/changes/bug12908 @@ -0,0 +1,4 @@ + o Minor features: + - Warn about attempts to run hidden services and relays in the + same process: that's probably not a good idea. Closes ticket + 12908. diff --git a/src/or/config.c b/src/or/config.c index 6bb6209..c006bc2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2563,6 +2563,13 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Can't use a relative path to torrc when RunAsDaemon is set."); #endif
+ if (server_mode(options) && options->RendConfigLines) + log_warn(LD_CONFIG, + "Tor is currently configured as a relay and a hidden service. " + "That's not very secure: you should probably run your hidden service " + "in a separate Tor process, at least -- see " + "https://trac.torproject.org/8742"); + /* XXXX require that the only port not be DirPort? */ /* XXXX require that at least one port be listened-upon. */ if (n_ports == 0 && !options->RendConfigLines)