December 2013 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 03 Dec '13

03 Dec '13

commit 5e202adb88288b106fad03ec981ca2c85e95194a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 3 17:45:54 2013 +0000 Update translations for liveusb-creator --- pt_BR/pt_BR.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 128d039..f1aa67f 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -6,6 +6,7 @@ # Communia <ameaneantie(a)riseup.net>, 2013 # bySoul <danielms97(a)outlook.com>, 2013 # Daniel S. Koda <danielskoda(a)gmail.com>, 2008 +# ebonsi, 2013 # eduardolvt, 2013 # Augustine <evandro(a)geocities.com>, 2013 # gv1974 <g.lucio(a)ig.com.br>, 2013 @@ -19,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-12 13:29+0100\n" -"PO-Revision-Date: 2013-11-16 22:30+0000\n" -"Last-Translator: bySoul <danielms97(a)outlook.com>\n" +"POT-Creation-Date: 2013-11-30 15:23+0100\n" +"PO-Revision-Date: 2013-12-03 17:45+0000\n" +"Last-Translator: ebonsi\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -151,7 +152,7 @@ msgstr "Baixar %(distribution)s" #: ../liveusb/gui.py:781 msgid "Download complete!" -msgstr "Download concluído!" +msgstr "Transferência completa!" #: ../liveusb/gui.py:785 msgid "Download failed: " @@ -216,7 +217,7 @@ msgstr "Instalar Tails" #: ../liveusb/gui.py:628 msgid "Installation complete!" -msgstr "Instalação concluída!" +msgstr "Instalação completa!" #: ../liveusb/gui.py:279 #, python-format @@ -269,7 +270,7 @@ msgstr "Não há espaço livre suficiente no dispositivo.\n%dMB ISO + %dMB overl #: ../liveusb/gui.py:552 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "A partição é FAT16; Restringindo o tamanho da camada a 2GB" +msgstr "A partição é FAT16; Restringindo o tamanho da superfície a 2GB" #: ../liveusb/gui.py:548 msgid "Partition is FAT32; Restricting overlay size to 4G" @@ -282,7 +283,7 @@ msgstr "Particionando o dispositivo %(device)s" #: ../liveusb/gui.py:619 msgid "Persistent Storage" -msgstr "Armazenamento permanente" +msgstr "Armazenamento Persistente" #: ../liveusb/dialog.py:170 msgid "Persistent Storage (0 MB)" @@ -542,14 +543,14 @@ msgstr "Verificando o sistema de arquivos..." #: ../liveusb/gui.py:728 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "Aviso: a criação de uma nova camada permanente irá excluir aquela já existente." +msgstr "Atenção: A criação de uma nova superfície persistente irá excluir aquela já existente." #: ../liveusb/gui.py:679 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "Atenção: o Registro Mestre de Inicialização (MBR) do seu dispositivo não corresponde ao MBR do syslinux do seu sistema. Se você tiver problemas ao inicializar este dispositivo, tente utilizar o liveusb-creator com a opção --reset-mbr." +msgstr "Atenção: O Registro Mestre de Inicialização MBR do seu dispositivo não corresponde ao MBR do syslinux do seu sistema. Se você tiver problemas ao inicializar este dispositivo, tente utilizar o liveusb-creator com a opção --reset-mbr." #: ../liveusb/gui.py:392 msgid ""

1 0

[ooni-probe/master] Revert "Fix indentation of if else statement."
by art＠torproject.org 03 Dec '13

03 Dec '13

commit 8d9e5b612e5ff204eb8dbed269a0dafeb9e98323 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Nov 27 14:03:52 2013 +0000 Revert "Fix indentation of if else statement." This reverts commit f6b849a88ce2f97571e051caca5dcf164ca1e064. See: For-Else loop construct --- ooni/deck.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 5614f9a..23bb9a1 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -133,8 +133,8 @@ class Deck(InputFile): for rth in net_test_loader.requiredTestHelpers: if option_name.message == rth['option']: break - else: - raise + else: + raise self.netTestLoaders.append(net_test_loader) @defer.inlineCallbacks

1 0

[ooni-probe/master] Merge pull request #249 from TheTorProject/fix/update_ip_lookup_services
by art＠torproject.org 03 Dec '13

03 Dec '13

commit d6c5c6f52130e9c42b0257fc666032ea047ee1e3 Merge: b404986 fdc31f2 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Sat Nov 23 03:12:30 2013 -0800 Merge pull request #249 from TheTorProject/fix/update_ip_lookup_services Fix/update ip lookup services ooni/geoip.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)

1 0

[ooni-probe/master] Updates regexp for updated check.tpo
by art＠torproject.org 03 Dec '13

03 Dec '13

commit 05a225698cedf71ef3f328010e3372da067fb29f Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 22 19:07:18 2013 +0000 Updates regexp for updated check.tpo --- ooni/geoip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/geoip.py b/ooni/geoip.py index 2971ca6..7544af5 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -96,7 +96,7 @@ class TorProjectGeoIP(HTTPGeoIPLookupper): url = "https://check.torproject.org/" def parseResponse(self, response_body): - regexp = "Your IP address appears to be: <b>((\d+\.)+(\d+))" + regexp = "Your IP address appears to be: <strong>((\d+\.)+(\d+))" probe_ip = re.search(regexp, response_body).group(1) return probe_ip

1 0

[ooni-probe/master] Remove maxmind; requires javascript now
by art＠torproject.org 03 Dec '13

03 Dec '13

commit fdc31f2ed9fedba8a8f534e30aaef937bcfdb9f1 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 22 19:09:48 2013 +0000 Remove maxmind; requires javascript now --- ooni/geoip.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/ooni/geoip.py b/ooni/geoip.py index 7544af5..8ad124c 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -100,14 +100,6 @@ class TorProjectGeoIP(HTTPGeoIPLookupper): probe_ip = re.search(regexp, response_body).group(1) return probe_ip -class MaxMindGeoIP(HTTPGeoIPLookupper): - url = "https://www.maxmind.com/en/locate_my_ip" - - def parseResponse(self, response_body): - regexp = '<span id="my-ip-address">((\d+\.)+(\d+))</span>' - probe_ip = re.search(regexp, response_body).group(1) - return probe_ip - class ProbeIP(object): strategy = None address = None @@ -115,8 +107,7 @@ class ProbeIP(object): def __init__(self): self.tor_state = config.tor_state self.geoIPServices = {'ubuntu': UbuntuGeoIP, - 'torproject': TorProjectGeoIP, - 'maxmind': MaxMindGeoIP + 'torproject': TorProjectGeoIP } @defer.inlineCallbacks

1 0

[ooni-probe/master] updated requirements
by art＠torproject.org 03 Dec '13

03 Dec '13

commit 922ddb64b063a1bc57a03f0d98ca8050f8182246 Author: Griffin Boyce <griffinboyce(a)gmail.com> Date: Wed Nov 27 12:47:44 2013 -0500 updated requirements --- .gitignore | 4 +++- README.md | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ec5a4a0..5733f57 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,6 @@ ooniprobe.resume *.log !before_i_commit.log ## ignore pycharm ide files: -.idea/ \ No newline at end of file +.idea/ +*~ +.c9revisions diff --git a/README.md b/README.md index 5126d9f..3a471be 100644 --- a/README.md +++ b/README.md @@ -114,14 +114,14 @@ Basic system requirements: On Debian or Ubuntu GNU/Linux based systems these can be installed with: ``` -sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb obfsproxy tcpdump python-geoip python-docutils python-ipaddr python-scapy python-pyrex +sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb tcpdump python-geoip python-docutils python-ipaddr python-scapy python-pyrex ``` Other packages that may be of interest: ``` -libdumbnet1 python-dumbnet python-libpcap python-pypcap python-pcapy python-dnspython -python-virtualenv virtualenvwrapper tor tor-geoipdb obfsproxy +libdumbnet python-dumbnet python-libpcap python-pypcap pcapy dnspython +python-virtualenv virtualenvwrapper ``` The Python dependencies required for running ooniprobe are:

1 0

[ooni-probe/master] Add support for listing available nettests.
by art＠torproject.org 03 Dec '13

03 Dec '13

commit 8ea550135fbca0b90f6811996ce8c905cad5248f Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 27 22:23:28 2013 +0100 Add support for listing available nettests. --- ooni/director.py | 1 + ooni/nettest.py | 2 +- ooni/oonicli.py | 17 ++++++++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 7a81815..46dd962 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -106,6 +106,7 @@ class Director(object): if is_nettest(filename): net_test_file = os.path.join(dirname, filename) nettest = getNetTestInformation(net_test_file) + nettest['category'] = category.replace('/', '') if nettest['id'] in nettests: log.err("Found a two tests with the same name %s, %s" % diff --git a/ooni/nettest.py b/ooni/nettest.py index 7049ad1..b421252 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -166,7 +166,7 @@ def getNetTestInformation(net_test_file): 'description': test_class.description, 'version': test_class.version, 'arguments': getArguments(test_class), - 'path': net_test_file + 'path': net_test_file, } return information diff --git a/ooni/oonicli.py b/ooni/oonicli.py index c722c52..c5e7c53 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -30,7 +30,8 @@ class Options(usage.Options): optFlags = [["help", "h"], ["resume", "r"], - ["no-collector", "n"] + ["no-collector", "n"], + ["list", "s"], ] optParameters = [["reportfile", "o", None, "report file name"], @@ -72,7 +73,7 @@ class Options(usage.Options): sys.settrace(spewer) def parseArgs(self, *args): - if self['testdeck']: + if self['testdeck'] or self['list']: return try: self['test_file'] = args[0] @@ -112,7 +113,7 @@ def runWithDirector(): config.read_config_file() log.start(global_options['logfile']) - + if config.privacy.includepcap: try: checkForRoot() @@ -127,6 +128,16 @@ def runWithDirector(): director = Director() d = director.start() + if global_options['list']: + print "# Installed nettests" + for net_test_id, net_test in director.netTests.items(): + print "* %s (%s/%s)" % (net_test['name'], + net_test['category'], + net_test['id']) + print " %s" % net_test['description'] + + sys.exit(0) + #XXX: This should mean no bouncer either! if global_options['no-collector']: log.msg("Not reporting using a collector")

1 0

[ooni-probe/master] Rename tcp_connect to be uniform to other names
by art＠torproject.org 03 Dec '13

03 Dec '13

commit b7a263863dd3c62d915c18513c24e555a7a58fa0 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 27 22:23:07 2013 +0100 Rename tcp_connect to be uniform to other names --- ooni/nettests/blocking/tcp_connect.py | 69 +++++++++++++++++++++++++++++++++ ooni/nettests/blocking/tcpconnect.py | 69 --------------------------------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/ooni/nettests/blocking/tcp_connect.py b/ooni/nettests/blocking/tcp_connect.py new file mode 100644 index 0000000..5b432e0 --- /dev/null +++ b/ooni/nettests/blocking/tcp_connect.py @@ -0,0 +1,69 @@ +# -*- encoding: utf-8 -*- +from twisted.internet.protocol import Factory, Protocol +from twisted.internet.endpoints import TCP4ClientEndpoint + +from twisted.internet.error import ConnectionRefusedError +from twisted.internet.error import TCPTimedOutError, TimeoutError + +from ooni import nettest +from ooni.errors import handleAllFailures +from ooni.utils import log + +class TCPFactory(Factory): + def buildProtocol(self, addr): + return Protocol() + +class TCPConnectTest(nettest.NetTestCase): + name = "TCP Connect" + author = "Arturo Filastò" + version = "0.1" + inputFile = ['file', 'f', None, + 'File containing the IP:PORT combinations to be tested, one per line'] + + requiredOptions = ['file'] + def test_connect(self): + """ + This test performs a TCP connection to the remote host on the specified port. + the report will contains the string 'success' if the test has + succeeded, or the reason for the failure if it has failed. + """ + host, port = self.input.split(":") + def connectionSuccess(protocol): + protocol.transport.loseConnection() + log.debug("Got a connection to %s" % self.input) + self.report["connection"] = 'success' + + def connectionFailed(failure): + self.report['connection'] = handleAllFailures(failure) + + from twisted.internet import reactor + point = TCP4ClientEndpoint(reactor, host, int(port)) + d = point.connect(TCPFactory()) + d.addCallback(connectionSuccess) + d.addErrback(connectionFailed) + return d + + def inputProcessor(self, filename=None): + """ + This inputProcessor extracts name:port pairs from urls + XXX: Does not support unusual port numbers + """ + def strip_url(address): + proto, path = x.strip().split('://') + proto = proto.lower() + host = path.split('/')[0] + if proto == 'http': + return "%s:80" % host + if proto == 'https': + return "%s:443" % host + + if filename: + fp = open(filename) + for x in fp.readlines(): + if x.startswith("http"): + yield strip_url(x) + else: + yield x.strip() + fp.close() + else: + pass diff --git a/ooni/nettests/blocking/tcpconnect.py b/ooni/nettests/blocking/tcpconnect.py deleted file mode 100644 index 5b432e0..0000000 --- a/ooni/nettests/blocking/tcpconnect.py +++ /dev/null @@ -1,69 +0,0 @@ -# -*- encoding: utf-8 -*- -from twisted.internet.protocol import Factory, Protocol -from twisted.internet.endpoints import TCP4ClientEndpoint - -from twisted.internet.error import ConnectionRefusedError -from twisted.internet.error import TCPTimedOutError, TimeoutError - -from ooni import nettest -from ooni.errors import handleAllFailures -from ooni.utils import log - -class TCPFactory(Factory): - def buildProtocol(self, addr): - return Protocol() - -class TCPConnectTest(nettest.NetTestCase): - name = "TCP Connect" - author = "Arturo Filastò" - version = "0.1" - inputFile = ['file', 'f', None, - 'File containing the IP:PORT combinations to be tested, one per line'] - - requiredOptions = ['file'] - def test_connect(self): - """ - This test performs a TCP connection to the remote host on the specified port. - the report will contains the string 'success' if the test has - succeeded, or the reason for the failure if it has failed. - """ - host, port = self.input.split(":") - def connectionSuccess(protocol): - protocol.transport.loseConnection() - log.debug("Got a connection to %s" % self.input) - self.report["connection"] = 'success' - - def connectionFailed(failure): - self.report['connection'] = handleAllFailures(failure) - - from twisted.internet import reactor - point = TCP4ClientEndpoint(reactor, host, int(port)) - d = point.connect(TCPFactory()) - d.addCallback(connectionSuccess) - d.addErrback(connectionFailed) - return d - - def inputProcessor(self, filename=None): - """ - This inputProcessor extracts name:port pairs from urls - XXX: Does not support unusual port numbers - """ - def strip_url(address): - proto, path = x.strip().split('://') - proto = proto.lower() - host = path.split('/')[0] - if proto == 'http': - return "%s:80" % host - if proto == 'https': - return "%s:443" % host - - if filename: - fp = open(filename) - for x in fp.readlines(): - if x.startswith("http"): - yield strip_url(x) - else: - yield x.strip() - fp.close() - else: - pass

1 0

[ooni-probe/master] Merge pull request #250 from TheTorProject/feature/list-tests
by art＠torproject.org 03 Dec '13

03 Dec '13

commit 01a0647577ec4eacdaf917d6e0800fb6f6a17ea3 Merge: 8d9e5b6 e7a9bcf Author: aagbsn <aagbsn(a)extc.org> Date: Thu Nov 28 07:28:54 2013 -0800 Merge pull request #250 from TheTorProject/feature/list-tests Feature/list tests ooni/director.py | 1 + ooni/nettest.py | 2 +- ooni/nettests/blocking/tcp_connect.py | 69 +++++++++++++++++++++++++++ ooni/nettests/blocking/tcpconnect.py | 69 --------------------------- ooni/nettests/manipulation/captiveportal.py | 2 +- ooni/oonicli.py | 17 +++++-- 6 files changed, 86 insertions(+), 74 deletions(-)

1 0

[ooni-probe/master] Merge pull request #253 from glamrock/master
by art＠torproject.org 03 Dec '13

03 Dec '13

commit 9ac195b55b4c969421c8011f6c0a65e8ffdbcf10 Merge: 01a0647 922ddb6 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Tue Dec 3 06:15:37 2013 -0800 Merge pull request #253 from glamrock/master Updated package equirements .gitignore | 4 +++- README.md | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-)

1 0