nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/636'

Browse Source
This commit is contained in:
David Goulet 2022-10-31 14:15:00 -04:00
commit 3596d193be
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket40691 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (relay):
- Do not warn about configuration options that may expose a non-anonymous
onion service. Closes ticket 40691.

7
src/feature/relay/relay_config.c
View File

@ -33,6 +33,7 @@
#include "core/or/port_cfg_st.h" #include "core/or/port_cfg_st.h"
#include "feature/hibernate/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "feature/hs/hs_service.h"
#include "feature/nodelist/nickname.h" #include "feature/nodelist/nickname.h"
#include "feature/stats/geoip_stats.h" #include "feature/stats/geoip_stats.h"
#include "feature/stats/predict_ports.h" #include "feature/stats/predict_ports.h"
@ -942,7 +943,8 @@ options_validate_relay_accounting(const or_options_t *old_options,
if (accounting_parse_options(options, 1)<0) if (accounting_parse_options(options, 1)<0)
REJECT("Failed to parse accounting options. See logs for details."); REJECT("Failed to parse accounting options. See logs for details.");
if (options->AccountingMax) { if (options->AccountingMax &&
!hs_service_non_anonymous_mode_enabled(options)) {
if (options->RendConfigLines && server_mode(options)) { if (options->RendConfigLines && server_mode(options)) {
log_warn(LD_CONFIG, "Using accounting with a hidden service and an " log_warn(LD_CONFIG, "Using accounting with a hidden service and an "
"ORPort is risky: your hidden service(s) and your public " "ORPort is risky: your hidden service(s) and your public "
@ -1118,7 +1120,8 @@ options_validate_relay_mode(const or_options_t *old_options,
if (BUG(!msg)) if (BUG(!msg))
return -1; return -1;
if (server_mode(options) && options->RendConfigLines) if (server_mode(options) && options->RendConfigLines &&
!hs_service_non_anonymous_mode_enabled(options))
log_warn(LD_CONFIG, log_warn(LD_CONFIG,
"Tor is currently configured as a relay and a hidden service. " "Tor is currently configured as a relay and a hidden service. "
"That's not very secure: you should probably run your hidden service " "That's not very secure: you should probably run your hidden service "