[tor-commits] [tor/master] Help users who try to use v2 client auth in v3 onions.

[nickm at torproject.org]

commit e8e42f4af97190d5df0b5fa1895f74194650df0b
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Oct 1 13:40:04 2019 +0300

    Help users who try to use v2 client auth in v3 onions.
---
 changes/bug28966           |  4 ++++
 src/feature/hs/hs_config.c | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/changes/bug28966 b/changes/bug28966
new file mode 100644
index 000000000..61123a21e
--- /dev/null
+++ b/changes/bug28966
@@ -0,0 +1,4 @@
+  o Minor features (onion services v3):
+    - Assist users who try to setup v2 client authorization in v3 onion
+      services by pointing them to the right documentation. Closes ticket
+      28966.
diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c
index 7424d7d3c..3b6caaec6 100644
--- a/src/feature/hs/hs_config.c
+++ b/src/feature/hs/hs_config.c
@@ -253,6 +253,16 @@ config_has_invalid_options(const config_line_t *line_,
                             "version %" PRIu32 " of service in %s",
                  opt, service->config.version,
                  service->config.directory_path);
+
+        if (!strcasecmp(line->key, "HiddenServiceAuthorizeClient")) {
+          /* Special case this v2 option so that we can offer alternatives.
+           * If more such special cases appear, it would be good to
+           * generalize the exception mechanism here. */
+          log_warn(LD_CONFIG, "For v3 onion service client authorization, "
+                   "please read the 'CLIENT AUTHORIZATION' section in the "
+                   "manual.");
+        }
+
         ret = 1;
         /* Continue the loop so we can find all possible options. */
         continue;