nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 21:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue in my mapaddress domains code spotted by arma

Browse Source 
MapAddress *.torproject.org torproject.org would have been interpreted
as a map from a domain to itself, and would have cleared the mapping.
Now we require not only a match of domains, but of wildcards.
This commit is contained in:
Nick Mathewson 2011-11-25 20:13:55 -05:00
parent 04c622d720
commit 66859e2d4a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/connection_edge.c
View File

@ -1178,15 +1178,18 @@ addressmap_have_mapping(const char *address, int update_expiry)
* <b>new_address</b> should be a newly dup'ed string, which we'll use or * <b>new_address</b> should be a newly dup'ed string, which we'll use or
* free as appropriate. We will leave address alone. * free as appropriate. We will leave address alone.
* *
* If <b>new_address</b> is NULL, or equal to <b>address</b>, remove
* any mappings that exist from <b>address</b>.
*
* If <b>wildcard_addr</b> is true, then the mapping will match any address * If <b>wildcard_addr</b> is true, then the mapping will match any address
* equal to <b>address</b>, or any address ending with a period followed by * equal to <b>address</b>, or any address ending with a period followed by
* <b>address</b>. If <b>wildcard_addr</b> and <b>wildcard_new_addr</b> are * <b>address</b>. If <b>wildcard_addr</b> and <b>wildcard_new_addr</b> are
* both true, the mapping will rewrite addresses that end with * both true, the mapping will rewrite addresses that end with
* ".<b>address</b>" into ones that end with ".<b>new_address</b>." * ".<b>address</b>" into ones that end with ".<b>new_address</b>."
* *
* If <b>new_address</b> is NULL, or <b>new_address</b> is equal to
* <b>address</b> and <b>wildcard_addr</b> is equal to
* <b>wildcard_new_addr</b>, remove any mappings that exist from
* <b>address</b>.
*
*
* It is an error to set <b>wildcard_new_addr</b> if <b>wildcard_addr</b> is * It is an error to set <b>wildcard_new_addr</b> if <b>wildcard_addr</b> is
* not set. */ * not set. */
void void
@ -1201,7 +1204,8 @@ addressmap_register(const char *address, char *new_address, time_t expires,
tor_assert(wildcard_addr); tor_assert(wildcard_addr);
ent = strmap_get(addressmap, address); ent = strmap_get(addressmap, address);
if (!new_address || !strcasecmp(address,new_address)) { if (!new_address || (!strcasecmp(address,new_address) &&
wildcard_addr == wildcard_new_addr)) {
/* Remove the mapping, if any. */ /* Remove the mapping, if any. */
tor_free(new_address); tor_free(new_address);
if (ent) { if (ent) {