March 2015 - tor-commits - lists.torproject.org

[bridgedb/develop] Switch `count` and `period` parameter order in bridgedb.schedule.
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit c78b23832e1f1838f5ff99ba96b675a7a1891258 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 02:15:34 2015 +0000 Switch `count` and `period` parameter order in bridgedb.schedule. --- lib/bridgedb/captcha.py | 2 +- lib/bridgedb/schedule.py | 14 +++---- lib/bridgedb/test/test_HTTPServer.py | 2 +- lib/bridgedb/test/test_schedule.py | 74 +++++++++++++++++----------------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 234bbb4..d2fbcc1 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -206,7 +206,7 @@ class GimpCaptcha(Captcha): .. _gimp-captcha: https://github.com/isislovecruft/gimp-captcha """ - sched = schedule.ScheduledInterval('minutes', 30) + sched = schedule.ScheduledInterval(30, 'minutes') def __init__(self, publicKey=None, secretKey=None, hmacKey=None, cacheDir=None): diff --git a/lib/bridgedb/schedule.py b/lib/bridgedb/schedule.py index 6757343..06914d9 100644 --- a/lib/bridgedb/schedule.py +++ b/lib/bridgedb/schedule.py @@ -68,11 +68,11 @@ class Unscheduled(object): implements(ISchedule) - def __init__(self, period=None, count=None): + def __init__(self, count=None, period=None): """Create a schedule for dividing time into intervals. - :param str period: One of the periods in :data:`KNOWN_INTERVALS`. :param int count: The number of **period**s in an interval. + :param str period: One of the periods in :data:`KNOWN_INTERVALS`. """ self.intervalCount = count self.intervalPeriod = period @@ -102,7 +102,6 @@ class Unscheduled(object): specificity depends on what type of interval we're using. For example, if using ``"month"``, the return value would be something like ``"2013-12"``. - """ return fromUnixSeconds(0).strftime('%04Y-%02m-%02d %02H:%02M:%02S') @@ -125,13 +124,14 @@ class ScheduledInterval(Unscheduled): """ implements(ISchedule) - def __init__(self, period=None, count=None): + def __init__(self, count=None, period=None): """Create a schedule for dividing time into intervals. + :type count: int or str + :param count: The number of **period**s in an interval. :param str period: One of the periods in :data:`KNOWN_INTERVALS`. - :param int count: The number of **period**s in an interval. """ - super(ScheduledInterval, self).__init__(period, count) + super(ScheduledInterval, self).__init__(count, period) self._setIntervalCount(count) self._setIntervalPeriod(period) @@ -219,7 +219,7 @@ class ScheduledInterval(Unscheduled): >>> import calendar >>> from bridgedb.schedule import ScheduledInterval - >>> sched = ScheduledInterval('month', 1) + >>> sched = ScheduledInterval(1, 'month') >>> when = calendar.timegm((2007, 12, 12, 0, 0, 0)) >>> sched.getInterval(when) '2007-12' diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index ee6e588..68616bf 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -518,7 +518,7 @@ class WebResourceBridgesTests(unittest.TestCase): self.root = Resource() self.dist = DummyIPBasedDistributor() - self.sched = ScheduledInterval('hour', 1) + self.sched = ScheduledInterval(1, 'hour') self.nBridgesPerRequest = 2 self.bridgesResource = HTTPServer.WebResourceBridges( self.dist, self.sched, N=2, diff --git a/lib/bridgedb/test/test_schedule.py b/lib/bridgedb/test/test_schedule.py index d7fc9c1..f5ab886 100644 --- a/lib/bridgedb/test/test_schedule.py +++ b/lib/bridgedb/test/test_schedule.py @@ -68,40 +68,40 @@ class ScheduledIntervalTests(unittest.TestCase): def test_ScheduledInterval_providesISchedule(self): """ScheduledInterval should implement the ISchedule interface.""" - self.assertTrue(schedule.ISchedule.providedBy(self.sched('month', 1))) + self.assertTrue(schedule.ISchedule.providedBy(self.sched(1, 'month'))) def _check_init(self, sched): """The instance should be an instance of its class.""" self.assertIsInstance(sched, schedule.ScheduledInterval) def test_ScheduledInterval_init_month(self): - self._check_init(self.sched('month', 1)) + self._check_init(self.sched(1, 'month')) def test_ScheduledInterval_init_week(self): - self._check_init(self.sched('week', 2)) + self._check_init(self.sched(2, 'week')) def test_ScheduledInterval_init_day(self): - self._check_init(self.sched('days', 5)) + self._check_init(self.sched(5, 'days')) def test_ScheduledInterval_init_hour(self): - self._check_init(self.sched('hours', 12)) + self._check_init(self.sched(12, 'hours')) def test_ScheduledInterval_init_minute(self): - self._check_init(self.sched('minute', 10)) + self._check_init(self.sched(10, 'minute')) def test_ScheduledInterval_init_seconds(self): - self._check_init(self.sched('seconds', 30)) + self._check_init(self.sched(30, 'seconds')) def test_ScheduledInterval_init_badIntervalPeriod(self): self.assertRaises(schedule.UnknownInterval, - self.sched, 'decades', 2) + self.sched, 2, 'decades') def test_ScheduledInterval_init_badIntervalCount(self): self.assertRaises(schedule.UnknownInterval, - self.sched, 'minutes', 'd20') + self.sched, 'd20', 'minutes') def test_ScheduledInterval_init_negativeIntervalCount(self): - sched = self.sched('days', -100000) + sched = self.sched(-100000, 'days') self.assertEquals(sched.intervalCount, 1) self.assertEquals(sched.intervalPeriod, 'day') @@ -111,48 +111,48 @@ class ScheduledIntervalTests(unittest.TestCase): self.assertEquals(sched.intervalCount, 1) self.assertEquals(sched.intervalPeriod, 'hour') - def _check_intervalStart(self, period='second', count=30, variance=30): + def _check_intervalStart(self, count=30, period='second', variance=30): """Test the ScheduledInterval.intervalStart() method. - :param str period: The interval type for the period. :param int count: The number of **period**s within an interval. + :param str period: The interval type for the period. :param int variance: The amount of variance (in seconds) to tolerate between the start of the interval containing now, and now. """ now = int(self.now()) - sched = self.sched(period, count) + sched = self.sched(count, period) time = sched.intervalStart(now) self.assertIsInstance(time, int) self.assertApproximates(now, time, variance) def test_ScheduledInterval_intervalStart_month(self): - self._check_intervalStart('month', 1, 31*24*60*60) + self._check_intervalStart(1, 'month', 31*24*60*60) def test_ScheduledInterval_intervalStart_week(self): - self._check_intervalStart('week', 2, 14*24*60*60) + self._check_intervalStart(2, 'week', 14*24*60*60) def test_ScheduledInterval_intervalStart_day(self): - self._check_intervalStart('days', 5, 5*24*60*60) + self._check_intervalStart(5, 'days', 5*24*60*60) def test_ScheduledInterval_intervalStart_hour(self): - self._check_intervalStart('hours', 12, 12*60*60) + self._check_intervalStart(12, 'hours', 12*60*60) def test_ScheduledInterval_intervalStart_minute(self): - self._check_intervalStart('minute', 10, 10*60) + self._check_intervalStart(10, 'minute', 10*60) def test_ScheduledInterval_intervalStart_seconds(self): - self._check_intervalStart('seconds', 30, 30) + self._check_intervalStart(30, 'seconds', 30) - def _check_getInterval(self, period='second', count=30, variance=30): + def _check_getInterval(self, count=30, period='second', variance=30): """Test the ScheduledInterval.getInterval() method. - :param str period: The interval type for the period. :param int count: The number of **period**s within an interval. + :param str period: The interval type for the period. :param int variance: The amount of variance (in seconds) to tolerate between the start of the interval containing now, and now. """ now = int(self.now()) - sched = self.sched(period, count) + sched = self.sched(count, period) ts = sched.getInterval(now) self.assertIsInstance(ts, str) secs = [int(x) for x in ts.replace('-', ' ').replace(':', ' ').split()] @@ -161,52 +161,52 @@ class ScheduledIntervalTests(unittest.TestCase): self.assertApproximates(now, secs, variance) def test_ScheduledInterval_getInterval_month(self): - self._check_getInterval('month', 2, 2*31*24*60*60) + self._check_getInterval(2, 'month', 2*31*24*60*60) def test_ScheduledInterval_getInterval_week(self): - self._check_getInterval('week', 1, 7*24*60*60) + self._check_getInterval(1, 'week', 7*24*60*60) def test_ScheduledInterval_getInterval_day(self): - self._check_getInterval('days', 4, 4*24*60*60) + self._check_getInterval(4, 'days', 4*24*60*60) def test_ScheduledInterval_getInterval_hour(self): - self._check_getInterval('hours', 23, 23*60*60) + self._check_getInterval(23, 'hours', 23*60*60) def test_ScheduledInterval_getInterval_minute(self): - self._check_getInterval('minutes', 15, 15*60) + self._check_getInterval(15, 'minutes', 15*60) def test_ScheduledInterval_getInterval_seconds(self): - self._check_getInterval('seconds', 10, 60) + self._check_getInterval(10, 'seconds', 60) - def _check_nextIntervalStarts(self, period='second', count=30, variance=30): + def _check_nextIntervalStarts(self, count=30, period='second', variance=30): """Test the ScheduledInterval.nextIntervalStarts() method. - :param str period: The interval type for the period. :param int count: The number of **period**s within an interval. + :param str period: The interval type for the period. :param int variance: The amount of variance (in seconds) to tolerate between the start of the interval containing now, and now. """ now = int(self.now()) - sched = self.sched(period, count) + sched = self.sched(count, period) time = sched.nextIntervalStarts(now) self.assertIsInstance(time, int) # (now + variance - time) should be > variance self.assertApproximates(now + variance, time, variance) def test_ScheduledInterval_nextIntervalStarts_month(self): - self._check_nextIntervalStarts('month', 2, 2*31*24*60*60) + self._check_nextIntervalStarts(2, 'month', 2*31*24*60*60) def test_ScheduledInterval_nextIntervalStarts_week(self): - self._check_nextIntervalStarts('week', 1, 7*24*60*60) + self._check_nextIntervalStarts(1, 'week', 7*24*60*60) def test_ScheduledInterval_nextIntervalStarts_day(self): - self._check_nextIntervalStarts('days', 4, 4*24*60*60) + self._check_nextIntervalStarts(4, 'days', 4*24*60*60) def test_ScheduledInterval_nextIntervalStarts_hour(self): - self._check_nextIntervalStarts('hours', 23, 23*60*60) + self._check_nextIntervalStarts(23, 'hours', 23*60*60) def test_ScheduledInterval_nextIntervalStarts_minute(self): - self._check_nextIntervalStarts('minutes', 15, 15*60) + self._check_nextIntervalStarts(15, 'minutes', 15*60) def test_ScheduledInterval_nextIntervalStarts_seconds(self): - self._check_nextIntervalStarts('seconds', 10, 10) + self._check_nextIntervalStarts(10, 'seconds', 10)

1 0

[bridgedb/develop] Add HTTPS_ROTATION_PERIOD and EMAIL_ROTATION_PERIOD config options.
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit ceac2ff7b2c966cfea495850d6905d93e675ec03 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 02:19:27 2015 +0000 Add HTTPS_ROTATION_PERIOD and EMAIL_ROTATION_PERIOD config options. This implements configuration of the hashring rotation periods for BridgeDB's distributors via the configuration file. The behaviour for hashring rotation for the EmailBasedDistributor is such that, when `bridgedb.email.autoresponder.createResponseBody()` calls `EmailBasedDistributor.getBridgesForEmail(EMAIL_ADDRESS, EPOCH)` with the `EPOCH` set to the start of the current EMAIL_ROTATION_PERIOD, the client's position in the hashring is determined by the HMAC of the string `"<EPOCH>EMAIL_ADDRESS"`. Therefore, the EMAIL_ROTATION_PERIOD directly effects where the client is placed in the hashring, resulting in different bridges for the user, depending on whether the period has elapsed. With the default setting of `"1 day"`, and taking into account also that the EmailBasedDistributor only responds to a particular user once per three hours, this results in the client being able to ask for (and receive) vanilla bridges (starting from hashring position A) at 9:00, obfs3 bridges (also from position A) at 12:00, obfs4 bridges (from position A again) at 15:00, and so on, and finally different vanilla bridges (from hashring position B) the next morning at 9:00. For the IPBasedDistributor, the behaviour for hashring rotation is that the client's hashring position is determined by the HMAC of the string `"<EPOCH>AREA"` where `EPOCH` is again the start of the current HTTPS_ROTATION_PERIOD, and the `AREA` is the `/16` subnet which the client's IP address resides within. If the client is using Tor or some other open proxy, then the client's hashring position is determined by `"known-proxy<EPOCH>GROUP"` where `EPOCH` is the same as before, and `GROUP` is a number (currently 1 through 4, inclusive) deterministically derived from the IP address of the Tor Exit relay or open proxy that the client is using. Using `GROUP` causes there to only be 4 sets of bridges available to any and all Tor/proxy users at a given time. Hence additionally using `EPOCH` rotates the set of 4 bridges available. The default setting is `"3 hours"`, causing all Tor/proxy users to have 4 different sets of bridges every three hours, while non-Tor users have a new set of bridges (probably) unique to their IP address available every three hours. These defaults for HTTPS_ROTATION_PERIOD and EMAIL_ROTATION_PERIOD will likely need to be changed and fiddled with to make the behaviour an optimum balance between user-friendly and resilient to enumeration. * FIXES #1839: https://bugs.torproject.org/1839. This implement Roger's suggestion to add the rotation periods as configuration file options. --- bridgedb.conf | 32 ++++++++++++++++++++++++++++++++ lib/bridgedb/HTTPServer.py | 15 ++++++++++----- lib/bridgedb/Main.py | 8 ++------ lib/bridgedb/configure.py | 4 ++++ lib/bridgedb/email/server.py | 12 +++++++++--- lib/bridgedb/test/email_helpers.py | 3 +++ lib/bridgedb/test/test_email_server.py | 2 +- 7 files changed, 61 insertions(+), 15 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index c91cc73..2a1c367 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -20,6 +20,11 @@ # # CHANGELOG: # ~~~~~~~~~~ +# Changed in version 0.3.2 - 2015-03-30 +# * CHANGE to using BridgeDB release versions for bridgedb.conf file versions. +# * ADD support for specifying bridge rotation periods via the +# EMAIL_ROTATION_PERIOD and HTTPS_ROTATION_PERIOD settings. +# # Changed in version 0.0.15 - 2015-03-26 # * ADD new SUPPORTED_TRANSPORTS and DEFAULT_TRANSPORT settings. # @@ -295,6 +300,20 @@ HTTPS_INCLUDE_FINGERPRINTS = True # the *last* entry from its X-Forwarded-For header as the client's IP. HTTPS_USE_IP_FROM_FORWARDED_HEADER = False +# (string or None) The period at which the available bridges rotates to a +# separate set of bridges. This setting can be used in the form +# +# "COUNT PERIOD" where +# COUNT is an integer +# PERIOD is one of "second", "minute", "hour", "day", +# "week", or "month" (or any plural form). +# +# For example, setting HTTPS_ROTATION_PERIOD = "3 days" will result in the set +# of bridges which are available through the web interface (either HTTP or +# HTTPS) getting rotated once every three days. Setting this to None disables +# rotation entirely. +HTTPS_ROTATION_PERIOD = "3 hours" + # (string or None) The IP address to listen on for unencrypted HTTP # connections. Set to ``None`` to disable unencrypted connections to the web # interface. @@ -342,6 +361,19 @@ GIMP_CAPTCHA_RSA_KEYFILE = 'captcha_rsa_key' # True if we are enabling distribution via Email; false otherwise. EMAIL_DIST = True +# (string or None) The period at which the available bridges rotates to a +# separate set of bridges. This setting can be used in the form +# +# "COUNT PERIOD" where +# COUNT is an integer +# PERIOD is one of "second", "minute", "hour", "day", +# "week", or "month" (or any plural form). +# +# For example, setting EMAIL_ROTATION_PERIOD = "3 days" will result in the set +# of bridges which are available through the email interface getting rotated +# once every three days. Setting this to None disables rotation entirely. +EMAIL_ROTATION_PERIOD = "1 day" + # What email addresses do we use for outgoing email? # EMAIL_FROM_ADDR goes in the 'From:' header on outgoing emails: diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index ae86957..2e0398c 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -54,6 +54,8 @@ from bridgedb.parse import headers from bridgedb.parse.addr import isIPAddress from bridgedb.qrcodes import generateQR from bridgedb.safelog import logSafely +from bridgedb.schedule import Unscheduled +from bridgedb.schedule import ScheduledInterval TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates') @@ -819,7 +821,7 @@ class WebRoot(resource.Resource): return rendered -def addWebServer(cfg, dist, sched): +def addWebServer(cfg, dist): """Set up a web server for HTTP(S)-based bridge distribution. :type cfg: :class:`bridgedb.persistent.Conf` @@ -835,6 +837,7 @@ def addWebServer(cfg, dist, sched): HTTPS_PORT HTTPS_BIND_IP HTTPS_USE_IP_FROM_FORWARDED_HEADER + HTTPS_ROTATION_PERIOD RECAPTCHA_ENABLED RECAPTCHA_PUB_KEY RECAPTCHA_SEC_KEY @@ -845,10 +848,6 @@ def addWebServer(cfg, dist, sched): GIMP_CAPTCHA_RSA_KEYFILE :type dist: :class:`bridgedb.Dist.IPBasedDistributor` :param dist: A bridge distributor. - :type sched: :class:`bridgedb.schedule.ScheduledInterval` - :param sched: The scheduled interval at which bridge selection, which - are ultimately displayed on the :class:`WebResourceBridges` page, will - be shifted. :raises SystemExit: if the servers cannot be started. :rtype: :api:`twisted.web.server.Site` :returns: A webserver. @@ -887,6 +886,12 @@ def addWebServer(cfg, dist, sched): hmacKey=hmacKey, captchaDir=cfg.GIMP_CAPTCHA_DIR) + if cfg.HTTPS_ROTATION_PERIOD: + count, period = cfg.HTTPS_ROTATION_PERIOD.split() + sched = ScheduledInterval(count, period) + else: + sched = Unscheduled() + bridges = WebResourceBridges(dist, sched, numBridges, fwdHeaders, includeFingerprints=fprInclude) if captcha: diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 31a9c66..3b018f9 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -512,13 +512,9 @@ def run(options, reactor=reactor): # Configure all servers: if config.HTTPS_DIST and config.HTTPS_SHARE: - #webSchedule = schedule.ScheduledInterval("day", 2) - webSchedule = schedule.Unscheduled() - HTTPServer.addWebServer(config, ipDistributor, webSchedule) + HTTPServer.addWebServer(config, ipDistributor) if config.EMAIL_DIST and config.EMAIL_SHARE: - #emailSchedule = schedule.ScheduledInterval("day", 1) - emailSchedule = schedule.Unscheduled() - addSMTPServer(config, emailDistributor, emailSchedule) + addSMTPServer(config, emailDistributor) tasks = {} diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index 54dcdff..8a24d35 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -115,6 +115,10 @@ def loadConfig(configFile=None, configCls=None): else: setattr(config, attr, os.path.abspath(os.path.expanduser(setting))) + for attr in ["HTTPS_ROTATION_PERIOD", "EMAIL_ROTATION_PERIOD"]: + setting = getattr(config, attr, None) # Default to None + setattr(config, attr, setting) + for attr in ["FORCE_PORTS", "FORCE_FLAGS", "NO_DISTRIBUTION_COUNTRIES"]: setting = getattr(config, attr, []) # Default to empty lists setattr(config, attr, setting) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index cde4637..8034d35 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -68,6 +68,8 @@ from bridgedb.email import request from bridgedb.parse import addr from bridgedb.parse.addr import UnsupportedDomain from bridgedb.parse.addr import canonicalizeEmailDomain +from bridgedb.schedule import ScheduledInterval +from bridgedb.schedule import Unscheduled class MailServerContext(object): @@ -458,7 +460,7 @@ class SMTPIncomingServerFactory(smtp.SMTPFactory): return p -def addServer(config, distributor, schedule): +def addServer(config, distributor): """Set up a SMTP server which listens on the configured ``EMAIL_PORT`` for incoming connections, and responds as necessary to requests for bridges. @@ -467,9 +469,13 @@ def addServer(config, distributor, schedule): :type distributor: :class:`bridgedb.Dist.EmailBasedDistributor` :param dist: A distributor which will handle database interactions, and will decide which bridges to give to who and when. - :type schedule: :class:`bridgedb.schedule.ScheduledInterval` - :param schedule: The schedule. XXX: Is this even used? """ + if config.EMAIL_ROTATION_PERIOD: + count, period = config.EMAIL_ROTATION_PERIOD.split() + schedule = ScheduledInterval(count, period) + else: + schedule = Unscheduled() + context = MailServerContext(config, distributor, schedule) factory = SMTPIncomingServerFactory() factory.setContext(context) diff --git a/lib/bridgedb/test/email_helpers.py b/lib/bridgedb/test/email_helpers.py index 5e4262d..c80e2ea 100644 --- a/lib/bridgedb/test/email_helpers.py +++ b/lib/bridgedb/test/email_helpers.py @@ -24,6 +24,7 @@ from bridgedb.test.test_HTTPServer import DummyBridge EMAIL_DIST = True +EMAIL_ROTATION_PERIOD = "1 day" EMAIL_INCLUDE_FINGERPRINTS = True EMAIL_GPG_SIGNING_ENABLED = True EMAIL_GPG_HOMEDIR = '.gnupg' @@ -54,6 +55,7 @@ EMAIL_PORT = 5225 TEST_CONFIG_FILE = io.StringIO(unicode("""\ EMAIL_DIST = %s +EMAIL_ROTATION_PERIOD = %s EMAIL_INCLUDE_FINGERPRINTS = %s EMAIL_GPG_SIGNING_ENABLED = %s EMAIL_GPG_HOMEDIR = %s @@ -75,6 +77,7 @@ EMAIL_FROM_ADDR = %s EMAIL_BIND_IP = %s EMAIL_PORT = %s """ % (repr(EMAIL_DIST), + repr(EMAIL_ROTATION_PERIOD), repr(EMAIL_INCLUDE_FINGERPRINTS), repr(EMAIL_GPG_SIGNING_ENABLED), repr(EMAIL_GPG_HOMEDIR), diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index f79f603..e8c9112 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -524,7 +524,7 @@ class EmailServerServiceTests(SMTPTestCaseMixin, unittest.TestCase): def test_addServer(self): """Call :func:`bridgedb.email.server.addServer` to test startup.""" - factory = server.addServer(self.config, self.dist, self.sched) + factory = server.addServer(self.config, self.dist) factory.timeout = None factory.protocol.timeout = None # Or else the reactor gets dirty

1 0

[bridgedb/develop] Merge branch 'fix/4771-log-tor-exits_r1' into develop
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit 50286fabe267e5c13992a57aa02181cfdca68945 Merge: c23cf00 a1d5c24 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 05:20:31 2015 +0000 Merge branch 'fix/4771-log-tor-exits_r1' into develop lib/bridgedb/Dist.py | 54 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 16 deletions(-)

1 0

[bridgedb/develop] Merge branch 'fix/1839-rotation-periods' into develop
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit 9e1d438988b42bdd4a6801f4c509ad1f45b11bdb Merge: 50286fa ceac2ff Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 05:43:27 2015 +0000 Merge branch 'fix/1839-rotation-periods' into develop bridgedb.conf | 32 ++++++++++++++ lib/bridgedb/HTTPServer.py | 15 ++++--- lib/bridgedb/Main.py | 8 +--- lib/bridgedb/captcha.py | 2 +- lib/bridgedb/configure.py | 4 ++ lib/bridgedb/email/server.py | 12 ++++-- lib/bridgedb/schedule.py | 14 +++--- lib/bridgedb/test/email_helpers.py | 3 ++ lib/bridgedb/test/test_HTTPServer.py | 2 +- lib/bridgedb/test/test_email_server.py | 2 +- lib/bridgedb/test/test_schedule.py | 74 ++++++++++++++++---------------- 11 files changed, 107 insertions(+), 61 deletions(-)

1 0

[bridgedb/develop] Add a doctest for bridgedb.schedule.Unscheduled.
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit 35715f1c09a4d8bce57217835d13080a0323174a Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 10:13:30 2015 +0000 Add a doctest for bridgedb.schedule.Unscheduled. --- lib/bridgedb/schedule.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/schedule.py b/lib/bridgedb/schedule.py index 06914d9..4d0b8fd 100644 --- a/lib/bridgedb/schedule.py +++ b/lib/bridgedb/schedule.py @@ -64,8 +64,28 @@ class ISchedule(interface.Interface): class Unscheduled(object): - """A base ``Schedule`` that has only one period that contains all time.""" + """A base ``Schedule`` that has only one period that contains all time. + + >>> from bridgedb.schedule import fromUnixSeconds + >>> from bridgedb.schedule import Unscheduled + >>> timestamp = 1427769526 + >>> str(fromUnixSeconds(timestamp)) + '2015-03-31 02:38:46' + >>> sched = Unscheduled() + >>> start = sched.intervalStart(timestamp) + >>> start + -62135596800 + >>> str(fromUnixSeconds(start)) + '0001-01-01 00:00:00' + >>> sched.getInterval(timestamp) + '1970-01-01 00:00:00' + >>> next = sched.nextIntervalStarts(timestamp) + >>> next + 253402300799 + >>> str(fromUnixSeconds(next)) + '9999-12-31 23:59:59' + """ implements(ISchedule) def __init__(self, count=None, period=None):

1 0

[bridgedb/develop] Add doctest for bridgedb.schedule.ScheduledInterval.
by isis＠torproject.org 31 Mar '15

31 Mar '15

commit e68aa51060775961f572bb800b3fd08f174852cb Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 10:29:07 2015 +0000 Add doctest for bridgedb.schedule.ScheduledInterval. --- lib/bridgedb/schedule.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/lib/bridgedb/schedule.py b/lib/bridgedb/schedule.py index 4d0b8fd..659380f 100644 --- a/lib/bridgedb/schedule.py +++ b/lib/bridgedb/schedule.py @@ -138,6 +138,31 @@ class ScheduledInterval(Unscheduled): """An class that splits time into periods, based on seconds, minutes, hours, days, weeks, or months. + >>> from bridgedb.schedule import fromUnixSeconds + >>> from bridgedb.schedule import ScheduledInterval + >>> timestamp = 1427769526 + >>> str(fromUnixSeconds(timestamp)) + '2015-03-31 02:38:46' + >>> sched = ScheduledInterval(5, 'minutes') + >>> start = sched.intervalStart(timestamp) + >>> start + 1427769300 + >>> current = sched.getInterval(timestamp) + >>> current + '2015-03-31 02:35:00' + >>> current == str(fromUnixSeconds(start)) + True + >>> next = sched.nextIntervalStarts(timestamp) + >>> next + 1427769600 + >>> str(fromUnixSeconds(next)) + '2015-03-31 02:40:00' + >>> later = 1427771057 + >>> str(fromUnixSeconds(later)) + '2015-03-31 03:04:17' + >>> sched.getInterval(later) + '2015-03-31 03:00:00' + :ivar str intervalPeriod: One of the :data:`KNOWN_INTERVALS`. :ivar int intervalCount: The number of times **intervalPeriod** should be repeated within an interval.

1 0

[torbutton/master] Fix small typo in comment
by gk＠torproject.org 31 Mar '15

31 Mar '15

commit fc0c8ed76346f2bb0b4d139ca444cbc404df5d07 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 31 07:33:51 2015 +0000 Fix small typo in comment --- src/modules/tor-control-port.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index e4c7d16..de9f10a 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -606,7 +606,7 @@ event.messageToData = function (type, message) { // __event.watchEvent(controlSocket, type, filter, onData)__. // Watches for a particular type of event. If filter(data) returns true, the event's -// data is pass to the onData callback. Returns a zero arg function that +// data is passed to the onData callback. Returns a zero arg function that // stops watching the event. event.watchEvent = function (controlSocket, type, filter, onData) { return controlSocket.addNotificationCallback(new RegExp("^650." + type, "i"),

1 0

[torbutton/master] Bug #15510: Detach event watchers when finished
by gk＠torproject.org 31 Mar '15

31 Mar '15

commit f0e1d504dbf57f0c0041ae14f32a5a092a8a1afe Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Mar 30 14:50:27 2015 -0700 Bug #15510: Detach event watchers when finished --- src/chrome/content/tor-circuit-display.js | 15 +++++++++++---- src/modules/tor-control-port.js | 10 +++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 917f1f0..4197944 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -129,7 +129,7 @@ let getCircuitStatusByID = function* (aController, circuitID) { // corresponding circuit. Whenever the first stream on a new circuit is seen, // looks up u+p and records the node data in the credentialsToNodeDataMap. let collectIsolationData = function (aController) { - aController.watchEvent( + return aController.watchEvent( "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", streamEvent => Task.spawn(function* () { @@ -313,10 +313,13 @@ let syncDisplayWithSelectedTab = (function() { // A reference to this function (called createTorCircuitDisplay) is exported as a global. let setupDisplay = function (host, port, password, enablePrefName) { let myController = null, + stopCollectingIsolationData = null, stop = function() { if (myController) { syncDisplayWithSelectedTab(false); - myController.close(); + if (stopCollectingIsolationData) { + stopCollectingIsolationData(); + } myController = null; } }, @@ -326,16 +329,20 @@ let setupDisplay = function (host, port, password, enablePrefName) { // An error has occurred. logger.eclog(5, err); logger.eclog(5, "Disabling tor display circuit because of an error."); + myController.close(); stop(); }); syncDisplayWithSelectedTab(true); - collectIsolationData(myController); + stopCollectingIsolationData = collectIsolationData(myController); } }; try { let unbindPref = bindPrefAndInit(enablePrefName, on => { if (on) start(); else stop(); }); // When this chrome window is unloaded, we need to unbind the pref. - window.addEventListener("unload", unbindPref); + window.addEventListener("unload", function () { + unbindPref(); + stop(); + }); } catch (e) { logger.eclog(5, "Error: " + e.message + "\n" + e.stack); } diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 710643e..e4c7d16 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -606,9 +606,10 @@ event.messageToData = function (type, message) { // __event.watchEvent(controlSocket, type, filter, onData)__. // Watches for a particular type of event. If filter(data) returns true, the event's -// data is pass to the onData callback. +// data is pass to the onData callback. Returns a zero arg function that +// stops watching the event. event.watchEvent = function (controlSocket, type, filter, onData) { - controlSocket.addNotificationCallback(new RegExp("^650." + type, "i"), + return controlSocket.addNotificationCallback(new RegExp("^650." + type, "i"), function (message) { let data = event.messageToData(type, message); if (filter === null || filter(data)) { @@ -635,9 +636,8 @@ tor.controller = function (host, port, password, onError) { return { getInfo : key => info.getInfo(socket, key), getInfoMultiple : keys => info.getInfoMultiple(socket, keys), getConf : key => info.getConf(socket, key), - watchEvent : function (type, filter, onData) { - event.watchEvent(socket, type, filter, onData); - }, + watchEvent : (type, filter, onData) => + event.watchEvent(socket, type, filter, onData), isOpen : () => isOpen, close : () => { isOpen = false; socket.close(); } };

1 0

[webwml/master] Bug 15253: Add Tor Browser subkey fingerprints
by sebastian＠torproject.org 31 Mar '15

31 Mar '15

commit 1acf560c17e15f6144c57d1e75e9567e7a4e03ff Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 27 14:04:54 2015 +0000 Bug 15253: Add Tor Browser subkey fingerprints --- docs/en/verifying-signatures.wml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index ef916b4..89522d4 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -92,8 +92,12 @@ gpg: Good signature from "Tor Browser Developers (signing key) <torbrowser(a)torproject.org>" gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. - Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 - </pre> + Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290</pre> + Currently valid subkey fingerprints are: + <pre> + 5242 013F 02AF C851 B1C7 36B8 7017 ADCE F65C 2036 + BA1E E421 BBB4 5263 180E 1FC7 2E1A C68E D408 14E0 + 05FA 4425 3F6C 19A8 B7F5 18D4 2D00 0988 5898 39A3</pre> Notice that there is a warning because you haven't assigned a trust index to this person. This means that GnuPG verified that the key made @@ -143,16 +147,18 @@ For Linux users (change 32 to 64 if you have the 64-bit package): <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz{.asc*,}</pre> - The output should say "Good signature": + The output should say "Good signature": <pre> gpg: Signature made Tue 24 Jan 2015 09:29:09 AM CET using RSA key ID D40814E0 gpg: Good signature from "Tor Browser Developers (signing key) <torbrowser(a)torproject.org>" gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. - Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 - </pre> - + Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290</pre> Currently valid subkey fingerprints are: + <pre> + 5242 013F 02AF C851 B1C7 36B8 7017 ADCE F65C 2036 + BA1E E421 BBB4 5263 180E 1FC7 2E1A C68E D408 14E0 + 05FA 4425 3F6C 19A8 B7F5 18D4 2D00 0988 5898 39A3</pre> Notice that there is a warning because you haven't assigned a trust index to this person. This means that GnuPG verified that the key made @@ -160,7 +166,7 @@ to the developer. The best method is to meet the developer in person and exchange key fingerprints. - + If you're a Linux user and you're using the Debian Tor (not Tor Browser) packages, you should read the instructions on <a

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 31 Mar '15

31 Mar '15

commit 8641d095b49657929fa092f6e966a2caa1c50981 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 31 08:45:47 2015 +0000 Update translations for torbutton-torbuttonproperties --- sq/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sq/torbutton.properties b/sq/torbutton.properties index ca4d1b6..fcaa096 100644 --- a/sq/torbutton.properties +++ b/sq/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Shtojcat si Flash mund ta dëmtojnë privatës torbutton.popup.never_ask_again = Kurrë mos më pyesni më torbutton.popup.confirm_newnym = Tor Browser do t'i mbyllë të gjitha dritaret dhe skedat. Të gjitha sesionet e webfaqeve do të humbasin .\n\nDo ta rinisni Tor Browser tani, Për të rivendosur identitetin tuaj?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Menyja e qepës jeshile tani ka një rrëshqitës sigurie që ju lejon të përcaktoni nivelin e sigurisë tuaj. Provojeni! +torbutton.slider_notification_button = Hapeni konfigurimin e sigurisë -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Maksimizimi i Tor Browser mund t'i lejojë faqet e internetit që të përcaktojnë përmasat e monitorit tuaj, çka mund të përdoret për t'ju gjurmuar. Ne rekomandojmë që ju ta lini dritaren e Tor Browser në madhësinë e vet origjinale të parazgjedhur. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Kjo faqe (%S) po mundohet të nxjerrë të dhëna imazhi HTML5, të cilat mund të përdoren për të identifikuar kompjuterin tuaj në mënyrë të veçantë.\n\nA duhet Tor Browser ta lejojë këtë faqe të nxjerrë, që të nxjerrë të dhënat e imazheve HTML5?

1 0