From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 4 Jan 2015 22:28:54 +0000 (-0500)
Subject: Prevent changes to other options from removing . from AutomapHostsSuffixes
X-Git-Tag: tor-0.2.6.3-alpha~201^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ef6cdc39f047a7579858a6e23629c1c2718fc0a;p=thirdparty%2Ftor.git

Prevent changes to other options from removing . from AutomapHostsSuffixes

This happened because we changed AutomapHostsSuffixes to replace "."
with "", since a suffix of "" means "match everything."  But our
option handling code for CSV options likes to remove empty entries
when it re-parses stuff.

Instead, let "." remain ".", and treat it specially when we're
checking for a match.

Fixes bug 12509; bugfix on 0.2.0.1-alpha.
---

diff --git a/changes/bug12509 b/changes/bug12509
new file mode 100644
index 0000000000..8d5c1dd484
--- /dev/null
+++ b/changes/bug12509
@@ -0,0 +1,4 @@
+
+  o Minor bugfixes (automapping):
+    - Prevent changes to other optoins from removing the wildcard value "."
+      from "AutomapHostsSuffixes".
diff --git a/src/or/addressmap.c b/src/or/addressmap.c
index 998770a3db..279132e97c 100644
--- a/src/or/addressmap.c
+++ b/src/or/addressmap.c
@@ -226,6 +226,8 @@ addressmap_address_should_automap(const char *address,
     return 0;
 
   SMARTLIST_FOREACH_BEGIN(suffix_list, const char *, suffix) {
+    if (!strcmp(suffix, "."))
+      return 1;
     if (!strcasecmpend(address, suffix))
       return 1;
   } SMARTLIST_FOREACH_END(suffix);
diff --git a/src/or/config.c b/src/or/config.c
index 892108278e..b047b12717 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3398,15 +3398,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
                                  AF_INET6, 1, msg)<0)
     return -1;
 
-  if (options->AutomapHostsSuffixes) {
-    SMARTLIST_FOREACH(options->AutomapHostsSuffixes, char *, suf,
-    {
-      size_t len = strlen(suf);
-      if (len && suf[len-1] == '.')
-        suf[len-1] = '\0';
-    });
-  }
-
   if (options->TestingTorNetwork &&
       !(options->DirAuthorities ||
         (options->AlternateDirAuthority &&
diff --git a/src/or/or.h b/src/or/or.h
index 1609587717..66d10ac436 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3646,8 +3646,9 @@ typedef struct {
                               * hostname ending with one of the suffixes in
                               * <b>AutomapHostsSuffixes</b>, map it to a
                               * virtual address. */
-  smartlist_t *AutomapHostsSuffixes; /**< List of suffixes for
-                                      * <b>AutomapHostsOnResolve</b>. */
+  /** List of suffixes for <b>AutomapHostsOnResolve</b>.  The special value
+   * "." means "match everything." */
+  smartlist_t *AutomapHostsSuffixes;
   int RendPostPeriod; /**< How often do we post each rendezvous service
                        * descriptor? Remember to publish them independently. */
   int KeepalivePeriod; /**< How often do we send padding cells to keep