July 2012 - tor-commits - lists.torproject.org

[flashproxy/master] Remove Flash /crossdomain.xml from facilitator.
by dcf＠torproject.org 04 Jul '12

04 Jul '12

commit 540fda8e1f1f07567accf1972b7cfb39323f2f03 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 04:12:34 2012 -0700 Remove Flash /crossdomain.xml from facilitator. --- facilitator.py | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/facilitator.py b/facilitator.py index 83de49b..5ab7449 100755 --- a/facilitator.py +++ b/facilitator.py @@ -190,10 +190,6 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): path = urlparse.urlsplit(self.path)[2] - if path == u"/crossdomain.xml": - self.send_crossdomain() - return - reg = REGS.fetch() if reg: log(u"proxy %s gets %s, relay %s (now %d)" % @@ -235,19 +231,6 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_response(200) self.end_headers() - def send_crossdomain(self): - crossdomain = """\ -<cross-domain-policy> -<allow-access-from domain="*"/> -</cross-domain-policy> -""" - self.send_response(200) - # Content-Type must be one of a few whitelisted types. - # http://www.adobe.com/devnet/flashplayer/articles/fplayer9_security.html#_Co… - self.send_header("Content-Type", "application/xml") - self.end_headers() - self.wfile.write(crossdomain) - def send_error(self, code, message = None): self.send_response(code) self.end_headers()

1 0

[flashproxy/master] Factor out client reg sending.
by dcf＠torproject.org 04 Jul '12

04 Jul '12

commit f99c686d4a6ab7296a5023338944b1b88d8a48bc Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 05:10:32 2012 -0700 Factor out client reg sending. --- facilitator.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/facilitator.py b/facilitator.py index 040d189..be3436c 100755 --- a/facilitator.py +++ b/facilitator.py @@ -201,10 +201,9 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): if reg: log(u"proxy %s gets %s, relay %s (now %d)" % (safe_str(proxy_addr_s), safe_str(unicode(reg)), options.relay_spec, len(REGS))) - self.send_client(reg) else: log(u"proxy %s gets none" % safe_str(proxy_addr_s)) - self.send_client(None) + self.send_client(reg) def do_POST(self): client_addr_s = format_addr(self.client_address)

1 0

[flashproxy/master] Remove the "proxy connects" log message.
by dcf＠torproject.org 04 Jul '12

04 Jul '12

commit 7d047b2e4ad56b1c652c16a1ef76739ee021addb Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 05:10:17 2012 -0700 Remove the "proxy connects" log message. --- facilitator.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/facilitator.py b/facilitator.py index ed06301..040d189 100755 --- a/facilitator.py +++ b/facilitator.py @@ -195,8 +195,6 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): def do_GET(self): proxy_addr_s = format_addr(self.client_address) - log(u"proxy %s connects" % safe_str(proxy_addr_s)) - path = urlparse.urlsplit(self.path)[2] reg = REGS.fetch()

1 0

[flashproxy/master] Don't log anything for a broken pipe.
by dcf＠torproject.org 04 Jul '12

04 Jul '12

commit 67b1ad61f81ff75e9bc5ee35e73382e4129f7469 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 05:14:45 2012 -0700 Don't log anything for a broken pipe. --- facilitator.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/facilitator.py b/facilitator.py index be3436c..0a6a018 100755 --- a/facilitator.py +++ b/facilitator.py @@ -292,7 +292,6 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): raise if err_num != errno.EPIPE: raise - log(u"%s broken pipe" % safe_str(format_addr(self.client_address))) return ret handle = catch_epipe(BaseHTTPServer.BaseHTTPRequestHandler.handle) finish = catch_epipe(BaseHTTPServer.BaseHTTPRequestHandler.finish)

1 0

[flashproxy/master] Get rid of the "resp" log messsages.
by dcf＠torproject.org 04 Jul '12

04 Jul '12

commit feb36e3a89595cf3c386ea73a34a640df58c5272 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 05:22:27 2012 -0700 Get rid of the "resp" log messsages. --- facilitator.py | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/facilitator.py b/facilitator.py index 3347624..64de7a6 100755 --- a/facilitator.py +++ b/facilitator.py @@ -242,13 +242,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): self.wfile.write(message) def log_request(self, code): - addr_s = format_addr(self.client_address) - try: - referer = self.headers["Referer"] - except (AttributeError, KeyError): - referer = "-" - log(u"resp %s %s %d" - % (safe_str(addr_s), repr(self.requestline), code)) + pass def log_message(self, format, *args): msg = format % args

1 0

[flashproxy/master] Get rid of the "client regs" message.
by dcf＠torproject.org 04 Jul '12

04 Jul '12

commit 811284b37b3174e5d33aa0d56da2f19b4bdbc7eb Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 05:20:42 2012 -0700 Get rid of the "client regs" message. --- facilitator.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/facilitator.py b/facilitator.py index 0a6a018..3347624 100755 --- a/facilitator.py +++ b/facilitator.py @@ -225,8 +225,6 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_error(400) return - log(u"client %s regs %s -> %s" - % (safe_str(client_addr_s), safe_str(repr(client_spec)), safe_str(unicode(reg)))) if REGS.add(reg): log(u"client %s %s (now %d)" % (safe_str(client_addr_s), safe_str(unicode(reg)), len(REGS)))

1 0

[flashproxy/master] Don't log referrers.
by dcf＠torproject.org 04 Jul '12

04 Jul '12

commit 65c9abd53c2976d74dcd46e765f60d779d6f656a Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 05:09:32 2012 -0700 Don't log referrers. This is useless anyway because it is either blank or else the URL of the embed.html. --- facilitator.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/facilitator.py b/facilitator.py index 582dbd8..ed06301 100755 --- a/facilitator.py +++ b/facilitator.py @@ -252,8 +252,8 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): referer = self.headers["Referer"] except (AttributeError, KeyError): referer = "-" - log(u"resp %s %s %d %s" - % (safe_str(addr_s), repr(self.requestline), code, repr(referer))) + log(u"resp %s %s %d" + % (safe_str(addr_s), repr(self.requestline), code)) def log_message(self, format, *args): msg = format % args

1 0

[flashproxy/master] Scrub IP addresses by default in the facilitator.
by dcf＠torproject.org 04 Jul '12

04 Jul '12

commit 5a58e0c1d9d5da1b0c1983360b88ad8bea13575e Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 05:08:00 2012 -0700 Scrub IP addresses by default in the facilitator. Add an --unsafe-logging option to retain addresses. --- facilitator.py | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/facilitator.py b/facilitator.py index 5ab7449..582dbd8 100755 --- a/facilitator.py +++ b/facilitator.py @@ -27,6 +27,7 @@ class options(object): relay_spec = None daemonize = True pid_filename = None + safe_logging = True @staticmethod def set_relay_spec(spec): @@ -45,7 +46,8 @@ and serve them out again with HTTP GET. Listen on HOST and PORT, by default -h, --help show this help. -l, --log FILENAME write log to FILENAME (default \"%(log)s\"). --pidfile FILENAME write PID to FILENAME after daemonizing. - -r, --relay RELAY send RELAY (host:port) to proxies as the relay to use.\ + -r, --relay RELAY send RELAY (host:port) to proxies as the relay to use. + --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], "addr": DEFAULT_ADDRESS, @@ -53,6 +55,13 @@ and serve them out again with HTTP GET. Listen on HOST and PORT, by default "log": DEFAULT_LOG_FILENAME, } +def safe_str(s): + """Return s if options.safe_logging is true, and "[scrubbed]" otherwise.""" + if options.safe_logging: + return "[scrubbed]" + else: + return s + log_lock = threading.Lock() def log(msg): log_lock.acquire() @@ -186,17 +195,17 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): def do_GET(self): proxy_addr_s = format_addr(self.client_address) - log(u"proxy %s connects" % proxy_addr_s) + log(u"proxy %s connects" % safe_str(proxy_addr_s)) path = urlparse.urlsplit(self.path)[2] reg = REGS.fetch() if reg: log(u"proxy %s gets %s, relay %s (now %d)" % - (proxy_addr_s, unicode(reg), options.relay_spec, len(REGS))) + (safe_str(proxy_addr_s), safe_str(unicode(reg)), options.relay_spec, len(REGS))) self.send_client(reg) else: - log(u"proxy %s gets none" % proxy_addr_s) + log(u"proxy %s gets none" % safe_str(proxy_addr_s)) self.send_client(None) def do_POST(self): @@ -207,7 +216,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): client_spec = data.getfirst("client") if client_spec is None: - log(u"client %s missing \"client\" param" % client_addr_s) + log(u"client %s missing \"client\" param" % safe_str(client_addr_s)) self.send_error(400) return @@ -215,18 +224,18 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): reg = Reg.parse(client_spec, self.client_address[0]) except ValueError, e: log(u"client %s syntax error in %s: %s" - % (client_addr_s, repr(client_spec), repr(str(e)))) + % (safe_str(client_addr_s), safe_str(repr(client_spec)), repr(str(e)))) self.send_error(400) return log(u"client %s regs %s -> %s" - % (client_addr_s, repr(client_spec), unicode(reg))) + % (safe_str(client_addr_s), safe_str(repr(client_spec)), safe_str(unicode(reg)))) if REGS.add(reg): log(u"client %s %s (now %d)" - % (client_addr_s, unicode(reg), len(REGS))) + % (safe_str(client_addr_s), safe_str(unicode(reg)), len(REGS))) else: log(u"client %s %s (already present, now %d)" - % (client_addr_s, unicode(reg), len(REGS))) + % (safe_str(client_addr_s), safe_str(unicode(reg)), len(REGS))) self.send_response(200) self.end_headers() @@ -244,7 +253,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): except (AttributeError, KeyError): referer = "-" log(u"resp %s %s %d %s" - % (addr_s, repr(self.requestline), code, repr(referer))) + % (safe_str(addr_s), repr(self.requestline), code, repr(referer))) def log_message(self, format, *args): msg = format % args @@ -286,7 +295,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): raise if err_num != errno.EPIPE: raise - log(u"%s broken pipe" % format_addr(self.client_address)) + log(u"%s broken pipe" % safe_str(format_addr(self.client_address))) return ret handle = catch_epipe(BaseHTTPServer.BaseHTTPRequestHandler.handle) finish = catch_epipe(BaseHTTPServer.BaseHTTPRequestHandler.finish) @@ -294,7 +303,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): REGS = RegSet() opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:r:", - ["debug", "help", "log=", "pidfile=", "relay="]) + ["debug", "help", "log=", "pidfile=", "relay=", "unsafe-logging"]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False @@ -312,6 +321,8 @@ for o, a in opts: except socket.gaierror, e: print >> sys.stderr, u"Can't resolve relay %s: %s" % (repr(a), str(e)) sys.exit(1) + elif o == "--unsafe-logging": + options.safe_logging = False if not options.relay_spec: print >> sys.stderr, """\

1 0

[vidalia/alpha] Display node fp in the network map
by chiiph＠torproject.org 04 Jul '12

04 Jul '12

commit 4fdc1b330e77f6f878c77a9eb04e748a4ef8e568 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jul 3 20:18:32 2012 -0300 Display node fp in the network map --- changes/bug2726 | 3 +++ src/vidalia/network/RouterDescriptorView.cpp | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug2726 b/changes/bug2726 new file mode 100644 index 0000000..fbe2380 --- /dev/null +++ b/changes/bug2726 @@ -0,0 +1,3 @@ + New features: + o Display node fingerprint in the details panel in the Network Map. Resolves + ticket 2726. diff --git a/src/vidalia/network/RouterDescriptorView.cpp b/src/vidalia/network/RouterDescriptorView.cpp index 2ef48eb..22116c8 100644 --- a/src/vidalia/network/RouterDescriptorView.cpp +++ b/src/vidalia/network/RouterDescriptorView.cpp @@ -106,6 +106,7 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist) /* Add the IP address and router platform information */ html.append(trow(tcol(b(tr("IP Address:"))) + tcol(rd.ip().toString()))); + html.append(trow(tcol(b(tr("Fingerprint:"))) + tcol(rd.id()))); if(!rd.platform().isEmpty()) html.append(trow(tcol(b(tr("Platform:"))) + tcol(rd.platform())));

1 0

[metrics-web/master] Fix trivial bug in log message.
by karsten＠torproject.org 04 Jul '12

04 Jul '12

commit 5ce9401ae218ce664e87856bb9a5e54a5f591ded Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 4 01:03:15 2012 +0200 Fix trivial bug in log message. --- src/org/torproject/ernie/cron/GetTorProcessor.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/cron/GetTorProcessor.java b/src/org/torproject/ernie/cron/GetTorProcessor.java index 34190b6..d561784 100644 --- a/src/org/torproject/ernie/cron/GetTorProcessor.java +++ b/src/org/torproject/ernie/cron/GetTorProcessor.java @@ -146,7 +146,7 @@ public class GetTorProcessor { logger.info("Finished processing statistics on Tor packages " + "delivered by GetTor.\nLast date in statistics is " - + data.lastKey() + "."); + + (data.isEmpty() ? "(null)" : data.lastKey()) + "."); } }

1 0