From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Sep 2011 16:04:34 +0000 (-0400)
Subject: Forbid remapping of *
X-Git-Tag: tor-0.2.3.9-alpha~27^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff3eb8e023f79edf7b04bf12f770bb3df558c033;p=thirdparty%2Ftor.git

Forbid remapping of *

It might be nice to support this someday, but for now it would fail
with an infinite remap cycle.  (If I say "remap * *.foo.exit",
then example.com ->
     example.com.foo.exit ->
     example.com.foo.exit.foo.exit ->
     example.com.foo.exit.foo.exit.foo.exit -> ...)
---

diff --git a/src/or/config.c b/src/or/config.c
index ef54dcbff2..f841f932c5 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4477,6 +4477,11 @@ config_register_addressmaps(const or_options_t *options)
       goto cleanup;
     }
 
+    if (!strcmp(to, "*") || !strcmp(from, "*")) {
+      log_warn(LD_CONFIG,"MapAddress '%s' is unsupported - can't remap from "
+               "or to *. Ignoring.",opt->value);
+      goto cleanup;
+    }
     /* Detect asterisks in expressions of type: '*.example.com' */
     if (!strncmp(from,"*.",2)) {
       from += 2;