August 2014 - tor-commits - lists.torproject.org

[tor/release-0.2.5] Explicitly disable RunAsDaemon in the systemd unit file (#12731).
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 8b470ee4b54582b599debf5ab5b996eb06525093 Author: intrigeri <intrigeri(a)boum.org> Date: Tue Jul 29 12:23:04 2014 +0000 Explicitly disable RunAsDaemon in the systemd unit file (#12731). Our current systemd unit uses "Type = simple", so systemd does not expect tor to fork. If the user has "RunAsDaemon 1" in their torrc, then things won't work as expected. This is e.g. the case on Debian (and derivatives), since there we pass "--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" (that contains "RunAsDaemon 1") by default. The only solution I could find is to explicitly pass "--RunAsDaemon 0" when starting tor from the systemd unit file, which this commit does. --- changes/bug12731-systemd-no-run-as-daemon | 9 +++++++++ contrib/dist/tor.service.in | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/changes/bug12731-systemd-no-run-as-daemon b/changes/bug12731-systemd-no-run-as-daemon new file mode 100644 index 0000000..f92e5af --- /dev/null +++ b/changes/bug12731-systemd-no-run-as-daemon @@ -0,0 +1,9 @@ + o Distribution: + - Explicitly disable RunAsDaemon in the systemd unit file. + Our current systemd unit uses "Type = simple", so systemd does + not expect tor to fork. If the user has "RunAsDaemon 1" in their + torrc, then things won't work as expected. This is e.g. the case + on Debian (and derivatives), since there we pass + "--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" + (that contains "RunAsDaemon 1") by default. + Patch by intrigeri; resolves ticket 12731. diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 5d76702..1d52f62 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -4,7 +4,9 @@ After = syslog.target network.target nss-lookup.target [Service] Type = simple -ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc +# A torrc that has "RunAsDaemon 1" won't work with the "simple" service type; +# let's explicitly override it. +ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0 ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT TimeoutSec = 30

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 74a8555d2be2ce9d33e9814212e5de49ba089274 Merge: 88590ed 8b470ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 30 14:00:21 2014 -0400 Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5 Conflicts: contrib/dist/tor.service.in changes/bug12731-systemd-no-run-as-daemon | 9 +++++++++ contrib/dist/tor.service.in | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --cc contrib/dist/tor.service.in index 9914a78,1d52f62..2fe51c7 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@@ -4,8 -4,9 +4,10 @@@ After = syslog.target network.target ns [Service] Type = simple +ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config - ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc + # A torrc that has "RunAsDaemon 1" won't work with the "simple" service type; + # let's explicitly override it. + ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0 ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT TimeoutSec = 30

1 0

[tor/release-0.2.5] Build circuits more readily when DisableNetwork goes to 0
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit fcac4b4467427e8f6ad948e8c8e6f34a0131e716 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Aug 5 16:54:46 2014 -0400 Build circuits more readily when DisableNetwork goes to 0 When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would mistakenly cache this conclusion and continue believing it even when DisableNetwork is set to 0. Fixes the bug introduced by the fix for bug 11200; bugfix on 0.2.5.4-alpha. --- changes/bug11200-caching | 7 +++++++ src/or/nodelist.c | 21 ++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/changes/bug11200-caching b/changes/bug11200-caching new file mode 100644 index 0000000..e3fbaec --- /dev/null +++ b/changes/bug11200-caching @@ -0,0 +1,7 @@ + o Major bugfixes: + - When Tor starts with DisabledNetwork set, it would correctly + conclude that it shouldn't try making circuits, but it would + mistakenly cache this conclusion and continue believing it even + when DisableNetwork is set to 0. Fixes the bug introduced by the + fix for bug 11200; bugfix on 0.2.5.4-alpha. + diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 8f87081..7b1f338 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1275,10 +1275,21 @@ static char dir_info_status[256] = ""; int router_have_minimum_dir_info(void) { + static int logged_delay=0; + const char *delay_fetches_msg = NULL; + if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { + if (!logged_delay) + log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); + logged_delay=1; + strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); + return 0; + } + logged_delay = 0; /* reset it if we get this far */ + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { update_router_have_minimum_dir_info(); - need_to_update_have_min_dir_info = 0; } + return have_min_dir_info; } @@ -1498,7 +1509,6 @@ update_router_have_minimum_dir_info(void) const networkstatus_t *consensus = networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); int using_md; - const char *delay_fetches_msg = NULL; if (!consensus) { if (!networkstatus_get_latest_consensus()) @@ -1511,13 +1521,6 @@ update_router_have_minimum_dir_info(void) goto done; } - if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { - log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); - strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); - res = 0; - goto done; - } - using_md = consensus->flavor == FLAV_MICRODESC; {

1 0

[tor/release-0.2.5] fix extra words in man page
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 691371b8026d40467662a9c7cf3bd9f788ea6df5 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 9 15:40:40 2014 -0400 fix extra words in man page --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4f3612b..ba05968 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1630,7 +1630,7 @@ is non-zero): [[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**:: When this option is enabled and BridgeRelay is also enabled, and we have - GeoIP data, Tor keeps a keep a per-country count of how many client + GeoIP data, Tor keeps a per-country count of how many client addresses have contacted it so that it can help the bridge authority guess which countries have blocked access to it. (Default: 1)

1 0

[tor/release-0.2.5] Fix some URLs in the README
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 4056c61608f1ede0da56559cb7e56ec2087dc659 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 9 15:57:06 2014 -0400 Fix some URLs in the README patch from mttp; fixes 12830 --- README | 9 ++++----- changes/bug12830 | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README b/README index b2a391a..e878476 100644 --- a/README +++ b/README @@ -10,17 +10,16 @@ Home page: https://www.torproject.org/ Download new versions: - https://www.torproject.org/download.html + https://www.torproject.org/download/download.html Documentation, including links to installation and setup instructions: - https://www.torproject.org/documentation.html + https://www.torproject.org/docs/documentation.html Making applications work with Tor: - https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO + https://wiki.torproject.org/projects/tor/wiki/doc/TorifyHOWTO Frequently Asked Questions: - https://www.torproject.org/faq.html - https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ + https://www.torproject.org/docs/faq.html To get started working on Tor development: diff --git a/changes/bug12830 b/changes/bug12830 new file mode 100644 index 0000000..835ebe2 --- /dev/null +++ b/changes/bug12830 @@ -0,0 +1,4 @@ + o Documentation: + - Adjust the URLs in the README to refer to the new locations of + several documents on the website. Patch from Matt Pagan. Fixes + bug 12830.

1 0

[tor/release-0.2.5] Don't send DESTROY to circID 0 when circuit_deliver_create_cell fails
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit b32a8b024ce3a57f8865ed2937dbc3f3fd5072ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 12 12:10:57 2014 -0400 Don't send DESTROY to circID 0 when circuit_deliver_create_cell fails Cypherpunks found this and wrote this patch. Fix for 12848; fix on (I think) d58d4c0d, which went into 0.0.8pre1 --- changes/bug12848 | 4 ++++ src/or/circuitbuild.c | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/changes/bug12848 b/changes/bug12848 new file mode 100644 index 0000000..7aa79c3 --- /dev/null +++ b/changes/bug12848 @@ -0,0 +1,4 @@ + o Major bugfixes (relay): + - Avoid queuing or sending destroy cells for circuit ID zero when + we fail to send a CREATE cell. Fixes bug 12848; bugfix on + 0.0.8pre1. Found and fixed by "cypherpunks". diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 4603de0..11f8250 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -584,18 +584,18 @@ circuit_deliver_create_cell(circuit_t *circ, const create_cell_t *create_cell, id = get_unique_circ_id_by_chan(circ->n_chan); if (!id) { log_warn(LD_CIRC,"failed to get unique circID."); - return -1; + goto error; } - log_debug(LD_CIRC,"Chosen circID %u.", (unsigned)id); - circuit_set_n_circid_chan(circ, id, circ->n_chan); memset(&cell, 0, sizeof(cell_t)); r = relayed ? create_cell_format_relayed(&cell, create_cell) : create_cell_format(&cell, create_cell); if (r < 0) { log_warn(LD_CIRC,"Couldn't format create cell"); - return -1; + goto error; } + log_debug(LD_CIRC,"Chosen circID %u.", (unsigned)id); + circuit_set_n_circid_chan(circ, id, circ->n_chan); cell.circ_id = circ->n_circ_id; append_cell_to_circuit_queue(circ, circ->n_chan, &cell, @@ -619,6 +619,9 @@ circuit_deliver_create_cell(circuit_t *circ, const create_cell_t *create_cell, } return 0; + error: + circ->n_chan = NULL; + return -1; } /** We've decided to start our reachability testing. If all

1 0

[tor/release-0.2.5] Add an extra check in channel_send_destroy for circID==0
by nickm＠torproject.org 18 Aug '14

18 Aug '14

commit 981e037fd3b9e20b6e58e9c1470999a0f3a1ef0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 12 12:14:05 2014 -0400 Add an extra check in channel_send_destroy for circID==0 Prevents other cases of 12848. --- src/or/channel.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/or/channel.c b/src/or/channel.c index 1270eac..cd55bd0 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2625,6 +2625,14 @@ channel_send_destroy(circid_t circ_id, channel_t *chan, int reason) cell_t cell; tor_assert(chan); + if (circ_id == 0) { + log_warn(LD_BUG, "Attempted to send a destroy cell for circID 0 " + "on a channel " U64_FORMAT " at %p in state %s (%d)", + U64_PRINTF_ARG(chan->global_identifier), + chan, channel_state_to_string(chan->state), + chan->state); + return 0; + } /* Check to make sure we can send on this channel first */ if (!(chan->state == CHANNEL_STATE_CLOSING ||

1 0

[ooni-probe/master] Fix some errors detected with pyflakes
by art＠torproject.org 18 Aug '14

18 Aug '14

commit 59adcce1b1b9f3698b58baaa7e42a61c0b334c80 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Aug 18 14:09:21 2014 +0200 Fix some errors detected with pyflakes --- ooni/geoip.py | 2 +- ooni/nettest.py | 1 - ooni/nettests/manipulation/captiveportal.py | 5 +---- ooni/oonibclient.py | 3 --- ooni/oonicli.py | 2 +- ooni/otime.py | 1 - ooni/settings.py | 2 +- ooni/templates/httpt.py | 2 +- ooni/templates/tcpt.py | 1 - ooni/tests/mocks.py | 1 - ooni/utils/net.py | 3 +-- ooni/utils/trueheaders.py | 13 ++++--------- ooni/utils/txscapy.py | 7 ++----- 13 files changed, 12 insertions(+), 31 deletions(-) diff --git a/ooni/geoip.py b/ooni/geoip.py index d135595..14dde4b 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -232,7 +232,7 @@ class ProbeIP(object): self.address = yield s.lookup() self.strategy = 'geo_ip_service-' + service_name break - except Exception, e: + except Exception: log.msg("Failed to lookup your IP via %s" % service_name) if not self.address: diff --git a/ooni/nettest.py b/ooni/nettest.py index 0d5c0f2..3852b40 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -11,7 +11,6 @@ from twisted.python import usage, reflect from ooni.tasks import Measurement from ooni.utils import log, checkForRoot, sanitize_options from ooni.settings import config -from ooni import geoip from ooni import errors as e diff --git a/ooni/nettests/manipulation/captiveportal.py b/ooni/nettests/manipulation/captiveportal.py index eb28104..344ae1c 100644 --- a/ooni/nettests/manipulation/captiveportal.py +++ b/ooni/nettests/manipulation/captiveportal.py @@ -28,8 +28,6 @@ # :authors: Jacob Appelbaum, Arturo Filastò, Isis Lovecruft # :license: see LICENSE for more details -import base64 -import os import random import re import string @@ -37,9 +35,8 @@ from urlparse import urlparse from twisted.names import error from twisted.python import usage -from twisted.internet import defer, threads +from twisted.internet import defer -from ooni import nettest from ooni.templates import httpt, dnst from ooni.utils import net from ooni.utils import log diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py index 7dcc0af..9e08c74 100644 --- a/ooni/oonibclient.py +++ b/ooni/oonibclient.py @@ -1,8 +1,5 @@ -import os import json -from hashlib import sha256 - from twisted.web.client import Agent from twisted.internet import defer, reactor from twisted.internet.endpoints import TCP4ClientEndpoint diff --git a/ooni/oonicli.py b/ooni/oonicli.py index eef3112..4df542f 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -4,7 +4,7 @@ import yaml from twisted.python import usage from twisted.python.util import spewer -from twisted.internet import defer, reactor +from twisted.internet import defer from ooni import errors, __version__ diff --git a/ooni/otime.py b/ooni/otime.py index 21dab42..51124db 100644 --- a/ooni/otime.py +++ b/ooni/otime.py @@ -1,4 +1,3 @@ -import time from datetime import datetime def prettyDateNow(): diff --git a/ooni/settings.py b/ooni/settings.py index a5b6468..674b4d3 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -10,7 +10,7 @@ from os.path import abspath, expanduser from scapy.all import get_if_list from ooni.utils.net import ConnectAndCloseProtocol -from ooni import otime, geoip +from ooni import geoip from ooni.utils import Storage, log from ooni import errors diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 18b0d81..e77913d 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -154,7 +154,7 @@ class HTTPTest(NetTestCase): response.body = response_body return response - def _processResponseBodyFail(self, failure, request): + def _processResponseBodyFail(self, failure, request, response): failure_string = handleAllFailures(failure) HTTPTest.addToReport(self, request, response, failure_string=failure_string) diff --git a/ooni/templates/tcpt.py b/ooni/templates/tcpt.py index 17307fb..bdedebc 100644 --- a/ooni/templates/tcpt.py +++ b/ooni/templates/tcpt.py @@ -1,5 +1,4 @@ from twisted.internet import protocol, defer, reactor -from twisted.internet.error import ConnectionDone from twisted.internet.endpoints import TCP4ClientEndpoint from ooni.nettest import NetTestCase diff --git a/ooni/tests/mocks.py b/ooni/tests/mocks.py index 72865b1..42f548e 100644 --- a/ooni/tests/mocks.py +++ b/ooni/tests/mocks.py @@ -2,7 +2,6 @@ from twisted.python import failure from twisted.internet import defer from ooni.tasks import BaseTask, TaskWithTimeout -from ooni.nettest import NetTest from ooni.managers import TaskManager diff --git a/ooni/utils/net.py b/ooni/utils/net.py index 51d55e5..58185ab 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -209,7 +209,7 @@ def checkInterfaces(ifaces=None, timeout=1): + " local address {}".format(ifname, ifaddr)) try: pkt = IP(dst=ifaddr) / ICMP() - ans, unans = sr(pkt, iface=ifname, timeout=5, retry=3) + ans, unans = sr1(pkt, iface=ifname, timeout=5, retry=3) except Exception, e: raise PermissionsError if e.find("Errno 1") else log.err(e) else: @@ -252,4 +252,3 @@ def getNonLoopbackIfaces(platform_name=None): def getLocalAddress(): default_iface = getDefaultIface() return default_iface.ipaddr - diff --git a/ooni/utils/trueheaders.py b/ooni/utils/trueheaders.py index a879687..e5dcd0a 100644 --- a/ooni/utils/trueheaders.py +++ b/ooni/utils/trueheaders.py @@ -4,18 +4,13 @@ # Here we make sure that the HTTP Headers sent and received are True. By this # we mean that they are not normalized and that the ordering is maintained. -import struct import itertools from copy import copy -from zope.interface import implements from twisted.web import client, _newclient, http_headers -from twisted.web._newclient import Request, RequestNotSent, RequestGenerationFailed, TransportProxyProducer, STATUS -from twisted.internet import protocol, reactor -from twisted.internet.protocol import ClientFactory, Protocol -from twisted.internet.endpoints import TCP4ClientEndpoint, SSL4ClientEndpoint -from twisted.internet import interfaces, defer -from twisted.internet.defer import Deferred, succeed, fail, maybeDeferred +from twisted.web._newclient import RequestNotSent, RequestGenerationFailed, TransportProxyProducer, STATUS +from twisted.internet import reactor +from twisted.internet.defer import Deferred, fail, maybeDeferred, failure from txsocksx.http import SOCKS5Agent from txsocksx.client import SOCKS5ClientFactory @@ -137,7 +132,7 @@ class HTTP11ClientProtocol(_newclient.HTTP11ClientProtocol): self._state = 'GENERATION_FAILED' self.transport.loseConnection() self._finishedRequest.errback( - Failure(RequestGenerationFailed([err]))) + failure.Failure(RequestGenerationFailed([err]))) else: log.err(err, 'Error writing request, but not in valid state ' 'to finalize request: %s' % self._state) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 1701c93..ba90223 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -1,11 +1,10 @@ import socket -import os import sys import time import random -from twisted.internet import protocol, base, fdesc -from twisted.internet import reactor, threads, error +from twisted.internet import fdesc +from twisted.internet import reactor from twisted.internet import defer, abstract from scapy.config import conf @@ -256,7 +255,6 @@ class ScapySender(ScapyProtocol): self.stopSending() def packetReceived(self, packet): - timeout = time.time() - self._start_time if self.timeout and time.time() - self._start_time > self.timeout: self.stopSending() if packet: @@ -491,7 +489,6 @@ class MPTraceroute(ScapyProtocol): for p in self._recvbuf: l = p.getlayer(2) if isinstance(l, IPerror): - pid = l.id l = p.getlayer(3) if isinstance(l, ICMPerror): addToReceivedPackets(('icmp', l.id), p)

1 0

[ooni-probe/master] Use vulture to find and delete some dead code.
by art＠torproject.org 18 Aug '14

18 Aug '14

commit eb417483e4bf8772d9da71c71ecfd30404425320 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Aug 18 13:57:11 2014 +0200 Use vulture to find and delete some dead code. --- ooni/deck.py | 1 - ooni/nettest.py | 18 ------------- ooni/oonibclient.py | 34 ++----------------------- ooni/otime.py | 21 ---------------- ooni/ratelimiting.py | 68 -------------------------------------------------- ooni/settings.py | 7 ------ 6 files changed, 2 insertions(+), 147 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 19c7fd5..3f64064 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -96,7 +96,6 @@ class Deck(InputFile): self.bouncer = '' self.netTestLoaders = [] self.inputs = [] - self.testHelpers = {} self.oonibclient = OONIBClient(self.bouncer) diff --git a/ooni/nettest.py b/ooni/nettest.py index 54a7d28..0d5c0f2 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -23,24 +23,6 @@ class NoTestCasesFound(Exception): pass -def get_test_methods(item, method_prefix="test_"): - """ - Look for test_ methods in subclasses of NetTestCase - """ - test_cases = [] - try: - assert issubclass(item, NetTestCase) - methods = reflect.prefixedMethodNames(item, method_prefix) - test_methods = [] - for method in methods: - test_methods.append(method_prefix + method) - if test_methods: - test_cases.append((item, test_methods)) - except (TypeError, AssertionError): - pass - return test_cases - - def getTestClassFromFile(net_test_file): """ Will return the first class that is an instance of NetTestCase. diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py index 7676b91..7dcc0af 100644 --- a/ooni/oonibclient.py +++ b/ooni/oonibclient.py @@ -13,33 +13,6 @@ from ooni.utils import log from ooni.utils.net import BodyReceiver, StringProducer, Downloader from ooni.utils.trueheaders import TrueHeadersSOCKS5Agent -class Collector(object): - def __init__(self, address): - self.address = address - - self.nettest_policy = None - self.input_policy = None - - @defer.inlineCallbacks - def loadPolicy(self): - # XXX implement caching of policies - oonibclient = OONIBClient(self.address) - log.msg("Looking up nettest policy for %s" % self.address) - self.nettest_policy = yield oonibclient.getNettestPolicy() - log.msg("Looking up input policy for %s" % self.address) - self.input_policy = yield oonibclient.getInputPolicy() - - def validateInput(self, input_hash): - for i in self.input_policy: - if i['id'] == input_hash: - return True - return False - - def validateNettest(self, nettest_name): - for i in self.nettest_policy: - if nettest_name == i['name']: - return True - return False class OONIBClient(object): retries = 3 @@ -99,7 +72,7 @@ class OONIBClient(object): bodyProducer = None if query: bodyProducer = StringProducer(json.dumps(query)) - + def genReceiver(finished, content_length): def process_response(s): # If empty string then don't parse it. @@ -124,9 +97,6 @@ class OONIBClient(object): return Downloader(download_path, finished, content_length) return self._request('GET', urn, genReceiver) - - def getNettestPolicy(self): - pass def getInput(self, input_hash): from ooni.deck import InputFile @@ -239,7 +209,7 @@ class OONIBClient(object): def lookupTestHelpers(self, test_helper_names): try: - test_helper = yield self.queryBackend('POST', '/bouncer', + test_helper = yield self.queryBackend('POST', '/bouncer', query={'test-helpers': test_helper_names}) except Exception, exc: log.exception(exc) diff --git a/ooni/otime.py b/ooni/otime.py index 0446d4d..21dab42 100644 --- a/ooni/otime.py +++ b/ooni/otime.py @@ -1,24 +1,6 @@ import time from datetime import datetime -def utcDateNow(): - """ - Returns the datetime object of the current UTC time. - """ - return datetime.utcnow() - -def utcTimeNow(): - """ - Returns seconds since epoch in UTC time, it's of type float. - """ - return time.mktime(time.gmtime()) - -def dateToTime(date): - """ - Takes as input a datetime object and outputs the seconds since epoch. - """ - return time.mktime(date.timetuple()) - def prettyDateNow(): """ Returns a good looking string for the local time. @@ -31,9 +13,6 @@ def utcPrettyDateNow(): """ return datetime.utcnow().ctime() -def timeToPrettyDate(time_val): - return time.ctime(time_val) - class InvalidTimestampFormat(Exception): pass diff --git a/ooni/ratelimiting.py b/ooni/ratelimiting.py deleted file mode 100644 index 986cf82..0000000 --- a/ooni/ratelimiting.py +++ /dev/null @@ -1,68 +0,0 @@ -class RateLimiter(object): - """ - The abstract class that imposes limits over how measurements are scheduled, - how retries are handled and when we should be giving up on a certain - measurement. - """ - @property - def timeout(self): - """ - After what timeout a certain test should be considered to have failed - and attempt a retry if the maximum retry has not been reached. - """ - raise NotImplemented - - @property - def maxTimeout(self): - """ - This is the maximum value that timeout can reach. - """ - raise NotImplemented - - @property - def concurrency(self): - """ - How many concurrent requests should happen at the same time. - """ - raise NotImplemented - - def timedOut(self, measurement): - raise NotImplemented - - def completed(self, measurement): - raise NotImplemented - - def failed(self, measurement): - raise NotImplemented - -class StaticRateLimiter(RateLimiter): - """ - This is a static ratelimiter that returns constant values. - """ - @property - def timeout(self): - return 10 - - @property - def maxTimeout(self): - return 5 * 60 - - @property - def concurrency(self): - return 10 - - def timedOut(self, measurement): - pass - - def completed(self, measurement): - pass - - def failed(self, measurement, failure): - pass - -class TimeoutRateLimiter(RateLimiter): - pass - -class BandwidthRateLimiter(RateLimiter): - pass - diff --git a/ooni/settings.py b/ooni/settings.py index 08150f0..a5b6468 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -26,8 +26,6 @@ class OConfig(object): self.tor_state = None # This is used to store the probes IP address obtained via Tor self.probe_ip = geoip.ProbeIP() - # This is used to keep track of the state of the sniffer - self.sniffer_running = None self.logging = True self.basic = Storage() self.advanced = Storage() @@ -164,9 +162,4 @@ class OConfig(object): self.log_incoherences(incoherent) - def generate_pcap_filename(self, testDetails): - test_name, start_time = testDetails['test_name'], testDetails['start_time'] - start_time = otime.epochToTimestamp(start_time) - return "report-%s-%s.%s" % (test_name, start_time, "pcap") - config = OConfig()

1 0

[obfs4/master] Change the drbg seed field in the state file.
by yawning＠torproject.org 18 Aug '14

18 Aug '14

commit f32f01ba01351c2cca26be3a62a9c2aa395ee433 Author: Yawning Angel <yawning(a)torproject.org> Date: Mon Aug 18 11:54:39 2014 +0000 Change the drbg seed field in the state file. Changing from "drbgSeed" to "drbg-seed" to be consistent with the ServerTransportOptions to allow for easier copy/paste. --- transports/obfs4/statefile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go index 814a545..e727f7d 100644 --- a/transports/obfs4/statefile.go +++ b/transports/obfs4/statefile.go @@ -49,7 +49,7 @@ type jsonServerState struct { NodeID string `json:"node-id"` PrivateKey string `json:"private-key"` PublicKey string `json:"public-key"` - DrbgSeed string `json:"drbgSeed"` + DrbgSeed string `json:"drbg-seed"` } type obfs4ServerState struct {

1 0