[tor-commits] [tor] branch main updated: relay: Skip warnings for single onion services

[gitolite role]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main
in repository tor.

The following commit(s) were added to refs/heads/main by this push:
     new 7e80ad4787 relay: Skip warnings for single onion services
     new 3596d193be Merge branch 'tor-gitlab/mr/636'
7e80ad4787 is described below

commit 7e80ad47878101136040e568eae8b68a78996732
Author: Jeremy Saklad <jeremy at saklad5.com>
AuthorDate: Fri Oct 21 08:07:43 2022 -0500

    relay: Skip warnings for single onion services
    
    Single onion services are not secret, so there is no added risk from
    using accounting or running a relay in the same instance.
    
    Related to #40691
---
 changes/ticket40691              | 3 +++
 src/feature/relay/relay_config.c | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/ticket40691 b/changes/ticket40691
new file mode 100644
index 0000000000..f1c518fc18
--- /dev/null
+++ b/changes/ticket40691
@@ -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.
diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c
index 85ccfc18a7..aa9d48beac 100644
--- a/src/feature/relay/relay_config.c
+++ b/src/feature/relay/relay_config.c
@@ -33,6 +33,7 @@
 #include "core/or/port_cfg_st.h"
 
 #include "feature/hibernate/hibernate.h"
+#include "feature/hs/hs_service.h"
 #include "feature/nodelist/nickname.h"
 #include "feature/stats/geoip_stats.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)
     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)) {
       log_warn(LD_CONFIG, "Using accounting with a hidden service and an "
                "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))
     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,
         "Tor is currently configured as a relay and a hidden service. "
         "That's not very secure: you should probably run your hidden service "

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.