diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-04-22 16:33:06 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-04-22 16:33:06 +0000 |
| commit | 2fd8c928b39ef1dffd3c2df838003d2a5a7379e1 (patch) | |
| tree | 9dbb20801867920ecf00123ba0f9fd39036d66ec | |
| parent | a25b424d4b52096efa9cf0341cc6ed278c7b6c18 (diff) | |
| download | tor-2fd8c928b39ef1dffd3c2df838003d2a5a7379e1.tar.gz tor-2fd8c928b39ef1dffd3c2df838003d2a5a7379e1.zip | |
r15274@tombo: nickm | 2008-04-22 12:32:48 -0400
Backport: apply patch from lodger: reject requests for reverse-dns lookup of names in private address space. make non-exits reject all dns requests. Fixes bug 619.
svn:r14411
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/or/dns.c | 14 |
2 files changed, 17 insertions, 3 deletions
@@ -28,6 +28,12 @@ Changes in version 0.2.0.24-rc - 2008-04-0? nwf, bugfix on 0.2.0.16-alpha. - Warn less verbosely about clock skew from netinfo cells from untrusted sources. Fixes bug 663. + - Non-exit relays no longer allow DNS requests. Fixes bug 619. + Patch from Lodger. + + o Minor features (security): + - Reject requests for reverse-dns lookup of names in a private + address space. Patch from Lodger. Changes in version 0.2.0.23-rc - 2008-03-24 diff --git a/src/or/dns.c b/src/or/dns.c index e6347c5e00..041ae74bc0 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -549,9 +549,14 @@ dns_resolve(edge_connection_t *exitconn) or_circuit_t *oncirc = TO_OR_CIRCUIT(exitconn->on_circuit); int is_resolve, r; char *hostname = NULL; + routerinfo_t *me = router_get_my_routerinfo(); is_resolve = exitconn->_base.purpose == EXIT_PURPOSE_RESOLVE; - r = dns_resolve_impl(exitconn, is_resolve, oncirc, &hostname); + if (is_resolve && me && + policy_is_reject_star(me->exit_policy)) /* non-exit */ + r = -1; + else + r = dns_resolve_impl(exitconn, is_resolve, oncirc, &hostname); switch (r) { case 1: /* We got an answer without a lookup -- either the answer was @@ -660,9 +665,12 @@ dns_resolve_impl(edge_connection_t *exitconn, int is_resolve, * .in-addr.arpa address but this isn't a resolve request, kill the * connection. */ - if ((r = parse_inaddr_arpa_address(exitconn->_base.address, NULL)) != 0) { - if (r == 1) + if ((r = parse_inaddr_arpa_address(exitconn->_base.address, &in)) != 0) { + if (r == 1) { is_reverse = 1; + if (is_internal_IP(ntohl(in.s_addr), 0)) /* internal address */ + return -1; + } if (!is_reverse || !is_resolve) { if (!is_reverse) |