nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

let the user configure a sockslistenaddress on other private IPs

Browse Source 
besides 127.x.y.z without complaining.
and give a better message in the log.


svn:r5544
This commit is contained in:
Roger Dingledine 2005-12-09 02:46:46 +00:00
parent c0a6e2232c
commit a438f2abcd
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/or/config.c
View File

@ -1420,7 +1420,7 @@ resolve_my_address(or_options_t *options, uint32_t *addr_out, char **hostname_ou
} }
tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf)); tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf));
if (is_internal_IP(htonl(in.s_addr)) && !options->NoPublish) { if (is_internal_IP(htonl(in.s_addr), 0) && !options->NoPublish) {
/* make sure we're ok with publishing an internal IP */ /* make sure we're ok with publishing an internal IP */
if (!options->DirServers) { if (!options->DirServers) {
/* if they are using the default dirservers, disallow internal IPs always. */ /* if they are using the default dirservers, disallow internal IPs always. */
@ -1744,8 +1744,8 @@ options_validate(or_options_t *old_options, or_options_t *options)
int result = 0; int result = 0;
config_line_t *cl; config_line_t *cl;
addr_policy_t *addr_policy=NULL; addr_policy_t *addr_policy=NULL;
#define REJECT(arg) do { log(LOG_WARN, LD_CONFIG, arg); result = -1; } while (0) #define REJECT(arg...) do { log(LOG_WARN, LD_CONFIG, arg); result = -1; } while (0)
#define COMPLAIN(arg) do { log(LOG_WARN, LD_CONFIG, arg); } while (0) #define COMPLAIN(arg...) do { log(LOG_WARN, LD_CONFIG, arg); } while (0)
if (options->ORPort < 0 || options->ORPort > 65535) if (options->ORPort < 0 || options->ORPort > 65535)
REJECT("ORPort option out of bounds."); REJECT("ORPort option out of bounds.");
@ -1764,20 +1764,18 @@ options_validate(or_options_t *old_options, or_options_t *options)
if (options->SocksListenAddress) { if (options->SocksListenAddress) {
config_line_t *line = NULL; config_line_t *line = NULL;
int binding_on_public_addr = 0; char *address = NULL;
for (line = options->SocksListenAddress; line; line = line->next) { for (line = options->SocksListenAddress; line; line = line->next) {
uint16_t port; uint16_t port;
uint32_t addr; uint32_t addr;
if (parse_addr_port(line->value, NULL, &addr, &port)<0) if (parse_addr_port(line->value, &address, &addr, &port)<0)
continue; /* We'll warn about this later. */ continue; /* We'll warn about this later. */
if ((addr & 0xff000000u) != 0x7f000000u) if (!is_internal_IP(addr, 1) &&
binding_on_public_addr = 1;
}
if (binding_on_public_addr &&
(!old_options || !config_lines_eq(old_options->SocksListenAddress, (!old_options || !config_lines_eq(old_options->SocksListenAddress,
options->SocksListenAddress))) { options->SocksListenAddress))) {
/* XXXX This should be a better warning. */ COMPLAIN("You specified a public address '%s' for a SOCKS listener. Other people on the Internet might find your computer and use it as an open SOCKS proxy. Please don't allow this unless you have a good reason.", address);
COMPLAIN("Binding to a public address for SOCKS listener."); }
tor_free(address);
} }
} }

2
src/or/dirserv.c
View File

@ -399,7 +399,7 @@ dirserv_router_has_valid_address(routerinfo_t *ri)
ri->nickname, ri->address); ri->nickname, ri->address);
return -1; return -1;
} }
if (is_internal_IP(ntohl(iaddr.s_addr))) { if (is_internal_IP(ntohl(iaddr.s_addr), 0)) {
info(LD_DIRSERV, info(LD_DIRSERV,
"Router '%s' published internal IP address '%s'. Refusing.", "Router '%s' published internal IP address '%s'. Refusing.",
ri->nickname, ri->address); ri->nickname, ri->address);