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

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 04 Apr '12

04 Apr '12

commit 7caba4b27e9645e7da39379b16ecce8a643540cf Merge: edd91f5 aaed240 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 4 17:01:28 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 7 ++++--- build-scripts/osx.mk | 6 ++++-- build-scripts/windows.mk | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-)

1 0

[torbrowser/master] add vietnamese to windows and osx bundles, add korean to all bundles, alphabetize the compressed bundles list (closes: #4898 and #5243)
by erinn＠torproject.org 04 Apr '12

04 Apr '12

commit aaed240f29961542130b014481e5694977e71da0 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 4 17:01:18 2012 -0300 add vietnamese to windows and osx bundles, add korean to all bundles, alphabetize the compressed bundles list (closes: #4898 and #5243) --- build-scripts/linux.mk | 7 ++++--- build-scripts/osx.mk | 6 ++++-- build-scripts/windows.mk | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 4235b1c..fed251a 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -183,13 +183,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it \ - compressed-bundle_vi + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index deff00a..68e13fe 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -198,12 +198,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1fa3e0c..dc8de89 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -190,12 +190,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup

1 0

[ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by art＠torproject.org 04 Apr '12

04 Apr '12

commit 3f7c7c93f13c4d3cffea29d30832b1570863e8a8 Merge: 4436198 6d16c4e Author: Arturo Filastò <hellais(a)gmail.com> Date: Wed Apr 4 11:09:20 2012 -0700 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe

1 0

[ooni-probe/master] Merge pull request #1 from isislovecruft/dnstamper
by art＠torproject.org 04 Apr '12

04 Apr '12

commit 0aa159dc47ae721b9fadbd617d8b6e4cfde9ee2b Merge: 15c3371 ea74298 Author: Arturo Filastò <hellais(a)gmail.com> Date: Sat Mar 24 01:45:49 2012 -0700 Merge pull request #1 from isislovecruft/dnstamper Dnstamper .gitignore | 3 +- HACKING | 16 +- TODO | 5 + assets/dns_servers.txt | 6 + assets/top-1m.txt | 11 + assets/top-1m.txt.bak |1000000 ++++++++++++++++++++++++++++++++++++++++++++++++ ooni-probe.conf | 7 +- plugoo/nodes.py | 79 +- plugoo/reports.py | 2 +- plugoo/tests.py | 2 +- tests/dnstamper.py | 123 +- tests/httphost.py | 5 +- 12 files changed, 1000204 insertions(+), 55 deletions(-)

1 0

[ooni-probe/master] Merge pull request #1 from isislovecruft/dnstamper
by art＠torproject.org 04 Apr '12

04 Apr '12

commit 4fceacc408d79f632cbdb84ecce3faf4c69eb377 Merge: 15c3371 ea74298 Author: Arturo Filastò <hellais(a)gmail.com> Date: Sat Mar 24 01:45:49 2012 -0700 Merge pull request #1 from isislovecruft/dnstamper Dnstamper .gitignore | 3 +- HACKING | 16 +- TODO | 5 + assets/dns_servers.txt | 6 + assets/top-1m.txt | 11 + assets/top-1m.txt.bak |1000000 ++++++++++++++++++++++++++++++++++++++++++++++++ ooni-probe.conf | 7 +- plugoo/nodes.py | 79 +- plugoo/reports.py | 2 +- plugoo/tests.py | 2 +- tests/dnstamper.py | 123 +- tests/httphost.py | 5 +- 12 files changed, 1000204 insertions(+), 55 deletions(-)

1 0

[ooni-probe/master] removed unused import statement
by art＠torproject.org 04 Apr '12

04 Apr '12

commit 00fec3b4bbaa4f5748bd43a3344e909eccae7cc4 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Tue Mar 13 17:07:19 2012 -0700 removed unused import statement --- plugoo/nodes.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/plugoo/nodes.py b/plugoo/nodes.py index ccdaa44..074c0db 100644 --- a/plugoo/nodes.py +++ b/plugoo/nodes.py @@ -7,12 +7,11 @@ This contains all the code related to Nodes both network and code execution. - :copyright: (c) 2012 by Arturo Filastò. + :copyright: (c) 2012 by Arturo Filastò, Isis Lovecruft. :license: see LICENSE for more details. """ -import cmd import os from binascii import hexlify

1 0

[ooni-probe/master] Merge branch 'master' of https://github.com/hellais/ooni-probe
by art＠torproject.org 04 Apr '12

04 Apr '12

commit 4f6f2d4ef2b25dbd738cbd980d7be913badf34a1 Merge: 00fec3b ab2a15e Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Wed Mar 14 15:28:25 2012 -0700 Merge branch 'master' of https://github.com/hellais/ooni-probe TODO | 40 ++++++++++++++++++ assets/example.txt | 2 + assets/tcpscan.txt | 1 + ooniprobe.py | 27 ++++++++----- plugoo/__init__.py | 29 +++++++++++++- plugoo/assets.py | 1 - plugoo/tests.py | 6 +- tests/bridget.py | 2 +- tests/squid.py | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/tcpscan.py | 86 ++++++++++++++++++++++++++++++++++++++ tests/traceroute.py | 2 +- 11 files changed, 292 insertions(+), 17 deletions(-)

1 0

[ooni-probe/master] Moved parsing logic for top-1m asset to Top1MAsset class in DNS test
by art＠torproject.org 04 Apr '12

04 Apr '12

commit bf3a0362a7cf6d4b22a600a17c7ea906b3ec48b8 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Wed Mar 14 23:26:24 2012 -0700 Moved parsing logic for top-1m asset to Top1MAsset class in DNS test --- assets/fix-top-1m.py | 34 ---------------------------------- tests/dnstamper.py | 12 +++++++++++- 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/assets/fix-top-1m.py b/assets/fix-top-1m.py deleted file mode 100755 index 9e6b681..0000000 --- a/assets/fix-top-1m.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python -############### -# fix-top-1m.py -############### -# Removes the 'N,' from the default top-1m.txt. -# ::author:: Isis Lovecruft - -from __future__ import with_statement -from contextlib import nested -import os -import re -import tempfile - -def remove_cruft(): - print 'Opening list of top webservers for parsing...' - in_file = os.path.abspath('top-1m.txt') - print 'Creating temporary file for parsing purposes...' - outfile = os.path.abspath('top-1m.txt~') - tempfile.NamedTemporaryFile('w+b', 1000, '.txt~', 'top-1m', - os.getcwd()) - with open(in_file, 'r+') as in_, open('top-1m.txt~', 'w+') as out_: - lines = in_.readlines() - print 'Replacing cruft with nothingness...' - for line in lines: - out_.write(re.sub('^(\d+),', '', line)) - print 'Removing write access to temp file...' - out_.close() - in_.close() - print 'Renaming parsed temp file as orginal file...' - os.rename('top-1m.txt~', 'top-1m.txt') - print 'List of webservers now ready for use!' - -if __name__=="__main__": - remove_cruft() diff --git a/tests/dnstamper.py b/tests/dnstamper.py index 23318b6..1e59d26 100644 --- a/tests/dnstamper.py +++ b/tests/dnstamper.py @@ -7,11 +7,21 @@ import os import plugoo from plugoo.assets import Asset from plugoo.tests import Test - +from __future__ import with_statement __plugoo__ = "DNST" __desc__ = "DNS censorship detection test" +class Top1MAsset(Asset): + def __init__(self, file=None): + self = Asset.__init__(self, file) + + def next_asset(self): + with self.fh as asset: + lines = asset.readlines() + for line in lines: + yield line.split(',')[1] + class DNSTAsset(Asset): def __init__(self, file=None): self = Asset.__init__(self, file)

1 0

[ooni-probe/master] Merge branch 'master' of https://github.com/hellais/ooni-probe
by art＠torproject.org 04 Apr '12

04 Apr '12

commit d553123af47a2ee485df6442cfd4b97c27ee7012 Merge: bf3a036 5d6b1e2 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Wed Mar 14 23:27:27 2012 -0700 Merge branch 'master' of https://github.com/hellais/ooni-probe plugoo/assets.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)

1 0

[ooni-probe/master] Merge branch 'master' of https://github.com/hellais/ooni-probe into dnstamper
by art＠torproject.org 04 Apr '12

04 Apr '12

commit 484c5656c922eb114da2dac51773df3f66d236f2 Merge: 022bf73 15c3371 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Wed Mar 21 18:36:01 2012 -0700 Merge branch 'master' of https://github.com/hellais/ooni-probe into dnstamper README | 57 +++++++++++++++++++++++ old/README | 57 ----------------------- ooni-probe.conf | 3 +- plugoo/tests.py | 25 ++++++++-- plugoo/workers.py | 36 ++++++++++++++ tests/httphost.py | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/tcpscan.py | 2 +- utils.py | 2 +- 8 files changed, 249 insertions(+), 65 deletions(-)

1 0