February 2011 - tor-commits - lists.torproject.org

[torperf/master] Fix annoying formatting in example start script.
by karsten＠torproject.org 24 Feb '11

24 Feb '11

commit add8b1f470562ab958294789c62987f6f4ae6698 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 00:28:12 2011 -0800 Fix annoying formatting in example start script. Bonus commit! ;) --- example_start-tors_fastslow.txt | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example_start-tors_fastslow.txt b/example_start-tors_fastslow.txt index 2226cb0..4887868 100755 --- a/example_start-tors_fastslow.txt +++ b/example_start-tors_fastslow.txt @@ -8,14 +8,14 @@ mkdir -p regular50kb regular1mb regular5mb BASEPORT=9000 SIZENUM=0 for SIZE in 50kb 1mb 5mb; do -SPEEDNUM=0 -let SIZENUM=10+$SIZENUM -for SPEED in slow slowratio regular fast fastratio; do -let SPEEDNUM=1+$SPEEDNUM -let PORT=$BASEPORT+$SIZENUM+$SPEEDNUM -let CONTROLPORT=1000+$PORT -cd ~/torperf/$SPEED$SIZE -cat <<EOF >torrc + SPEEDNUM=0 + let SIZENUM=10+$SIZENUM + for SPEED in slow slowratio regular fast fastratio; do + let SPEEDNUM=1+$SPEEDNUM + let PORT=$BASEPORT+$SIZENUM+$SPEEDNUM + let CONTROLPORT=1000+$PORT + cd ~/torperf/$SPEED$SIZE + cat <<EOF >torrc DataDirectory . SocksPort $PORT MaxCircuitDirtiness 1 minute @@ -24,7 +24,7 @@ Log notice file log ControlPort $CONTROLPORT CookieAuthentication 1 EOF -done + done done cd ~/torperf/slow50kb && tor -f ~/torperf/slow50kb/torrc

1 0

[torperf/master] Clarify some fields of extradata.
by karsten＠torproject.org 24 Feb '11

24 Feb '11

commit b240ae1ad416b42eeba37d0442471b9858ad2821 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 13:28:05 2011 -0800 Clarify some fields of extradata. --- measurements-HOWTO | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/measurements-HOWTO b/measurements-HOWTO index c91894a..e72969e 100644 --- a/measurements-HOWTO +++ b/measurements-HOWTO @@ -166,10 +166,10 @@ The 50kb.extradata, 1mb.extradata, and 5mb.extradata files should accumulate lines with KEY=value pairs describing the following properties: CIRC_ID: The circuit id from the control port -LAUNCH: The launch time +LAUNCH: The launch time of the circuit PATH: The identity fingerprints of the members of the path BUILDTIMES: Cumulative timer of how long before each hop was completed -USED_AT: Closing time for the Torperf stream +USED_AT: Closing time for the Torperf stream (should match datacomplete*sec) USED_BY: Control port stream id for this Torperf stream TIMEOUT: The current CircuitBuildTimeout (in ms, pre-rounding) QUANTILE: The current CircuitBuildTimeout quantile cutoff

1 0

[torperf/master] Fix a spurious WARN in extra_data.py
by karsten＠torproject.org 24 Feb '11

24 Feb '11

commit 34362200e773ad22c893079a933df558e330d49a Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 13:27:49 2011 -0800 Fix a spurious WARN in extra_data.py --- extra_stats.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/extra_stats.py b/extra_stats.py index fb8d38a..1ae0142 100755 --- a/extra_stats.py +++ b/extra_stats.py @@ -127,6 +127,9 @@ class WriteStats(TorCtl.PostEventListener): # try to reuse this circuit later... But we should # print out a warn above if that happens. del self.all_circs[event.circ_id] + # Some STREAM FAILED events are paired with a CLOSED, some are not :( + if event.status == "FAILED": + self.ignore_streams[event.strm_id] = True if event.status == 'CLOSED': assert not circ.strm_id or circ.stream_failed circ.used = True

1 0

[pytorctl/master] Fix a python 2.5 traceback in recent 'body' commit.
by mikeperry＠torproject.org 24 Feb '11

24 Feb '11

commit 96133c805d3e5402f6444e71a4555c6b410986e7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Feb 24 03:49:05 2011 -0800 Fix a python 2.5 traceback in recent 'body' commit. --- TorCtl.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index 4319242..5403a95 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -266,8 +266,8 @@ class ORConnEvent(Event): self.ncircs = ncircs class StreamBwEvent(Event): - def __init__(self, event_name, strm_id, written, read, body): - Event.__init__(self, event_name, body) + def __init__(self, event_name, saved_body, strm_id, written, read): + Event.__init__(self, event_name, saved_body) self.strm_id = int(strm_id) self.bytes_read = int(read) self.bytes_written = int(written) @@ -1431,7 +1431,7 @@ class EventHandler(EventSink): m = re.match(r"(\d+)\s+(\d+)\s+(\d+)", body) if not m: raise ProtocolError("STREAM_BW event misformatted.") - event = StreamBwEvent(evtype, *m.groups(), body=body) + event = StreamBwEvent(evtype, body, *m.groups()) elif evtype == "BW": m = re.match(r"(\d+)\s+(\d+)", body) if not m:

1 0

[torbutton/master] Bug #2359: Fix XHTML DTD errors on FF4
by mikeperry＠torproject.org 24 Feb '11

24 Feb '11

commit 156e3a62ffaebc55d8b8b10b54b9567ad9d1b608 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 23:38:25 2011 -0800 Bug #2359: Fix XHTML DTD errors on FF4 Allow content sourcing of resource urls with a host of 'gre'. --- src/components/cssblocker.js | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/components/cssblocker.js b/src/components/cssblocker.js index 51f7b98..ad2b1ac 100644 --- a/src/components/cssblocker.js +++ b/src/components/cssblocker.js @@ -259,6 +259,19 @@ ContentPolicy.prototype = { } } + // Fix bug #2359: Firefox now loads dtd's from + // resource urls with a valid host. We must + // check for this and allow it. + if (contentLocation.scheme == "resource") { + try { + targetHost = contentLocation.host; + } catch(e) { + this.logger.safe_log(3, "No resource host from: ", + requestOrigin.spec + " for: " + + contentLocation.spec); + } + } + if (("about:blank" == contentLocation.spec)) { // ok, but don't return } else if (("chrome" == targetScheme) && (targetHost in browserSources)) { @@ -266,8 +279,9 @@ ContentPolicy.prototype = { requestOrigin.spec + " for: " + contentLocation.spec); return ok; - } else if ("file" == targetScheme) { - // This fix is for bug 1014. XHTML documents need to source + } else if ("file" == targetScheme || + ("resource" == targetScheme && targetHost == "gre")) { + // This fix is for bugs 1014+2359. XHTML documents need to source // a special dtd as a file url. The same origin policy should // prevent other access to file urls, so this should be ok // to just allow.

1 0

[torbutton/master] Bug #2465: Fix Javascript hooks+exception on FF4.0b11
by mikeperry＠torproject.org 24 Feb '11

24 Feb '11

commit 0b96be3008ff894bf1e04dbf96103da78b601013 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 22:58:23 2011 -0800 Bug #2465: Fix Javascript hooks+exception on FF4.0b11 The javascript hooks work again, and we've removed a nasty popup exception on FF4.0b11 too. --- src/chrome/content/jshooks.js | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/jshooks.js b/src/chrome/content/jshooks.js index b856922..32c446d 100644 --- a/src/chrome/content/jshooks.js +++ b/src/chrome/content/jshooks.js @@ -3,6 +3,7 @@ window.__HookObjects = function() { return false; } + /* For reference/debugging only: if(false && window.__tb_set_uagent===true) { var tmp_oscpu = window.__tb_oscpu; @@ -326,11 +327,14 @@ window.__HookObjects = function() { // to be a 'Window' but is not the same class as 'window'...) and // hide XPCNativeWrapper there. // This seems no longer necessary in FF2.0.0.13+, and may break FF3? - with(window.valueOf.call().__proto__) { - XPCNativeWrapper = function(a) { return a; }; - } - - window.__proto__ = null; // Prevent delete from unmasking our properties. + //with(window.valueOf.call().__proto__) { + // XPCNativeWrapper = function(a) { return a; }; + //} + + // FIXME: Commenting this may open us to unmasking, but allows the hooks to + // work on FF4. Since we lost the bulletproof resolution masking battle to + // CSS3 anyways, let's just do what we can. + //window.__proto__ = null; // Prevent delete from unmasking our properties. return true; }

1 0

[pytorctl/master] Add gitignore and status returns set_option(s) and reset_options
by mikeperry＠torproject.org 24 Feb '11

24 Feb '11

commit b71e657f13294741d7b6203e587337f677610d14 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu Feb 24 00:20:56 2011 -0300 Add gitignore and status returns set_option(s) and reset_options --- .gitignore | 2 ++ TorCtl.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b7fa6fb --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pyc +*.swp* diff --git a/TorCtl.py b/TorCtl.py index d2cb2a9..3262d69 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -1001,7 +1001,7 @@ class Connection: def set_option(self, key, value): """Set the value of the configuration option 'key' to the value 'value'. """ - self.set_options([(key, value)]) + return self.set_options([(key, value)]) def set_options(self, kvlist): """Given a list of (key,value) pairs, set them as configuration @@ -1010,7 +1010,7 @@ class Connection: if not kvlist: return msg = " ".join(["%s=\"%s\""%(k,quote(v)) for k,v in kvlist]) - self.sendAndRecv("SETCONF %s\r\n"%msg) + return self.sendAndRecv("SETCONF %s\r\n"%msg) def reset_options(self, keylist): """Reset the options listed in 'keylist' to their default values. @@ -1019,7 +1019,7 @@ class Connection: previous versions wanted you to set configuration keys to "". That no longer works. """ - self.sendAndRecv("RESETCONF %s\r\n"%(" ".join(keylist))) + return self.sendAndRecv("RESETCONF %s\r\n"%(" ".join(keylist))) def get_consensus(self): """Get the pristine Tor Consensus. Returns a list of

1 0

[pytorctl/master] Merge branch 'chiiph'
by mikeperry＠torproject.org 24 Feb '11

24 Feb '11

commit dca4b5ea561b9fe69f8b73e89639c8045ec6abba Merge: 62e4705 b71e657 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 19:23:12 2011 -0800 Merge branch 'chiiph' .gitignore | 2 ++ TorCtl.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --combined TorCtl.py index 96e17a3,3262d69..4319242 --- a/TorCtl.py +++ b/TorCtl.py @@@ -180,33 -180,32 +180,33 @@@ class NetworkStatus self.updated = datetime.datetime(*map(int, m.groups())) class Event: - def __init__(self, event_name): + def __init__(self, event_name, body=None): + self.body = body self.event_name = event_name self.arrived_at = 0 self.state = EVENT_STATE.PRISTINE class TimerEvent(Event): - def __init__(self, event_name, type): - Event.__init__(self, event_name) - self.type = type + def __init__(self, event_name, body): + Event.__init__(self, event_name, body) + self.type = body class NetworkStatusEvent(Event): - def __init__(self, event_name, nslist): - Event.__init__(self, event_name) + def __init__(self, event_name, nslist, body): + Event.__init__(self, event_name, body) self.nslist = nslist # List of NetworkStatus objects class NewConsensusEvent(NetworkStatusEvent): pass class NewDescEvent(Event): - def __init__(self, event_name, idlist): - Event.__init__(self, event_name) + def __init__(self, event_name, idlist, body): + Event.__init__(self, event_name, body) self.idlist = idlist class GuardEvent(Event): - def __init__(self, event_name, ev_type, guard, status): - Event.__init__(self, event_name) + def __init__(self, event_name, ev_type, guard, status, body): + Event.__init__(self, event_name, body) if "~" in guard: (self.idhex, self.nick) = guard[1:].split("~") elif "=" in guard: @@@ -217,8 -216,8 +217,8 @@@ class BuildTimeoutSetEvent(Event): def __init__(self, event_name, set_type, total_times, timeout_ms, xm, alpha, - quantile): - Event.__init__(self, event_name) + quantile, body): + Event.__init__(self, event_name, body) self.set_type = set_type self.total_times = total_times self.timeout_ms = timeout_ms @@@ -228,8 -227,8 +228,8 @@@ class CircuitEvent(Event): def __init__(self, event_name, circ_id, status, path, purpose, - reason, remote_reason): - Event.__init__(self, event_name) + reason, remote_reason, body): + Event.__init__(self, event_name, body) self.circ_id = circ_id self.status = status self.path = path @@@ -239,9 -238,8 +239,9 @@@ class StreamEvent(Event): def __init__(self, event_name, strm_id, status, circ_id, target_host, - target_port, reason, remote_reason, source, source_addr, purpose): - Event.__init__(self, event_name) + target_port, reason, remote_reason, source, source_addr, purpose, + body): + Event.__init__(self, event_name, body) self.strm_id = strm_id self.status = status self.circ_id = circ_id @@@ -255,8 -253,8 +255,8 @@@ class ORConnEvent(Event): def __init__(self, event_name, status, endpoint, age, read_bytes, - wrote_bytes, reason, ncircs): - Event.__init__(self, event_name) + wrote_bytes, reason, ncircs, body): + Event.__init__(self, event_name, body) self.status = status self.endpoint = endpoint self.age = age @@@ -266,21 -264,21 +266,21 @@@ self.ncircs = ncircs class StreamBwEvent(Event): - def __init__(self, event_name, strm_id, written, read): - Event.__init__(self, event_name) + def __init__(self, event_name, strm_id, written, read, body): + Event.__init__(self, event_name, body) self.strm_id = int(strm_id) self.bytes_read = int(read) self.bytes_written = int(written) class LogEvent(Event): def __init__(self, level, msg): - Event.__init__(self, level) + Event.__init__(self, level, msg) self.level = level self.msg = msg class AddrMapEvent(Event): - def __init__(self, event_name, from_addr, to_addr, when): - Event.__init__(self, event_name) + def __init__(self, event_name, from_addr, to_addr, when, body): + Event.__init__(self, event_name, body) self.from_addr = from_addr self.to_addr = to_addr self.when = when @@@ -292,14 -290,14 +292,14 @@@ class AddrMap self.when = when class BWEvent(Event): - def __init__(self, event_name, read, written): - Event.__init__(self, event_name) + def __init__(self, event_name, read, written, body): + Event.__init__(self, event_name, body) self.read = read self.written = written class UnknownEvent(Event): def __init__(self, event_name, event_string): - Event.__init__(self, event_name) + Event.__init__(self, event_name, event_string) self.event_string = event_string ipaddress_re = re.compile(r"(\d{1,3}\.){3}\d{1,3}$") @@@ -1003,7 -1001,7 +1003,7 @@@ class Connection def set_option(self, key, value): """Set the value of the configuration option 'key' to the value 'value'. """ - self.set_options([(key, value)]) + return self.set_options([(key, value)]) def set_options(self, kvlist): """Given a list of (key,value) pairs, set them as configuration @@@ -1012,7 -1010,7 +1012,7 @@@ if not kvlist: return msg = " ".join(["%s=\"%s\""%(k,quote(v)) for k,v in kvlist]) - self.sendAndRecv("SETCONF %s\r\n"%msg) + return self.sendAndRecv("SETCONF %s\r\n"%msg) def reset_options(self, keylist): """Reset the options listed in 'keylist' to their default values. @@@ -1021,7 -1019,7 +1021,7 @@@ previous versions wanted you to set configuration keys to "". That no longer works. """ - self.sendAndRecv("RESETCONF %s\r\n"%(" ".join(keylist))) + return self.sendAndRecv("RESETCONF %s\r\n"%(" ".join(keylist))) def get_consensus(self): """Get the pristine Tor Consensus. Returns a list of @@@ -1388,8 -1386,7 +1388,8 @@@ class EventHandler(EventSink) if purpose: purpose = purpose[9:] if reason: reason = reason[8:] if remote: remote = remote[15:] - event = CircuitEvent(evtype, ident, status, path, purpose, reason, remote) + event = CircuitEvent(evtype, ident, status, path, purpose, reason, + remote, body) elif evtype == "STREAM": #plog("DEBUG", "STREAM: "+body) m = re.match(r"(\S+)\s+(\S+)\s+(\S+)\s+(\S+)?:(\d+)(\sREASON=\S+)?(\sREMOTE_REASON=\S+)?(\sSOURCE=\S+)?(\sSOURCE_ADDR=\S+)?(\s+PURPOSE=\S+)?", body) @@@ -1407,8 -1404,7 +1407,8 @@@ purpose = purpose.lstrip() purpose = purpose[8:] event = StreamEvent(evtype, ident, status, circ, target_host, - int(target_port), reason, remote, source, source_addr, purpose) + int(target_port), reason, remote, source, source_addr, + purpose, body) elif evtype == "ORCONN": m = re.match(r"(\S+)\s+(\S+)(\sAGE=\S+)?(\sREAD=\S+)?(\sWRITTEN=\S+)?(\sREASON=\S+)?(\sNCIRCS=\S+)?", body) if not m: @@@ -1426,18 -1422,18 +1426,18 @@@ if wrote: wrote = int(wrote[9:]) else: wrote = 0 event = ORConnEvent(evtype, status, target, age, read, wrote, - reason, ncircs) + reason, ncircs, body) elif evtype == "STREAM_BW": m = re.match(r"(\d+)\s+(\d+)\s+(\d+)", body) if not m: raise ProtocolError("STREAM_BW event misformatted.") - event = StreamBwEvent(evtype, *m.groups()) + event = StreamBwEvent(evtype, *m.groups(), body=body) elif evtype == "BW": m = re.match(r"(\d+)\s+(\d+)", body) if not m: raise ProtocolError("BANDWIDTH event misformatted.") read, written = map(long, m.groups()) - event = BWEvent(evtype, read, written) + event = BWEvent(evtype, read, written, body) elif evtype in ("DEBUG", "INFO", "NOTICE", "WARN", "ERR"): event = LogEvent(evtype, body) elif evtype == "NEWDESC": @@@ -1445,7 -1441,7 +1445,7 @@@ ids = [] for i in ids_verb: ids.append(i.replace("~", "=").split("=")[0].replace("$","")) - event = NewDescEvent(evtype, ids) + event = NewDescEvent(evtype, ids, body) elif evtype == "ADDRMAP": # TODO: Also parse errors and GMTExpiry m = re.match(r'(\S+)\s+(\S+)\s+(\"[^"]+\"|\w+)', body) @@@ -1456,11 -1452,11 +1456,11 @@@ when = None else: when = time.strptime(when[1:-1], "%Y-%m-%d %H:%M:%S") - event = AddrMapEvent(evtype, fromaddr, toaddr, when) + event = AddrMapEvent(evtype, fromaddr, toaddr, when, body) elif evtype == "NS": - event = NetworkStatusEvent(evtype, parse_ns_body(data)) + event = NetworkStatusEvent(evtype, parse_ns_body(data), data) elif evtype == "NEWCONSENSUS": - event = NewConsensusEvent(evtype, parse_ns_body(data)) + event = NewConsensusEvent(evtype, parse_ns_body(data), data) elif evtype == "BUILDTIMEOUT_SET": m = re.match( r"(\S+)\sTOTAL_TIMES=(\d+)\sTIMEOUT_MS=(\d+)\sXM=(\d+)\sALPHA=(\S+)\sCUTOFF_QUANTILE=(\S+)", @@@ -1468,11 -1464,11 +1468,11 @@@ set_type, total_times, timeout_ms, xm, alpha, quantile = m.groups() event = BuildTimeoutSetEvent(evtype, set_type, int(total_times), int(timeout_ms), int(xm), float(alpha), - float(quantile)) + float(quantile), body) elif evtype == "GUARD": m = re.match(r"(\S+)\s(\S+)\s(\S+)", body) entry, guard, status = m.groups() - event = GuardEvent(evtype, entry, guard, status) + event = GuardEvent(evtype, entry, guard, status, body) elif evtype == "TORCTL_TIMER": event = TimerEvent(evtype, data) else:

1 0

[weather/master] Fix typo
by kaner＠torproject.org 23 Feb '11

23 Feb '11

commit 387454e7718ceef81bcc3d739931553e6544c59d Author: Christian Fromme <kaner(a)strace.org> Date: Wed Feb 23 21:16:44 2011 +0100 Fix typo --- weather/weatherapp/ctlutil.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/weather/weatherapp/ctlutil.py b/weather/weatherapp/ctlutil.py index 8644cf3..0487157 100644 --- a/weather/weatherapp/ctlutil.py +++ b/weather/weatherapp/ctlutil.py @@ -467,7 +467,7 @@ class CtlUtil: desc = self.get_single_descriptor(fingerprint) if not desc == "": - match = re.match(hibernating_match, desc) + match = re.match(match_hibernating, desc) if match: return True else:

1 0

[weather/master] Fix shebang.
by kaner＠torproject.org 23 Feb '11

23 Feb '11

commit a0bb0a16b026c70dd37b417041efa27c010961f4 Author: Christian Fromme <kaner(a)strace.org> Date: Wed Feb 23 19:18:02 2011 +0100 Fix shebang. --- weather/manage.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/weather/manage.py b/weather/manage.py index 5e78ea9..bcdd55e 100644 --- a/weather/manage.py +++ b/weather/manage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python from django.core.management import execute_manager try: import settings # Assumed to be in the same directory.

1 0