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

[ooni-probe/master] * Updated .gitignore to ignore reports.
by isis＠torproject.org 23 Oct '12

23 Oct '12

commit 59e1a487f2bd2b9019c0d78e3e8ec88dd7077093 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 23 11:05:31 2012 +0000 * Updated .gitignore to ignore reports. --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 7025064..4a6b565 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ oonib/oonibackend.conf oonib/data/* fluff/ pcaps/ +report*.yaml

1 0

[ooni-probe/master] Make logged work again
by art＠torproject.org 23 Oct '12

23 Oct '12

commit c39e1f412ce8362db0832072f0b870646b1eb42d Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Oct 23 09:12:59 2012 +0000 Make logged work again * A good opportunity to refactor logging related code * Implement time related utilities * Start outlining configuration script * Move netalyzr test to nettest * XXX the new API tests are not working properly --- nettests/core/dnstamper.py | 23 +++- nettests/core/http_host.py | 15 +++ nettests/third_party/Makefile | 3 + nettests/third_party/README | 14 ++ nettests/third_party/netalyzr.py | 42 ++++++ .../ooni/plugins/netalyzr_plgoo.py | 30 ----- old-to-be-ported-code/third-party/Makefile | 3 - old-to-be-ported-code/third-party/README | 14 -- ooni/config.py | 7 + ooni/nettest.py | 11 ++- ooni/runner.py | 1 + ooni/utils/log.py | 132 ++++++------------- ooni/utils/otime.py | 43 +++++++ 13 files changed, 197 insertions(+), 141 deletions(-) diff --git a/nettests/core/dnstamper.py b/nettests/core/dnstamper.py index 0f40c1c..1028291 100644 --- a/nettests/core/dnstamper.py +++ b/nettests/core/dnstamper.py @@ -27,7 +27,7 @@ class DNSTamperTest(nettest.TestCase): name = "DNS tamper" description = "DNS censorship detection test" - version = '0.2' + version = "0.2" lookupTimeout = [1] @@ -38,8 +38,7 @@ class DNSTamperTest(nettest.TestCase): optParameters = [['controlresolver', 'c', '8.8.8.8', 'Known good DNS server'], ['testresolvers', 't', None, - 'file containing list of DNS resolvers to test against'] - ] + 'file containing list of DNS resolvers to test against']] def setUp(self): self.report['test_lookups'] = {} @@ -130,6 +129,24 @@ class DNSTamperTest(nettest.TestCase): self.test_a_lookups[resolver] = None def test_lookup(self): + """ + We perform an A lookup on the DNS test servers for the domains to be + tested and an A lookup on the known good DNS server. + + We then compare the results from test_resolvers and that from + control_resolver and see if the match up. + If they match up then no censorship is happening (tampering: false). + + If they do not we do a reverse lookup (PTR) on the test_resolvers and + the control resolver for every IP address we got back and check to see + if anyone of them matches the control ones. + + If they do then we take not of the fact that censorship is probably not + happening (tampering: reverse-match). + + If they do not match then censorship is probably going on (tampering: + true). + """ print "Doing the test lookups on %s" % self.input list_of_ds = [] hostname = self.input diff --git a/nettests/core/http_host.py b/nettests/core/http_host.py index 2228c52..62b50ca 100644 --- a/nettests/core/http_host.py +++ b/nettests/core/http_host.py @@ -12,6 +12,10 @@ from ooni.templates import httpt class HTTPHost(httpt.HTTPTest): + """ + This test is aimed at detecting the presence of a transparent HTTP proxy + and enumerating the sites that are being censored by it. + """ name = "HTTP Host" author = "Arturo Filastò" version = 0.1 @@ -23,11 +27,22 @@ class HTTPHost(httpt.HTTPTest): inputFile = ['urls', 'f', None, 'Urls file'] def test_send_host_header(self): + """ + Stuffs the HTTP Host header field with the site to be tested for + censorship and does an HTTP request of this kind to our backend. + + We randomize the HTTP User Agent headers. + """ headers = {} headers["Host"] = [self.input] return self.doRequest(self.localOptions['backend'], headers=headers) def processResponseBody(self, body): + """ + XXX this is to be filled in with either a domclass based classified or + with a rule that will allow to detect that the body of the result is + that of a censored site. + """ if 'not censored' in body: self.report['trans_http_proxy'] = False else: diff --git a/nettests/third_party/Makefile b/nettests/third_party/Makefile new file mode 100644 index 0000000..16adfe0 --- /dev/null +++ b/nettests/third_party/Makefile @@ -0,0 +1,3 @@ +fetch: + wget http://netalyzr.icsi.berkeley.edu/NetalyzrCLI.jar + chmod +x NetalyzrCLI.jar diff --git a/nettests/third_party/README b/nettests/third_party/README new file mode 100644 index 0000000..d9e435f --- /dev/null +++ b/nettests/third_party/README @@ -0,0 +1,14 @@ +There is no license for NetalyzrCLI.jar; so while we include it, it's just +for ease of use. + +We currently support interfacing with the ICSI Netalyzr system by wrapping +the NetalyzrCLI.jar client. It was downloaded on August 5th, 2011 from the +following URL: + http://netalyzr.icsi.berkeley.edu/NetalyzrCLI.jar + +More information about the client is available on the cli web page: + http://netalyzr.icsi.berkeley.edu/cli.html + +After looking at NetalyzrCLI.jar, I discovered that '-d' runs it in a +debugging mode that is quite useful for understanding their testing +framework as it runs. diff --git a/nettests/third_party/netalyzr.py b/nettests/third_party/netalyzr.py new file mode 100644 index 0000000..041c0be --- /dev/null +++ b/nettests/third_party/netalyzr.py @@ -0,0 +1,42 @@ +# -*- encoding: utf-8 -*- +# +# This is a wrapper around the Netalyzer Java command line client +# +# :authors: Jacob Appelbaum <jacob(a)appelbaum.net> +# Arturo "hellais" Filastò <art(a)fuffa.org> +# :licence: see LICENSE + +from ooni import nettest +from ooni.utils import log +import time +import os + +class NetalyzrWrapperTest(nettest.TestCase): + name = "NetalyzrWrapper" + type = "wrapper" + + def setUp(self): + cwd = os.path.join(os.path.abspath(__file__), '..') + + # XXX set the output directory to something more uniform + outputdir = os.path.join(cwd, '..', '..') + + program_path = os.path.join(cwd, 'NetalyzrCLI') + program = "java -jar %s " % program_path + + test_token = time.asctime(time.gmtime()).replace(" ", "_").strip() + + output_file = os.path.join(outputdir, + "NetalyzrCLI_" + test_token + ".out") + output_file.strip() + self.run_me = program + " 2>&1 >> " + output_file + + def test_run_netalyzr(self): + """ + This test simply wraps netalyzr and runs it from command line + """ + log.msg("running NetalyzrWrapper with command '%s'" % self.run_me) + os.system(self.run_me) + self.report['netalyzr_report'] = self.output_file + log.msg("finished running NetalzrWrapper") + diff --git a/old-to-be-ported-code/ooni/plugins/netalyzr_plgoo.py b/old-to-be-ported-code/ooni/plugins/netalyzr_plgoo.py deleted file mode 100644 index 05e0990..0000000 --- a/old-to-be-ported-code/ooni/plugins/netalyzr_plgoo.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/python -# This is a wrapper around the Netalyzer Java command line client -# by Jacob Appelbaum <jacob(a)appelbaum.net> -# -from ooni.plugooni import Plugoo -import time -import os - -class NetalyzrPlugin(Plugoo): - def __init__(self): - self.name = "Netalyzr" - self.type = "wrapper" - self.paranoia = "low" - self.modules_to_import = ["os", "time"] - self.output_dir = "results/" - self.program = "java -jar third-party/NetalyzrCLI.jar " - self.test_token = time.asctime(time.gmtime()).replace(" ", "_").strip() - self.output_file = self.output_dir + "NetalyzrCLI_" + self.test_token + ".out" - self.output_file.strip() - self.run_me = self.program + " 2>&1 >> " + self.output_file - - def NetalzrWrapper(self): - return os.system(self.run_me) - - def ooni_main(self, cmd): - print "running NetalzrWrapper" - r = self.NetalzrWrapper() - print "finished running NetalzrWrapper" - return r - diff --git a/old-to-be-ported-code/third-party/Makefile b/old-to-be-ported-code/third-party/Makefile deleted file mode 100644 index 16adfe0..0000000 --- a/old-to-be-ported-code/third-party/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -fetch: - wget http://netalyzr.icsi.berkeley.edu/NetalyzrCLI.jar - chmod +x NetalyzrCLI.jar diff --git a/old-to-be-ported-code/third-party/README b/old-to-be-ported-code/third-party/README deleted file mode 100644 index d9e435f..0000000 --- a/old-to-be-ported-code/third-party/README +++ /dev/null @@ -1,14 +0,0 @@ -There is no license for NetalyzrCLI.jar; so while we include it, it's just -for ease of use. - -We currently support interfacing with the ICSI Netalyzr system by wrapping -the NetalyzrCLI.jar client. It was downloaded on August 5th, 2011 from the -following URL: - http://netalyzr.icsi.berkeley.edu/NetalyzrCLI.jar - -More information about the client is available on the cli web page: - http://netalyzr.icsi.berkeley.edu/cli.html - -After looking at NetalyzrCLI.jar, I discovered that '-d' runs it in a -debugging mode that is quite useful for understanding their testing -framework as it runs. diff --git a/ooni/config.py b/ooni/config.py new file mode 100644 index 0000000..96a1ee0 --- /dev/null +++ b/ooni/config.py @@ -0,0 +1,7 @@ +from ooni.utils import Storage + +# XXX move this to an actual configuration file +basic = Storage() +advanced = Storage() + +advanced.debug = True diff --git a/ooni/nettest.py b/ooni/nettest.py index f1232c7..768833a 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -3,7 +3,7 @@ import os from twisted.python import log, usage from twisted.trial import unittest, itrial -from twisted.internet import defer +from twisted.internet import defer, utils pyunit = __import__('unittest') @@ -79,6 +79,15 @@ class TestCase(unittest.TestCase): optParameters = None + def _run(self, methodName, result): + from twisted.internet import reactor + method = getattr(self, methodName) + d = defer.maybeDeferred( + utils.runWithWarningsSuppressed, self._getSuppress(), method) + d.addBoth(lambda x : call.active() and call.cancel() or x) + return d + + def deferSetUp(self, ignored, result): """ If we have the reporterFactory set we need to write the header. If such diff --git a/ooni/runner.py b/ooni/runner.py index 7aa8676..1fbc4fe 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -238,6 +238,7 @@ class ORunner(object): result.done() def run(self): + log.start() self.reporterFactory.options = self.options for inputUnit in InputUnitFactory(self.inputs): self.runWithInputUnit(inputUnit) diff --git a/ooni/utils/log.py b/ooni/utils/log.py index eef50d8..2b5c1ac 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -1,98 +1,50 @@ -""" -OONI logging facility. -""" -from sys import stderr, stdout - -from twisted.python import log, util -from twisted.python.failure import Failure - -def _get_log_level(level): - english = ['debug', 'info', 'warn', 'err', 'crit'] - - levels = dict(zip(range(len(english)), english)) - number = dict(zip(english, range(len(english)))) - - if not level: - return number['info'] +# -*- encoding: utf-8 -*- +# +# :authors: Arturo Filastò +# :licence: see LICENSE + +import sys +import os +import logging + +from twisted.python import log as txlog +from twisted.python.logfile import DailyLogFile + +from ooni.utils import otime +from ooni import config + +# XXX make this a config option +log_file = "/tmp/ooniprobe.log" + +log_folder = os.path.join('/', *log_file.split('/')[:-1]) +log_filename = log_file.split('/')[-1] +daily_logfile = DailyLogFile(log_filename, log_folder) + +def start(): + txlog.msg("Starting OONI on %s (%s UTC)" % (otime.prettyDateNow(), + otime.utcPrettyDateNow())) + logging.basicConfig() + python_logging = txlog.PythonLoggingObserver() + if config.advanced.debug: + python_logging.logger.setLevel(logging.DEBUG) else: - ve = "Unknown log level: %s\n" % level - ve += "Allowed levels: %s\n" % [word for word in english] - - if type(level) is int: - if 0 <= level <= 4: - return level - elif type(level) is str: - if number.has_key(level.lower()): - return number[level] - else: - raise ValueError, ve - else: - raise ValueError, ve - -class OONITestFailure(Failure): - """ - For handling Exceptions asynchronously. - - Can be given an Exception as an argument, else will use the - most recent Exception from the current stack frame. - """ - def __init__(self, exception=None, _type=None, - _traceback=None, _capture=False): - Failure.__init__(self, exc_type=_type, - exc_tb=_traceback, captureVars=_capture) - -class OONILogObserver(log.FileLogObserver): - """ - Supports logging level verbosity. - """ - def __init__(self, logfile, verb=None): - log.FileLogObserver.__init__(self, logfile) - self.level = _get_log_level(verb) if verb is not None else 1 - assert type(self.level) is int - - def emit(self, eventDict): - if 'logLevel' in eventDict: - msgLvl = _get_log_level(eventDict['logLevel']) - assert type(msgLvl) is int - ## only log our level and higher - if self.level <= msgLvl: - text = log.textFromEventDict(eventDict) - else: - text = None - else: - text = log.textFromEventDict(eventDict) - - if text is None: - return - - timeStr = self.formatTime(eventDict['time']) - fmtDict = {'system': eventDict['system'], - 'text': text.replace('\n','\n\t')} - msgStr = log._safeFormat("[%(system)s] %(text)s\n", fmtDict) - - util.untilConcludes(self.write, timeStr + " " + msgStr) - util.untilConcludes(self.flush) + python_logging.logger.setLevel(logging.INFO) -def start(logfile=None, verbosity=None): - if log.defaultObserver: - verbosity = _get_log_level(verbosity) + txlog.startLoggingWithObserver(python_logging.emit) - ## Always log to file, keep level at info - file = open(logfile, 'a') if logfile else stderr - OONILogObserver(file, "info").start() + txlog.addObserver(txlog.FileLogObserver(daily_logfile).emit) - log.msg("Starting OONI...") +def stop(): + txlog.msg("Stopping OONI") -def debug(message, level="debug", **kw): - print "[%s] %s" % (level, message) - ## If we want debug messages in the logfile: - #log.msg(message, logLevel=level, **kw) +def msg(msg, *arg, **kw): + txlog.msg(msg, logLevel=logging.INFO, *arg, **kw) -def msg(message, level="info", **kw): - log.msg(message, logLevel=level, **kw) +def debug(msg, *arg, **kw): + txlog.msg(msg, logLevel=logging.DEBUG, *arg, **kw) -def err(message, level="err", **kw): - log.err(logLevel=level, **kw) +def err(msg, *arg, **kw): + txlog.err(msg, logLevel=logging.ERROR, *arg, **kw) -def fail(message, exception, level="crit", **kw): - log.failure(message, OONITestFailure(exception, **kw), logLevel=level) +def exception(*msg): + logging.exception(msg) diff --git a/ooni/utils/otime.py b/ooni/utils/otime.py new file mode 100644 index 0000000..11f7be1 --- /dev/null +++ b/ooni/utils/otime.py @@ -0,0 +1,43 @@ +# -*- encoding: utf-8 -*- +# +# :authors: Arturo Filastò +# :licence: see LICENSE + +""" +Here is the location for all time and date related utility functions. +""" +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. + """ + return datetime.now().ctime() + +def utcPrettyDateNow(): + """ + Returns a good looking string for utc time. + """ + return datetime.utcnow().ctime() + +def timeToPrettyDate(time_val): + return time.ctime(time_val)

1 0

[ooni-probe/master] Port Netalyzr test to new API
by art＠torproject.org 23 Oct '12

23 Oct '12

commit f5bfad914eeb18dd104aaf44baa58a6502947074 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Oct 23 10:01:49 2012 +0000 Port Netalyzr test to new API * Make new generation tests work properly --- nettests/third_party/netalyzr.py | 10 +++++----- ooni/nettest.py | 5 +++-- ooni/oonicli.py | 11 ++++++----- ooni/reporter.py | 9 ++++----- ooni/runner.py | 11 +++++------ 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/nettests/third_party/netalyzr.py b/nettests/third_party/netalyzr.py index 041c0be..bf94000 100644 --- a/nettests/third_party/netalyzr.py +++ b/nettests/third_party/netalyzr.py @@ -13,15 +13,14 @@ import os class NetalyzrWrapperTest(nettest.TestCase): name = "NetalyzrWrapper" - type = "wrapper" def setUp(self): - cwd = os.path.join(os.path.abspath(__file__), '..') + cwd = os.path.abspath(os.path.join(os.path.abspath(__file__), '..')) # XXX set the output directory to something more uniform outputdir = os.path.join(cwd, '..', '..') - program_path = os.path.join(cwd, 'NetalyzrCLI') + program_path = os.path.join(cwd, 'NetalyzrCLI.jar') program = "java -jar %s " % program_path test_token = time.asctime(time.gmtime()).replace(" ", "_").strip() @@ -35,8 +34,9 @@ class NetalyzrWrapperTest(nettest.TestCase): """ This test simply wraps netalyzr and runs it from command line """ - log.msg("running NetalyzrWrapper with command '%s'" % self.run_me) + log.msg("Running NetalyzrWrapper (this will take some time, be patient)") + log.debug("with command '%s'" % self.run_me) os.system(self.run_me) self.report['netalyzr_report'] = self.output_file - log.msg("finished running NetalzrWrapper") + log.debug("finished running NetalzrWrapper") diff --git a/ooni/nettest.py b/ooni/nettest.py index 768833a..d35bd4d 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -1,9 +1,9 @@ import itertools import os -from twisted.python import log, usage from twisted.trial import unittest, itrial from twisted.internet import defer, utils +from ooni.utils import log pyunit = __import__('unittest') @@ -79,9 +79,10 @@ class TestCase(unittest.TestCase): optParameters = None - def _run(self, methodName, result): + def _raaun(self, methodName, result): from twisted.internet import reactor method = getattr(self, methodName) + log.debug("Running %s" % methodName) d = defer.maybeDeferred( utils.runWithWarningsSuppressed, self._getSuppress(), method) d.addBoth(lambda x : call.active() and call.cancel() or x) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index ef80c33..5ea92d7 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -26,7 +26,7 @@ from ooni import nettest, runner, reporter from twisted.internet import defer from twisted.application import app -from twisted.python import usage, reflect, failure, log +from twisted.python import usage, reflect, failure from twisted.python.filepath import FilePath from twisted import plugin from twisted.python.util import spewer @@ -34,6 +34,8 @@ from twisted.python.compat import set from twisted.trial import itrial from twisted.trial import runner as irunner +from ooni.utils import log + class Options(usage.Options, app.ReactorSelectionMixin): synopsis = """%s [options] [[file|package|module|TestCase|testmethod]...] """ % (os.path.basename(sys.argv[0]),) @@ -90,6 +92,9 @@ class Options(usage.Options, app.ReactorSelectionMixin): def run(): + log.start() + log.debug("Started logging") + if len(sys.argv) == 1: sys.argv.append("--help") config = Options() @@ -101,10 +106,6 @@ def run(): if config['debug-stacktraces']: defer.setDebugging(True) - #logFile = open(config['logfile'], 'w') - #logFileObserver = log.FileLogObserver(logFile) - #log.startLoggingWithObserver(logFileObserver.emit, 0) - classes = runner.findTestClassesFromConfig(config) casesList, options = runner.loadTestsAndOptions(classes, config) diff --git a/ooni/reporter.py b/ooni/reporter.py index fd64cbe..a7b645b 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -132,7 +132,8 @@ class ReporterFactory(OReporter): client_geodata = {} log.msg("Running geo IP lookup via check.torproject.org") - client_ip = yield geodata.myIP() + #client_ip = yield geodata.myIP() + client_ip = '127.0.0.1' try: import txtorcon client_location = txtorcon.util.NetLocation(client_ip) @@ -209,10 +210,8 @@ class OONIReporter(OReporter): test_input = test.input self._tests[idx]['input'] = test_input - #self._tests[idx]['idx'] = idx self._tests[idx]['name'] = test.name - #self._tests[idx]['test'] = test - print "Now starting %s" % self._tests[idx] + log.debug("Now starting %s" % self._tests[idx]) def stopTest(self, test): @@ -230,7 +229,7 @@ class OONIReporter(OReporter): # actually end up with the report I want. This could either be a # python bug or a yaml bug. report = dict(test.report) - + log.debug("Adding to report %s" % report) self._tests[idx]['report'] = report diff --git a/ooni/runner.py b/ooni/runner.py index 1fbc4fe..b5c33a0 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -49,10 +49,7 @@ def isLegacyTest(obj): We do this for backward compatibility of the OONIProbe API. """ try: - if issubclass(obj, oonitests.OONITest) and not obj == oonitests.OONITest: - return True - else: - return False + return issubclass(obj, oonitests.OONITest) and not obj == oonitests.OONITest except TypeError: return False @@ -116,8 +113,10 @@ def findTestClassesFromConfig(config): module = filenameToModule(filename) for name, val in inspect.getmembers(module): if isTestCase(val): + log.debug("Detected TestCase %s" % val) classes.append(processTest(val, config)) elif isLegacyTest(val): + log.debug("Detected Legacy Test %s" % val) classes.append(adapt_legacy_test(val, config)) return classes @@ -200,7 +199,8 @@ class ORunner(object): try: first = options.pop(0) except: - first = {} + first = options + if 'inputs' in first: self.inputs = options['inputs'] else: @@ -238,7 +238,6 @@ class ORunner(object): result.done() def run(self): - log.start() self.reporterFactory.options = self.options for inputUnit in InputUnitFactory(self.inputs): self.runWithInputUnit(inputUnit)

1 0

[ooni-probe/master] Add some notes on netalyzr test
by art＠torproject.org 23 Oct '12

23 Oct '12

commit 4b8f4407562d55167c182b52be0f49432e5223ed Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Oct 23 10:04:35 2012 +0000 Add some notes on netalyzr test --- nettests/third_party/netalyzr.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/nettests/third_party/netalyzr.py b/nettests/third_party/netalyzr.py index bf94000..d73c245 100644 --- a/nettests/third_party/netalyzr.py +++ b/nettests/third_party/netalyzr.py @@ -36,6 +36,11 @@ class NetalyzrWrapperTest(nettest.TestCase): """ log.msg("Running NetalyzrWrapper (this will take some time, be patient)") log.debug("with command '%s'" % self.run_me) + # XXX we probably want to use a processprotocol here to obtain the + # stdout from Netalyzr. This would allows us to visualize progress + # (currently there is no progress because the stdout of os.system is + # trapped by twisted) and to include the link to the netalyzr report + # directly in the OONI report, perhaps even downloading it. os.system(self.run_me) self.report['netalyzr_report'] = self.output_file log.debug("finished running NetalzrWrapper")

1 0

r25852: {website} bump stable TBBs to 2.2.39-4 and all alpha/rc bundles for 0. (website/trunk/include)
by Erinn Clark 23 Oct '12

23 Oct '12

Author: erinn Date: 2012-10-23 09:49:55 +0000 (Tue, 23 Oct 2012) New Revision: 25852 Modified: website/trunk/include/versions.wmi Log: bump stable TBBs to 2.2.39-4 and all alpha/rc bundles for 0.2.3.23-rc Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-10-22 03:51:05 UTC (rev 25851) +++ website/trunk/include/versions.wmi 2012-10-23 09:49:55 UTC (rev 25852) @@ -2,61 +2,61 @@ <define-tag version-alpha whitespace=delete>0.2.3.23-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.3.22-rc</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.3.23-rc</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.22-rc</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.23-rc</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.22-rc-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.22-rc-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.22-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.23-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.23-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.23-rc-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.22-rc</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.23-rc</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.22-rc</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.23-rc</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.22-rc</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.23-rc</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.22-rc</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.23-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.39-3</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.39-4</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.39</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.20-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>10.0.9esr</define-tag> -<define-tag version-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> +<define-tag version-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlealpha whitespace=delete>2.3.22-alpha-1</define-tag> -<define-tag version-torobfsbundlealpha whitespace=delete>2.3.22-alpha-1</define-tag> +<define-tag version-torbrowserbundlealpha whitespace=delete>2.3.23-alpha-1</define-tag> +<define-tag version-torobfsbundlealpha whitespace=delete>2.3.23-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.39-3</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.39-3</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.39-4</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.39-4</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.39</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.20-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.9esr</define-tag> -<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> +<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> -<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.22-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.22-alpha-1</define-tag> -<define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.3.22-alpha-1</define-tag> -<define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.3.22-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.23-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.23-alpha-1</define-tag> +<define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.3.23-alpha-1</define-tag> +<define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.3.23-alpha-1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.39-3</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.39-3</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.39-4</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.39-4</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.39</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.9esr</define-tag> -<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> +<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> -<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.22-alpha-1</define-tag> -<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.3.22-alpha-1</define-tag> -<define-tag version-torobfsbundleosx32alpha whitespace=delete>2.3.22-alpha-1</define-tag> -<define-tag version-torobfsbundleosx64alpha whitespace=delete>2.3.22-alpha-1</define-tag> +<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.23-alpha-1</define-tag> +<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.3.23-alpha-1</define-tag> +<define-tag version-torobfsbundleosx32alpha whitespace=delete>2.3.23-alpha-1</define-tag> +<define-tag version-torobfsbundleosx64alpha whitespace=delete>2.3.23-alpha-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.20</define-tag> <define-tag version-vidalia-alpha whitespace=delete>0.3.1</define-tag>

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 23 Oct '12

23 Oct '12

commit 9d50a00bcf71de555f24bbed8daa6684e13921da Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 23 09:45:26 2012 +0000 Update translations for orbot_completed --- values/strings.xml | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/values/strings.xml b/values/strings.xml index 70f66b4..35837d8 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -25,8 +25,8 @@ <string name="menu_stop">Stop</string> <string name="menu_about">About</string> <string name="menu_wizard">Wizard</string> - <string name="main_layout_download">Download (speed/total)</string> - <string name="main_layout_upload">Upload (speed/total)</string> + <string name="main_layout_download">Download</string> + <string name="main_layout_upload">Upload</string> <string name="button_help">Help</string> <string name="button_close">Close</string> <string name="button_about">About</string> @@ -71,12 +71,15 @@ <string name="wizard_configure_all">Proxy All Apps Through Tor</string> <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> <string name="wizard_tips_tricks">Orbot-enabled Apps</string> - <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string> + <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> - <string name="wizard_tips_duckgo">Duckduckgo Search Engine app</string> - <string name="wizard_tips_firefox">Firefox with Proxy Mobile add-on (extra install after)</string> - <string name="wizard_tips_twitter">Twitter supports http proxy \"localhost:8118\"</string> + <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> + <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy Settings</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Orbot is ready!</string> @@ -102,9 +105,11 @@  <string name="wizard_tips_title">Orbot-Enabled Apps</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> + <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> + <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 23 Oct '12

23 Oct '12

commit 14ce81ec989452ebf0255e5df04f1384d2c3992f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 23 09:45:20 2012 +0000 Update translations for orbot --- values/strings.xml | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/values/strings.xml b/values/strings.xml index 70f66b4..35837d8 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -25,8 +25,8 @@ <string name="menu_stop">Stop</string> <string name="menu_about">About</string> <string name="menu_wizard">Wizard</string> - <string name="main_layout_download">Download (speed/total)</string> - <string name="main_layout_upload">Upload (speed/total)</string> + <string name="main_layout_download">Download</string> + <string name="main_layout_upload">Upload</string> <string name="button_help">Help</string> <string name="button_close">Close</string> <string name="button_about">About</string> @@ -71,12 +71,15 @@ <string name="wizard_configure_all">Proxy All Apps Through Tor</string> <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> <string name="wizard_tips_tricks">Orbot-enabled Apps</string> - <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string> + <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> - <string name="wizard_tips_duckgo">Duckduckgo Search Engine app</string> - <string name="wizard_tips_firefox">Firefox with Proxy Mobile add-on (extra install after)</string> - <string name="wizard_tips_twitter">Twitter supports http proxy \"localhost:8118\"</string> + <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> + <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy Settings</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Orbot is ready!</string> @@ -102,9 +105,11 @@  <string name="wizard_tips_title">Orbot-Enabled Apps</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> + <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> + <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>

1 0

[tor/master] Fix more madness from the split_circuitbuild merge
by nickm＠torproject.org 22 Oct '12

22 Oct '12

commit 848333c6d6d65775cb787755577c4b24ae512389 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 22 14:36:30 2012 -0400 Fix more madness from the split_circuitbuild merge --- src/or/circuitbuild.c | 6 ++++-- src/or/circuitbuild.h | 4 ++++ src/or/entrynodes.c | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5e85b3e..1fb93bb 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -993,7 +993,8 @@ pathbias_get_notice_rate(const or_options_t *options) DFLT_PATH_BIAS_NOTICE_PCT, 0, 100)/100.0; } -static double +/* XXXX024 I'd like to have this be static again, but entrynodes.c needs it. */ +double pathbias_get_disable_rate(const or_options_t *options) { // XXX: This needs tuning based on use + experimentation before we set it @@ -2152,7 +2153,8 @@ choose_good_middle_server(uint8_t purpose, * If <b>state</b> is NULL, we're choosing a router to serve as an entry * guard, not for any particular circuit. */ -static const node_t * +/* XXXX024 I'd like to have this be static again, but entrynodes.c needs it. */ +const node_t * choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) { const node_t *choice; diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index a1d4072..78575af 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -51,5 +51,9 @@ void extend_info_free(extend_info_t *info); const node_t *build_state_get_exit_node(cpath_build_state_t *state); const char *build_state_get_exit_nickname(cpath_build_state_t *state); +const node_t *choose_good_entry_server(uint8_t purpose, + cpath_build_state_t *state); +double pathbias_get_disable_rate(const or_options_t *options); + #endif diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index a9651d8..edb26dc 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -13,13 +13,16 @@ **/ #include "or.h" -#include "circuitbuild.c" +#include "circuitbuild.h" +#include "circuitstats.h" #include "config.h" +#include "confparse.h" #include "connection.h" #include "connection_or.h" #include "control.h" #include "directory.h" #include "entrynodes.h" +#include "main.h" #include "nodelist.h" #include "policies.h" #include "router.h"

1 0

[tor/master] Kill extraneous x from 907db008ab0007f0a02
by nickm＠torproject.org 22 Oct '12

22 Oct '12

commit fa6a65756fff4f2c1da82839199baecdb410b5c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 22 14:28:37 2012 -0400 Kill extraneous x from 907db008ab0007f0a02 Looks like clang doesn't complain about this kind of thing. Spotted by Andrea. Bug not in any released version. --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index da73f78..6eace9f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -27,7 +27,7 @@ #include "dirserv.h" #include "dirvote.h" #include "dns.h" -#include "entrynodes.h"x +#include "entrynodes.h" #include "geoip.h" #include "hibernate.h" #include "main.h"

1 0

[orbot/master] slight button resize to stop text cutoff
by n8fr8＠torproject.org 22 Oct '12

22 Oct '12

commit 8b8b9fabb6f3d68f55d760864ab8d3d0c4fc1a65 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 22 20:50:10 2012 +0530 slight button resize to stop text cutoff --- res/layout/layout_main.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index c995186..cfb0324 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -132,7 +132,7 @@ <Button android:id="@+id/slideButton" android:layout_width="wrap_content" - android:layout_height="35dp" + android:layout_height="wrap_content" android:text="@string/menu_log" ></Button> <RelativeLayout android:id="@+id/trafficRow"

1 0