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

[ooni-probe/master] Work on input file handling
by art＠torproject.org 07 Oct '12

07 Oct '12

commit 09b3483dd2577e1a78eee47db8d04a3fcb5b1db8 Author: Arturo Filastò <arturo(a)filasto.net> Date: Sun Oct 7 23:35:43 2012 +0000 Work on input file handling --- ooni/runner.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index 1a03814..bb63428 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -94,18 +94,18 @@ def adaptLegacyTest(obj, config): return LegacyOONITest def processTest(obj, config): - if obj.optParameters or obj.inputFile: + inputFile = obj.inputFile + + if obj.optParameters or inputFile: if not obj.optParameters: obj.optParameters = [] + if inputFile: + obj.optParameters.append(inputFile) + class Options(usage.Options): optParameters = obj.optParameters - inputFile = obj.inputFile - if inputFile: - Options.optParameters.append(inputFile) - - print Options.optParameters options = Options() options.parseOptions(config['subArgs'])

1 0

[ooni-probe/master] Work on scapy related functionality
by art＠torproject.org 07 Oct '12

07 Oct '12

commit 0f78e3f66aeeb3f830f2ff2b0cd5a465a764ec9e Author: Arturo Filastò <arturo(a)filasto.net> Date: Sun Oct 7 21:57:54 2012 +0000 Work on scapy related functionality * Discover the existence of bugs in scapy when using Arch Linux. (probably has to do with the non existence of ifconfig, somebody should make a ifconfig to ip wrapper that suggests the user with the equivalent ip command. This would assist sysadmins in migrating away from a deprecated tool and persist backward comaptibility) * Fix bugs in runner and nettest --- nettests/examples/example_scapyt.py | 16 ++++++++++++++++ ooni/nettest.py | 2 +- ooni/oonicli.py | 9 +++++++++ ooni/runner.py | 4 +++- ooni/templates/scapyt.py | 22 +++++++--------------- 5 files changed, 36 insertions(+), 17 deletions(-) diff --git a/nettests/examples/example_scapyt.py b/nettests/examples/example_scapyt.py index 1cc8054..403ddc5 100644 --- a/nettests/examples/example_scapyt.py +++ b/nettests/examples/example_scapyt.py @@ -13,3 +13,19 @@ class ExampleScapy(scapyt.ScapyTest): inputs = [IP(dst="8.8.8.8")/TCP(dport=31337), IP(dst="ooni.nu")/TCP(dport=31337)] + + def test_sendReceive(self): + log.msg("Running send receive") + if self.receive: + log.msg("Sending and receiving packets.") + d = self.sendReceivePackets(self.buildPackets()) + else: + log.msg("Sending packets.") + d = self.sendPackets(self.buildPackets()) + + def finished(data): + log.msg("Finished sending") + return data + + d.addCallback(finished) + return diff --git a/ooni/nettest.py b/ooni/nettest.py index 7f9562a..e7ae7d5 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -103,7 +103,7 @@ class TestCase(unittest.TestCase): self.inputs = self.inputProcessor(fp) elif not self.inputs[0]: pass - else: + elif self.inputFile: raise usage.UsageError("No input file specified!") # XXX perhaps we may want to name and version to be inside of a # different object that is not called options. diff --git a/ooni/oonicli.py b/ooni/oonicli.py index af93af9..40c01fd 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -43,6 +43,8 @@ class Options(usage.Options, app.ReactorSelectionMixin): "files listed on the command line") optFlags = [["help", "h"], + ['debug-stacktraces', 'B', + 'Report deferred creation and callback stack traces'], ] optParameters = [ @@ -96,6 +98,13 @@ def run(): except usage.error, ue: raise SystemExit, "%s: %s" % (sys.argv[0], ue) + 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) diff --git a/ooni/runner.py b/ooni/runner.py index 0b9503a..1a03814 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -7,6 +7,8 @@ import inspect from twisted.internet import defer, reactor from twisted.python import reflect, failure, usage +from twisted.python import log as tlog + from twisted.trial import unittest from twisted.trial.runner import TrialRunner, TestLoader from twisted.trial.runner import isPackage, isTestCase, ErrorHolder @@ -183,7 +185,7 @@ class ORunner(object): them in input units. I also create all the report instances required to run the tests. """ - def __init__(self, cases, options=None, config=None): + def __init__(self, cases, options=None, config=None, *arg, **kw): self.baseSuite = InputTestSuite self.cases = cases self.options = options diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index ac32ad8..b2ac148 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -31,7 +31,7 @@ class ScapyTest(TestCase): receive = True timeout = 1 - pcapfile = '/home/x/code/networking/ooni-probe/scapytest.pcap' + pcapfile = None input = IP()/TCP() reactor = None def setUp(self): @@ -44,23 +44,15 @@ class ScapyTest(TestCase): def tearDown(self): self.reactor.stop() - def test_sendReceive(self): - log.msg("Running send receive") - if self.receive: - log.msg("Sending and receiving packets.") - d = txsr(self.buildPackets(), pcapfile=self.pcapfile, - timeout=self.timeout, reactor=self.reactor) - else: - log.msg("Sending packets.") - d = txsend(self.buildPackets(), reactor=self.reactor) + def sendReceivePackets(self, packets): + d = txsr(packets, pcapfile=self.pcapfile, + timeout=10, reactor=self.reactor) - def finished(data): - log.msg("Finished sending") - return data - - d.addCallback(finished) return d + def sendPackets(self, packets): + return txsend(self.buildPackets(), reactor=self.reactor) + def buildPackets(self): """ Override this method to build scapy packets.

1 0

r25841: {website} Updating Sathyanarayanan's people page entry Revising Sathya (website/trunk/about/en)
by Damian Johnson 07 Oct '12

07 Oct '12

Author: atagar Date: 2012-10-07 19:38:25 +0000 (Sun, 07 Oct 2012) New Revision: 25841 Modified: website/trunk/about/en/corepeople.wml Log: Updating Sathyanarayanan's people page entry Revising Sathyanarayanan's entry to mention pyonionoo and compass rather than stem (as per his request). Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2012-10-06 18:41:41 UTC (rev 25840) +++ website/trunk/about/en/corepeople.wml 2012-10-07 19:38:25 UTC (rev 25841) @@ -85,7 +85,9 @@ href="http://www.cypherpunks.ca/otr/">Off-the-Record Messaging</a>.</dd> <dt>Sathyanarayanan Gunasekaran, Developer</dt> - <dd>Developer working on orbot and stem.</dd> + <dd>Developer that worked on Orbot in Google + Summer of Code 2011, and presently develops Compass and + Pyonionoo</dd> <dt>Sebastian Hahn, Developer and Advocate</dt> <dd>Improves build and testing automation for TBB. Develops Tor itself. Helps people around the world use and understand

1 0

[ooni-probe/master] Fix security vulnerability that could have been an issue in the future.
by art＠torproject.org 07 Oct '12

07 Oct '12

commit 1371d0de76d1d003d9c38c8e68a786f1fac2514d Author: Arturo Filastò <arturo(a)filasto.net> Date: Sun Oct 7 19:13:07 2012 +0000 Fix security vulnerability that could have been an issue in the future. Basically the problem was that we were not using yaml.safe_dump to write reports to the log. What this means is that when we were to go back to parse the reports we could have been loading python objects that may contain arbitrary code. We could not out of the box use safe_dump because we were also dumping certain objects in some test and safe_dump does not serialize complex numbers. * We have now a custom representer that serializes complex numbers * We have our own custom dumper that does the type checking and can be expanded to support other objects we think are safe to read. * Bug fixing in other various parts of the code. --- nettests/experimental/domclass_collector.py | 8 ++-- ooni/nettest.py | 11 ++++-- ooni/oonicli.py | 2 +- ooni/reporter.py | 45 ++++++++++++++++++++++++++- ooni/runner.py | 18 ++++++++-- ooni/templates/httpt.py | 2 +- ooni/utils/date.py | 8 +++++ 7 files changed, 79 insertions(+), 15 deletions(-) diff --git a/nettests/experimental/domclass_collector.py b/nettests/experimental/domclass_collector.py index 9b2c8d8..c1866f2 100644 --- a/nettests/experimental/domclass_collector.py +++ b/nettests/experimental/domclass_collector.py @@ -17,8 +17,9 @@ class DOMClassCollector(httpt.HTTPTest): author = "Arturo Filastò" version = 0.1 - inputs = ['http://news.google.com/', 'http://wikileaks.org/'] - #inputFile = ['f', 'file', None, 'The list of urls to build a domclass for'] + followRedirects = True + + inputFile = ['file', 'f', None, 'The list of urls to build a domclass for'] def test_collect(self): if self.input: @@ -29,5 +30,4 @@ class DOMClassCollector(httpt.HTTPTest): def processResponseBody(self, body): eigenvalues = domclass.compute_eigenvalues_from_DOM(content=body) - self.report['eigenvalues'] = eigenvalues - + self.report['eigenvalues'] = eigenvalues.tolist() diff --git a/ooni/nettest.py b/ooni/nettest.py index 835a5a0..7f9562a 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -1,5 +1,6 @@ import itertools -from twisted.python import log + +from twisted.python import log, usage from twisted.trial import unittest, itrial from twisted.internet import defer @@ -84,13 +85,11 @@ class TestCase(unittest.TestCase): writing. """ if result.reporterFactory.firstrun: - print "Running both!!" d1 = result.reporterFactory.writeHeader() d2 = unittest.TestCase.deferSetUp(self, ignored, result) dl = defer.DeferredList([d1, d2]) return dl else: - print "Only one :P" return unittest.TestCase.deferSetUp(self, ignored, result) def inputProcessor(self, fp): @@ -99,9 +98,13 @@ class TestCase(unittest.TestCase): fp.close() def getOptions(self): - if self.inputFile: + if type(self.inputFile) is str: fp = open(self.inputFile) self.inputs = self.inputProcessor(fp) + elif not self.inputs[0]: + pass + else: + raise usage.UsageError("No input file specified!") # XXX perhaps we may want to name and version to be inside of a # different object that is not called options. return {'inputs': self.inputs, diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 63edbe3..af93af9 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -46,7 +46,7 @@ class Options(usage.Options, app.ReactorSelectionMixin): ] optParameters = [ - ["reportfile", "o", "report.yaml", "report file name"], + ["reportfile", "o", None, "report file name"], ["logfile", "l", "test.log", "log file name"], ['temp-directory', None, '_ooni_temp', 'Path to use as working directory for tests.'] diff --git a/ooni/reporter.py b/ooni/reporter.py index b335738..47b8158 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -2,6 +2,12 @@ import time import sys import yaml import itertools +import copy_reg + +from yaml.representer import * +from yaml.emitter import * +from yaml.serializer import * +from yaml.resolver import * from datetime import datetime from twisted.python.util import OrderedDict, untilConcludes @@ -20,6 +26,43 @@ except: pyunit = __import__('unittest') +class OSafeRepresenter(SafeRepresenter): + def represent_complex(self, data): + if data.imag == 0.0: + data = u'%r' % data.real + elif data.real == 0.0: + data = u'%rj' % data.imag + elif data.imag > 0: + data = u'%r+%rj' % (data.real, data.imag) + else: + data = u'%r%rj' % (data.real, data.imag) + return self.represent_scalar(u'tag:yaml.org,2002:python/complex', data) + +OSafeRepresenter.add_representer(complex, + OSafeRepresenter.represent_complex) + +class OSafeDumper(Emitter, Serializer, OSafeRepresenter, Resolver): + + def __init__(self, stream, + default_style=None, default_flow_style=None, + canonical=None, indent=None, width=None, + allow_unicode=None, line_break=None, + encoding=None, explicit_start=None, explicit_end=None, + version=None, tags=None): + Emitter.__init__(self, stream, canonical=canonical, + indent=indent, width=width, + allow_unicode=allow_unicode, line_break=line_break) + Serializer.__init__(self, encoding=encoding, + explicit_start=explicit_start, explicit_end=explicit_end, + version=version, tags=tags) + OSafeRepresenter.__init__(self, default_style=default_style, + default_flow_style=default_flow_style) + Resolver.__init__(self) + + +def safe_dump(data, stream=None, **kw): + return yaml.dump_all([data], stream, Dumper=OSafeDumper, **kw) + class OReporter(pyunit.TestResult): """ This is an extension of the unittest TestResult. It adds support for @@ -56,7 +99,7 @@ class OReporter(pyunit.TestResult): self._write('\n') def writeYamlLine(self, line): - to_write = yaml.dump([line]) + to_write = safe_dump([line]) self._write(to_write) diff --git a/ooni/runner.py b/ooni/runner.py index ebeb4c5..0b9503a 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -16,7 +16,7 @@ from ooni.reporter import ReporterFactory from ooni.inputunit import InputUnitFactory from ooni.nettest import InputTestSuite from ooni import nettest -from ooni.utils import log, geodata +from ooni.utils import log, geodata, date from ooni.plugoo import tests as oonitests def isTestCase(thing): @@ -92,7 +92,10 @@ def adaptLegacyTest(obj, config): return LegacyOONITest def processTest(obj, config): - if obj.optParameters: + if obj.optParameters or obj.inputFile: + if not obj.optParameters: + obj.optParameters = [] + class Options(usage.Options): optParameters = obj.optParameters @@ -100,6 +103,7 @@ def processTest(obj, config): if inputFile: Options.optParameters.append(inputFile) + print Options.optParameters options = Options() options.parseOptions(config['subArgs']) @@ -107,6 +111,12 @@ def processTest(obj, config): if inputFile: obj.inputFile = options[inputFile[0]] + try: + tmp_obj = obj() + tmp_obj.getOptions() + except usage.UsageError: + options.opt_help() + return obj @@ -157,7 +167,6 @@ def loadTestsAndOptions(classes): options.append(opts) except AttributeError: options.append([]) - tests = reflect.prefixedMethodNames(klass, methodPrefix) if tests: cases = makeTestCases(klass, tests, methodPrefix) @@ -182,7 +191,8 @@ class ORunner(object): try: reportFile = open(config['reportfile'], 'a+') except: - reportFile = open('report.yaml', 'a+') + filename = 'report_'+date.timestamp()+'.yaml' + reportFile = open(filename, 'a+') self.reporterFactory = ReporterFactory(reportFile, testSuite=self.baseSuite(self.cases)) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 963189a..6e3163b 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -128,7 +128,7 @@ class HTTPTest(TestCase): return d def _cbResponse(self, response): - self.response['headers'] = response.headers + self.response['headers'] = list(response.headers.getAllRawHeaders()) self.response['code'] = response.code self.response['length'] = response.length self.response['version'] = response.length diff --git a/ooni/utils/date.py b/ooni/utils/date.py index dcd8e36..25250a6 100644 --- a/ooni/utils/date.py +++ b/ooni/utils/date.py @@ -20,3 +20,11 @@ def pretty_date(): pretty = cur_time.strftime(d_format) return pretty +def timestamp(): + cur_time = datetime.utcnow() + d_format = "%d_%B_%Y_%H-%M-%S" + pretty = cur_time.strftime(d_format) + return pretty + + +

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 07 Oct '12

07 Oct '12

commit 861864e7f2825f2ed3ffa80831685dacc13efea3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 7 17:15:43 2012 +0000 Update translations for torbirdy_completed --- hu/torbirdy.dtd | 40 ++++++++++++++++++++++++++++++++++++++++ hu/torbirdy.properties | 13 +++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/hu/torbirdy.dtd b/hu/torbirdy.dtd new file mode 100644 index 0000000..7ba5e7a --- /dev/null +++ b/hu/torbirdy.dtd @@ -0,0 +1,40 @@ +<!ENTITY torbirdy.accountprefs.title "Fiók beállítások"> +<!ENTITY torbirdy.accountprefs.startup.label "Új üzenetek keresése indításkor"> +<!ENTITY torbirdy.accountprefs.startup.key "S"> +<!ENTITY torbirdy.accountprefs.minutes.label "Új üzenetek keresése"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "percenként"> +<!ENTITY torbirdy.accountprefs.cancel.button "Mégsem"> +<!ENTITY torbirdy.accountprefs.save.button "Ment"> +<!ENTITY torbirdy.accountprefs.save.key "M"> + +<!ENTITY torbirdy.prefs.title "TorBirdy Beállítások"> +<!ENTITY torbirdy.prefs.save.button "Mentés"> +<!ENTITY torbirdy.prefs.save.key "m"> +<!ENTITY torbirdy.prefs.cancel.button "Mégsem"> +<!ENTITY torbirdy.prefs.extra2.button "Beállítások tesztelése"> +<!ENTITY torbirdy.prefs.extra2.key "t"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy Beállítások"> +<!ENTITY torbirdy.prefs.privacy.label "Adatvédelmi Beállítások"> +<!ENTITY torbirdy.prefs.recommended.text "Az ajánlott proxy beállítások használata a TorBirdy (Tor) használatához"> +<!ENTITY torbirdy.prefs.recommended.key "a"> +<!ENTITY torbirdy.prefs.anonservice.text "Névtelenné tevő szerver választása"> +<!ENTITY torbirdy.prefs.anonservice.key "n"> +<!ENTITY torbirdy.prefs.customsettings.text "Egyéni proxy beállítások használata"> +<!ENTITY torbirdy.prefs.customsettings.key "p"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS gép:"> +<!ENTITY torbirdy.prefs.socks_host.key "g"> +<!ENTITY torbirdy.prefs.socks_port.label "Port: "> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "Átlátszó Torosítás"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "Globális"> +<!ENTITY torbirdy.prefs.imap.label "A push támogatás bekapcsolása az IMAP fiókokhoz [alapértelmezett: kikapcsolva]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "A legutolsó mail mappa használata indításkor (alapértelmezett: kikapcoslva, csak a helyi mappákat válassza ki)"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "A GPG '--throw-keyids' kikapcsolása [alapértelmezett: bekapcsolva]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.account_specific "Fiók-specifikus"> +<!ENTITY torbirdy.prefs.select_account.key "V"> +<!ENTITY torbirdy.prefs.select_account.label "Válasszon egy fiókot:"> diff --git a/hu/torbirdy.properties b/hu/torbirdy.properties new file mode 100644 index 0000000..af218f8 --- /dev/null +++ b/hu/torbirdy.properties @@ -0,0 +1,13 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy Bekapcsolva: Tor +torbirdy.enabled.jondo=TorBirdy Bekapcsolva: JonDo +torbirdy.enabled.custom=TorBirdy Bekapcsolva: Egyedi Proxy +torbirdy.enabled.torification=TorBirdy Bekapcsolva: Átlátszó Torosítás +torbirdy.disabled=TorBirdy: Kikapcsolva! + +torbirdy.email.prompt=A TorBirdy kikapcoslta a Thunderbird automatikus konfigurációs varázslóját a névtelensége megőrzése érdekében\n\nAz ajánlott biztonsági beállítások a %S részére beállításra kerültek.\n\nMost már beállíthatja a további fiók beállításokat kézzel. + +torbirdy.email.advanced=Kérjük jegyezze meg, hogy a TorBirdy Speciális beállításainak átállítása NEM ajánlott.\n\nCsak akkor szabad folytatnia, ha tudja mit csinál. +torbirdy.email.advanced.nextwarning=A figyelmeztetés mutatása legközelebb is. +torbirdy.email.advanced.title=TorBirdy Speciális beállítások

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 07 Oct '12

07 Oct '12

commit 3d0fe106cdb69cd66a362cfa8c305e0c316f0b2e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 7 17:15:41 2012 +0000 Update translations for torbirdy --- hu/torbirdy.dtd | 40 ++++++++++++++++++++++++++++++++++++++++ hu/torbirdy.properties | 13 +++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/hu/torbirdy.dtd b/hu/torbirdy.dtd new file mode 100644 index 0000000..7ba5e7a --- /dev/null +++ b/hu/torbirdy.dtd @@ -0,0 +1,40 @@ +<!ENTITY torbirdy.accountprefs.title "Fiók beállítások"> +<!ENTITY torbirdy.accountprefs.startup.label "Új üzenetek keresése indításkor"> +<!ENTITY torbirdy.accountprefs.startup.key "S"> +<!ENTITY torbirdy.accountprefs.minutes.label "Új üzenetek keresése"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "percenként"> +<!ENTITY torbirdy.accountprefs.cancel.button "Mégsem"> +<!ENTITY torbirdy.accountprefs.save.button "Ment"> +<!ENTITY torbirdy.accountprefs.save.key "M"> + +<!ENTITY torbirdy.prefs.title "TorBirdy Beállítások"> +<!ENTITY torbirdy.prefs.save.button "Mentés"> +<!ENTITY torbirdy.prefs.save.key "m"> +<!ENTITY torbirdy.prefs.cancel.button "Mégsem"> +<!ENTITY torbirdy.prefs.extra2.button "Beállítások tesztelése"> +<!ENTITY torbirdy.prefs.extra2.key "t"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy Beállítások"> +<!ENTITY torbirdy.prefs.privacy.label "Adatvédelmi Beállítások"> +<!ENTITY torbirdy.prefs.recommended.text "Az ajánlott proxy beállítások használata a TorBirdy (Tor) használatához"> +<!ENTITY torbirdy.prefs.recommended.key "a"> +<!ENTITY torbirdy.prefs.anonservice.text "Névtelenné tevő szerver választása"> +<!ENTITY torbirdy.prefs.anonservice.key "n"> +<!ENTITY torbirdy.prefs.customsettings.text "Egyéni proxy beállítások használata"> +<!ENTITY torbirdy.prefs.customsettings.key "p"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS gép:"> +<!ENTITY torbirdy.prefs.socks_host.key "g"> +<!ENTITY torbirdy.prefs.socks_port.label "Port: "> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "Átlátszó Torosítás"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "Globális"> +<!ENTITY torbirdy.prefs.imap.label "A push támogatás bekapcsolása az IMAP fiókokhoz [alapértelmezett: kikapcsolva]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "A legutolsó mail mappa használata indításkor (alapértelmezett: kikapcoslva, csak a helyi mappákat válassza ki)"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "A GPG '--throw-keyids' kikapcsolása [alapértelmezett: bekapcsolva]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.account_specific "Fiók-specifikus"> +<!ENTITY torbirdy.prefs.select_account.key "V"> +<!ENTITY torbirdy.prefs.select_account.label "Válasszon egy fiókot:"> diff --git a/hu/torbirdy.properties b/hu/torbirdy.properties new file mode 100644 index 0000000..af218f8 --- /dev/null +++ b/hu/torbirdy.properties @@ -0,0 +1,13 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy Bekapcsolva: Tor +torbirdy.enabled.jondo=TorBirdy Bekapcsolva: JonDo +torbirdy.enabled.custom=TorBirdy Bekapcsolva: Egyedi Proxy +torbirdy.enabled.torification=TorBirdy Bekapcsolva: Átlátszó Torosítás +torbirdy.disabled=TorBirdy: Kikapcsolva! + +torbirdy.email.prompt=A TorBirdy kikapcoslta a Thunderbird automatikus konfigurációs varázslóját a névtelensége megőrzése érdekében\n\nAz ajánlott biztonsági beállítások a %S részére beállításra kerültek.\n\nMost már beállíthatja a további fiók beállításokat kézzel. + +torbirdy.email.advanced=Kérjük jegyezze meg, hogy a TorBirdy Speciális beállításainak átállítása NEM ajánlott.\n\nCsak akkor szabad folytatnia, ha tudja mit csinál. +torbirdy.email.advanced.nextwarning=A figyelmeztetés mutatása legközelebb is. +torbirdy.email.advanced.title=TorBirdy Speciális beállítások

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 07 Oct '12

07 Oct '12

commit 45897c40846a1191f41071803f16fe675da50a3c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 7 17:15:40 2012 +0000 Update translations for tails-greeter_completed --- hu/hu.po | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/hu/hu.po b/hu/hu.po new file mode 100644 index 0000000..c55631f --- /dev/null +++ b/hu/hu.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <viktor.varga(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-06-01 15:10+0200\n" +"PO-Revision-Date: 2012-10-07 17:05+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "Belépés" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Köszönjük a Trails-ben" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "Perzisztencia használata?" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "Igen" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "Nem" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "Jelszó:" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "Csak olvasható?" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "További beállítások?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Adminisztrátori jelszó" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Adjon meg egy adminisztrátori jelszót az adminisztrációs feladatokhoz.\n\nEgyébként kikapcsolt, a magasabb biztonság érdekében." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Jelszó:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Jelszó ellenőrzése:" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Windows álcázás" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Ez az opció a Tails-t a Microsoft Windows XP-hez hasonlóvá teszi. Ez fontos lehet publikus helyeken, ahol figyelmet kelthetünk fel." + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Microsoft Windows XP álcázás bekapcsolása" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Nyelv" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Lokáció" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Kiosztás" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "Passwords do not match" +msgstr "A jelszavak nem egyeznek" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist sikertelen a következő visszatérési kóddal: %(returncode)s:\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup sikertelen a következő visszatérési kóddal: %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist sikertelen a következő visszatérési kóddal: %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "Wrong passphrase. Please try again." +msgstr "Hibás jelszó. Próbálja meg újra." + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Egyéb..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 07 Oct '12

07 Oct '12

commit fdfd3e69c54da9200bc3af9a71338dede597c90e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 7 17:15:39 2012 +0000 Update translations for tails-greeter --- hu/hu.po | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/hu/hu.po b/hu/hu.po new file mode 100644 index 0000000..c55631f --- /dev/null +++ b/hu/hu.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <viktor.varga(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-06-01 15:10+0200\n" +"PO-Revision-Date: 2012-10-07 17:05+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "Belépés" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Köszönjük a Trails-ben" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "Perzisztencia használata?" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "Igen" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "Nem" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "Jelszó:" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "Csak olvasható?" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "További beállítások?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Adminisztrátori jelszó" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Adjon meg egy adminisztrátori jelszót az adminisztrációs feladatokhoz.\n\nEgyébként kikapcsolt, a magasabb biztonság érdekében." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Jelszó:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Jelszó ellenőrzése:" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Windows álcázás" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Ez az opció a Tails-t a Microsoft Windows XP-hez hasonlóvá teszi. Ez fontos lehet publikus helyeken, ahol figyelmet kelthetünk fel." + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Microsoft Windows XP álcázás bekapcsolása" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Nyelv" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Lokáció" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Kiosztás" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "Passwords do not match" +msgstr "A jelszavak nem egyeznek" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist sikertelen a következő visszatérési kóddal: %(returncode)s:\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup sikertelen a következő visszatérési kóddal: %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist sikertelen a következő visszatérési kóddal: %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "Wrong passphrase. Please try again." +msgstr "Hibás jelszó. Próbálja meg újra." + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Egyéb..."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 07 Oct '12

07 Oct '12

commit dc47222c41f7a15b70eba7fce93950a88146b80e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 7 17:15:35 2012 +0000 Update translations for liveusb-creator --- hu/hu.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hu/hu.po b/hu/hu.po index 25abf03..add86e9 100644 --- a/hu/hu.po +++ b/hu/hu.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-10-07 16:45+0000\n" +"PO-Revision-Date: 2012-10-07 16:46+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -277,7 +277,7 @@ msgstr "" #: ../liveusb/creator.py:786 ../liveusb/creator.py:886 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "" +msgstr "Ismeretlen fájlrendszer. Szükséges lehet az eszköz újraformázása." #: ../liveusb/creator.py:789 #, python-format @@ -322,7 +322,7 @@ msgstr "Fájlrendszer ellenőrzése…" #: ../liveusb/creator.py:907 #, python-format msgid "Unable to change volume label: %(message)s" -msgstr "Nem változtatható meg a meghajtó címkéje: %(message)s" +msgstr "%(message)s meghajtó címkéje nem változtatható meg" #: ../liveusb/creator.py:912 ../liveusb/creator.py:1236 msgid "Installing bootloader..."

1 0

[ooni-probe/master] Implement collector for classifying website with domclass.
by art＠torproject.org 07 Oct '12

07 Oct '12

commit 3d1afe284b3437ee460841828e7a7175f93564e3 Author: Arturo Filastò <arturo(a)filasto.net> Date: Sun Oct 7 17:05:33 2012 +0000 Implement collector for classifying website with domclass. Next step run this on all the sites we want to test. --- nettests/experimental/domclass_collector.py | 33 +++++++++++++++++++++++++++ ooni/kit/__init__.py | 1 + ooni/kit/domclass.py | 30 ++++++++++++++++-------- 3 files changed, 54 insertions(+), 10 deletions(-) diff --git a/nettests/experimental/domclass_collector.py b/nettests/experimental/domclass_collector.py new file mode 100644 index 0000000..9b2c8d8 --- /dev/null +++ b/nettests/experimental/domclass_collector.py @@ -0,0 +1,33 @@ +# -*- encoding: utf-8 -*- +# +# The purpose of this collector is to compute the eigenvector for the input +# file containing a list of sites. +# +# +# :authors: Arturo Filastò +# :licence: see LICENSE + +from twisted.internet import threads, defer + +from ooni.kit import domclass +from ooni.templates import httpt + +class DOMClassCollector(httpt.HTTPTest): + name = "DOM class collector" + author = "Arturo Filastò" + version = 0.1 + + inputs = ['http://news.google.com/', 'http://wikileaks.org/'] + #inputFile = ['f', 'file', None, 'The list of urls to build a domclass for'] + + def test_collect(self): + if self.input: + url = self.input + return self.doRequest(url) + else: + raise Exception("No input specified") + + def processResponseBody(self, body): + eigenvalues = domclass.compute_eigenvalues_from_DOM(content=body) + self.report['eigenvalues'] = eigenvalues + diff --git a/ooni/kit/__init__.py b/ooni/kit/__init__.py new file mode 100644 index 0000000..55374c9 --- /dev/null +++ b/ooni/kit/__init__.py @@ -0,0 +1 @@ +__all__ = ['domclass'] diff --git a/ooni/kit/domclass.py b/ooni/kit/domclass.py index 02c26dc..1cf33a0 100644 --- a/ooni/kit/domclass.py +++ b/ooni/kit/domclass.py @@ -108,7 +108,7 @@ def compute_eigenvalues(matrix): """ return numpy.linalg.eigvals(matrix) -def readDOM(content=None, filename=None): +def readDOM(content=None, filename=None, debug=False): """ Parses the DOM of the HTML page and returns an array of parent, child pairs. @@ -124,20 +124,30 @@ def readDOM(content=None, filename=None): content = ''.join(f.readlines()) f.close() - start = time.time() - print "Running BeautifulSoup on content" + if debug: + start = time.time() + print "Running BeautifulSoup on content" dom = BeautifulSoup(content) - print "done in %s" % (time.time() - start) + if debug: + print "done in %s" % (time.time() - start) - start = time.time() - print "Creating couples matrix" + if debug: + start = time.time() + print "Creating couples matrix" couples = [] for x in dom.findAll(): couples.append((str(x.parent.name), str(x.name))) - print "done in %s" % (time.time() - start) + if debug: + print "done in %s" % (time.time() - start) return couples +def compute_eigenvalues_from_DOM(*arg,**kw): + dom = readDOM(*arg, **kw) + probability_matrix = compute_probability_matrix(dom) + eigenvalues = compute_eigenvalues(probability_matrix) + return eigenvalues + def compute_correlation(matrix_a, matrix_b): correlation = numpy.vdot(matrix_a, matrix_b) correlation /= numpy.linalg.norm(matrix_a)*numpy.linalg.norm(matrix_b) @@ -192,13 +202,13 @@ def benchmark(): """ start = time.time() print "Read file B" - site_a = readDOM(filename='filea.txt') + site_a = readDOM(filename='filea.txt', debug=True) print "--------" print "total done in %s" % (time.time() - start) start = time.time() print "Read file A" - site_b = readDOM(filename='fileb.txt') + site_b = readDOM(filename='fileb.txt', debug=True) print "--------" print "total done in %s" % (time.time() - start) @@ -233,4 +243,4 @@ def benchmark(): print "Corelation: %s" % correlation -benchmark() +#benchmark()

1 0