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

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 16 Apr '15

16 Apr '15

commit 1a064df03e4db6ae37f2bd854152c25410d483a7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 16 08:45:56 2015 +0000 Update translations for tor_animation --- fi.srt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fi.srt b/fi.srt index 78c998d..3044d5d 100644 --- a/fi.srt +++ b/fi.srt @@ -1,23 +1,22 @@ 1 00:00:00,660 --> 00:00:02,780 -We've gotten very used to the Internet. +Olemme tulleet hyvin tutuiksi internetin kanssa. 2 00:00:03,120 --> 00:00:07,700 -We are constantly sharing information -about ourselves and our private lives: +Jaamme jatkuvasti tietoja itsestämme ja yksityiselämistämme. 3 00:00:08,000 --> 00:00:09,960 -food we eat, people we meet, +Ruoasta mitä syömme, ihmisistä joita tapaamme, 4 00:00:10,180 --> 00:00:12,480 -places we go, and the stuff we read. +paikoista minne menemme ja asioista joita luemme. 5 00:00:13,280 --> 00:00:14,640 -Let me explain it better. +Annappa kun selitän paremmin. 6 00:00:14,920 --> 00:00:17,740

1 0

[tor-browser-bundle/master] Update obfs4proxy to 0.0.5, remove old go.net.
by gk＠torproject.org 16 Apr '15

16 Apr '15

commit 10b91ff2b78e0cfe72f432fe661fddb9f5f45fd7 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Apr 15 21:31:29 2015 +0000 Update obfs4proxy to 0.0.5, remove old go.net. Update the obfs4proxy tag to 0.0.5, and remove the go.net tarball fetch/build process as that is no longer needed in the latest version. Fixes #15702. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 10 ---------- gitian/descriptors/mac/gitian-pluggable-transports.yml | 10 ---------- .../descriptors/windows/gitian-pluggable-transports.yml | 10 ---------- gitian/fetch-inputs.sh | 13 +------------ gitian/verify-tags.sh | 2 +- gitian/versions.alpha | 5 +---- gitian/versions.nightly | 3 --- 7 files changed, 3 insertions(+), 50 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 1ae9c0c..1130cdf 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -56,7 +56,6 @@ files: - "gmp-linux64-utils.zip" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" -- "go.net.tar.bz2" script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" @@ -263,15 +262,6 @@ script: | go install golang.org/x/net/proxy cd .. - # Building go.net (obfs4proxy <= 0.0.4) - tar xjf go.net.tar.bz2 - cd go.net - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net" - go install code.google.com/p/go.net/proxy - cd .. - # Building obfs4proxy cd obfs4 find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index e2693e1..30f6444 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -52,7 +52,6 @@ files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" -- "go.net.tar.bz2" - "gmp-mac64-utils.zip" - "openssl-mac64-utils.zip" script: | @@ -291,15 +290,6 @@ script: | go install golang.org/x/net/proxy cd .. - # Building go.net (obfs4proxy <= 0.0.4) - tar xjf go.net.tar.bz2 - cd go.net - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net" - go install code.google.com/p/go.net/proxy - cd .. - # Building obfs4proxy cd obfs4 find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 0f5ec84..339a63e 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -59,7 +59,6 @@ files: - "openssl-win32-utils.zip" - "gmp-win32-utils.zip" - "gcclibs-win32-utils.zip" -- "go.net.tar.bz2" script: | # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. function py2exe_zip_timestomp { @@ -369,15 +368,6 @@ script: | go install golang.org/x/net/proxy cd .. - # Building go.net (obfs4proxy <= 0.0.4) - tar xjf go.net.tar.bz2 - cd go.net - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net" - go install code.google.com/p/go.net/proxy - cd .. - # Building obfs4proxy cd obfs4 find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index e86ad6d..188c702 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -6,7 +6,6 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ -MIRROR_URL_YAWNING=https://people.torproject.org/~yawning/mirrors/sources/ set -e set -u umask 0022 @@ -163,22 +162,13 @@ do get "${!PACKAGE}" "${!URL}" done -# XXX/Yawning. As far as I can tell, this gitian thing doesn't support -# fetching from hg repositories. -for i in GONET -do - PACKAGE="${i}_PACKAGE" - URL="${MIRROR_URL_YAWNING}${!PACKAGE}" - get "${!PACKAGE}" "${MIRROR_URL_YAWNING}${!PACKAGE}" -done - # NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} wget -U "" -N ${HTTPSE_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -232,7 +222,6 @@ ln -sf "$GMP_PACKAGE" gmp.tar.bz2 ln -sf "$LXML_PACKAGE" lxml.tar.gz ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz -ln -sf "$GONET_PACKAGE" go.net.tar.bz2 # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 79c452b..846b575 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -141,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ee69d08..0077361 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -31,7 +31,7 @@ GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 -OBFS4_TAG=obfs4proxy-0.0.4 +OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-7 @@ -79,7 +79,6 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 @@ -101,7 +100,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e -GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -127,4 +125,3 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index cf0aecf..9a1b73f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -83,7 +83,6 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 @@ -105,7 +104,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e -GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -131,4 +129,3 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PACKAGE}

1 0

[tor-browser-bundle/master] Bump versions of nightly components
by gk＠torproject.org 16 Apr '15

16 Apr '15

commit 33f867cc0b974a689a233dd7a3761d7c0bb7270c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 16 08:04:11 2015 +0000 Bump versions of nightly components --- gitian/versions.nightly | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 9a1b73f..73bb2ad 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,7 +7,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.5.0esr +FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -19,8 +19,7 @@ HTTPSE_TAG=master NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -# A mingw-w64 commit that works. The 3.1.0 tag is too old. -MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 +MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master @@ -39,7 +38,7 @@ OBFS4_TAG=master GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1l +OPENSSL_VER=1.0.1m GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -56,13 +55,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0development.2 +HTTPSE_VER=5.0.2 GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.14-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.21-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -85,13 +84,13 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 +OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=67516200ef6ec7a3741a2b94d2257edd91f1862cec92c89251ea870839f8032f -HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 +NOSCRIPT_HASH=165704af79afb609dcb8d9eeb525be90a31e17a0b577f508b624c9098fd15c4c +HTTPSE_HASH=a600ad019c982c8c90b8c5022dbf56722974bc1143f49c0db77704986f1b2ced MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 16 Apr '15

16 Apr '15

commit e8e280f6f677847b2e312ab1e81161892f6c1492 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 16 07:16:02 2015 +0000 Update translations for tor_animation_completed --- ru.srt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru.srt b/ru.srt index f97e649..4c6c63e 100644 --- a/ru.srt +++ b/ru.srt @@ -144,7 +144,7 @@ Tor делает всех своих пользователей 31 00:01:51,920 --> 00:01:53,920 -кроме случая, когда вы сделаете вход на сайт и этим сообщите о себе. +кроме случая, когда вы сделаете вход на сайт и сообщите о себе сами. 32 00:01:56,200 --> 00:01:57,840

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 16 Apr '15

16 Apr '15

commit 38d9a9d95f4fd411f4675acfa7cfe4f9d47cdee7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 16 07:15:53 2015 +0000 Update translations for tor_animation --- ru.srt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru.srt b/ru.srt index f97e649..4c6c63e 100644 --- a/ru.srt +++ b/ru.srt @@ -144,7 +144,7 @@ Tor делает всех своих пользователей 31 00:01:51,920 --> 00:01:53,920 -кроме случая, когда вы сделаете вход на сайт и этим сообщите о себе. +кроме случая, когда вы сделаете вход на сайт и сообщите о себе сами. 32 00:01:56,200 --> 00:01:57,840

1 0

[bridgedb/develop] Merge branch 'fix/12505-5418-remove-old-block-code' into develop
by isis＠torproject.org 16 Apr '15

16 Apr '15

commit 91f4cf9c084765748fed80f8f8d00eae80c5e68e Merge: 7a1a54f 5e032ef Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 06:13:21 2015 +0000 Merge branch 'fix/12505-5418-remove-old-block-code' into develop lib/bridgedb/Bridges.py | 72 ------------------------------------- lib/bridgedb/Bucket.py | 8 ----- lib/bridgedb/Main.py | 20 ----------- lib/bridgedb/Storage.py | 46 ------------------------ lib/bridgedb/test/legacy_Tests.py | 40 +-------------------- 5 files changed, 1 insertion(+), 185 deletions(-)

1 0

[bridgedb/develop] Remove all remnants of #5027/#5418 bridge block parser code.
by isis＠torproject.org 16 Apr '15

16 Apr '15

commit 5e032efa39a4c00f00ca2f86460f952bf2c081a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 01:04:33 2015 +0000 Remove all remnants of #5027/#5418 bridge block parser code. * REMOVES bridgedb.Bridges.re_ipv4. * REMOVES bridgedb.Bridges.re_ipv6. * REMOVES bridgedb.Bridges.parseCountryBlockFile(). * REMOVES bridgedb.Bridges.BridgeBlock. * REMOVES bridgedb.Bridges.CountryBlock. * REMOVES bridgedb.Storage.Database.addBridgeBlock(). * REMOVES bridgedb.Storage.Database.delBridgeBlock(). * REMOVES bridgedb.Storage.Database.cleanBridgeBlocks(). * REMOVES bridgedb.Storage.Database.getBlockingCountries(). * REMOVES bridgedb.Storage.Database.getBlockedBridges(). * REMOVES bridgedb.Storage.Database.isBlocked(). * REMOVES several asserts for the above b.Storage.Database methods from bridgedb.test.legacy_Tests.SQLStorageTests. * REMOVES bridgedb.test.legacy_Tests.ParseCountryBlockFileTests. * FIXES #5418: https://bugs.torproject.org/5418 * SEEALSO #5027: https://bugs.torproject.org/5027 * FIXES part of #12505: https://bugs.torproject.org/12505 --- lib/bridgedb/Bridges.py | 72 ------------------------------------- lib/bridgedb/Bucket.py | 8 ----- lib/bridgedb/Main.py | 20 ----------- lib/bridgedb/Storage.py | 46 ------------------------ lib/bridgedb/test/legacy_Tests.py | 40 +-------------------- 5 files changed, 1 insertion(+), 185 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 078cfff..0239730 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -40,41 +40,6 @@ ID_LEN = 20 # XXX Only used in commented out line in Storage.py DIGEST_LEN = 20 PORTSPEC_LEN = 16 -re_ipv6 = re.compile("\[([a-fA-F0-9:]+)\]:(.*$)") -re_ipv4 = re.compile("((?:\d{1,3}\.?){4}):(.*$)") - - -def parseCountryBlockFile(f): - """Generator. Parses a blocked-bridges file 'f', and yields - a fingerprint (ID), address, a list of ports, and a list of country - codes where the bridge is blocked for each valid line: - address, port [], countrycode []""" - for line in f: - ID = address = fields = portlist = countries = None - line = line.strip() - try: - ID, addrspec, countries = line.split() - if isValidFingerprint(ID): - ID = fromHex(ID) - logging.debug("Parsed ID: %s", ID) - else: - print "failed to parse ID!" - continue # skip this line - - for regex in [re_ipv4, re_ipv6]: - m = regex.match(addrspec) - if m: - address = ipaddr.IPAddress(m.group(1)) - portlist = addr.PortList(m.group(2)) - countries = countries.split(',') - logging.debug("Parsed address: %s", address) - logging.debug("Parsed portlist: %s", portlist) - logging.debug("Parsed countries: %s", countries) - except (IndexError, ValueError): - logging.debug("Skipping line") - continue # skip this line - if ID and address and portlist and countries: - yield ID, address, portlist, countries class BridgeHolder(object): """Abstract base class for all classes that hold bridges.""" @@ -751,40 +716,3 @@ class FilteredBridgeSplitter(BridgeHolder): desc = "%s %s" % (description.strip(), " ".join([v for k,v in grouped.items()]).strip()) f.write("%s %s\n"%( toHex(b.getID()), desc)) - -class BridgeBlock(object): - """Base class that abstracts bridge blocking. - - .. TODO:: This should be a zope.interface specification. - """ - def __init__(self): - pass - - def insert(self, fingerprint, blockingRule): - raise NotImplementedError - - def clear(self): - pass - -class CountryBlock(BridgeBlock): - """Countrywide bridge blocking""" - def __init__(self): - self.db = bridgedb.Storage.getDB() - - def clear(self): - assert self.db - self.db.cleanBridgeBlocks() - self.db.commit() - - def insert(self, fingerprint, blockingRule): - """ insert a country based blocking rule """ - assert self.db - countryCode = blockingRule - self.db.addBridgeBlock(fingerprint, countryCode) - self.db.commit() - - def getBlockingCountries(self, fingerprint): - """ returns a list of country codes where this fingerprint is blocked""" - assert self.db - if fingerprint is not None: - return self.db.getBlockingCountries(fingerprint) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 5e7f61b..1382188 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -242,14 +242,6 @@ class BucketManager(object): bridgeHistories.sort(lambda x,y: cmp(x.weightedFractionalUptime, y.weightedFractionalUptime)) - # for a bridge, get the list of countries it might not work in - blocklist = dict() - if getattr(self.cfg, "COUNTRY_BLOCK_FILE", None) is not None: - f = open(self.cfg.COUNTRY_BLOCK_FILE, 'r') - for ID,address,portlist,countries in bridgedb.Bridges.parseCountryBlockFile(f): - blocklist[toHex(ID)] = countries - f.close() - try: f = open(filename, 'w') if self.cfg.COLLECT_TIMESTAMPS: diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 3b018f9..d5f4c24 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -175,26 +175,6 @@ def load(state, splitter, clear=False): "but could not find bridge with that fingerprint.") % router.fingerprint) - # XXX TODO refactor the next block according with new parsers for OONI - # bridge-reachability reports: - if state.COUNTRY_BLOCK_FILE: # pragma: no cover - logging.info("Opening Blocking Countries file %s" - % state.COUNTRY_BLOCK_FILE) - f = open(state.COUNTRY_BLOCK_FILE) - # Identity digest, primary OR address, portlist, country codes - for ID, addr, portlist, cc in Bridges.parseCountryBlockFile(f): - if ID in bridges.keys() and bridges[ID].running: - for port in portlist: - addrport = "{0}:{1}".format(addr, port) - logging.debug(":'( Tears! %s blocked bridge %s at %s" - % (cc, bridges[ID].fingerprint, addrport)) - try: - bridges[ID].blockingCountries[addrport].update(cc) - except KeyError: - bridges[ID].blockingCountries[addrport] = set(cc) - logging.debug("Closing blocking-countries document") - f.close() - inserted = 0 logging.info("Inserting %d bridges into splitter..." % len(bridges)) for fingerprint, bridge in bridges.items(): diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index 1efb139..439634f 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -243,52 +243,6 @@ class Database(object): cur.execute("UPDATE Bridges SET distributor = ? WHERE hex_key = ?", (distributor, hex_key)) - def addBridgeBlock(self, fingerprint, countryCode): - cur = self._cur - cur.execute("INSERT OR REPLACE INTO BlockedBridges " - "(hex_key,blocking_country) VALUES (?,?)", - (fingerprint, countryCode)) - - def delBridgeBlock(self, fingerprint, countryCode): - cur = self._cur - cur.execute("DELETE FROM BlockedBridges WHERE hex_key = ? " - "AND blocking_country = ?", (fingerprint, countryCode)) - - def cleanBridgeBlocks(self): - cur = self._cur - cur.execute("DELETE FROM BlockedBridges") - - def getBlockingCountries(self, fingerprint): - cur = self._cur - cur.execute("SELECT hex_key, blocking_country FROM BlockedBridges WHERE hex_key = ? ", - (fingerprint,)) - v = cur.fetchall() - if v is None: - return None - - # return list of country-codes - return [ str(result[1]) for (result) in v ] - - def getBlockedBridges(self, countryCode): - cur = self._cur - cur.execute("SELECT hex_key, blocking_country FROM BlockedBridges WHERE blocking_country = ? ", - (countryCode,)) - v = cur.fetchall() - if v is None: - return None - # return list of fingerprints - return [ str(result[0]) for (result) in v ] - - def isBlocked(self, fingerprint, countryCode): - cur = self._cur - cur.execute("SELECT hex_key, blocking_country FROM BlockedBridges WHERE " - "hex_key = ? AND blocking_country = ?", - (fingerprint, countryCode)) - v = cur.fetchone() - if v is None: - return False - return True - def getWarnedEmail(self, addr): addr = hashlib.sha1(addr).hexdigest() cur = self._cur diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index cd0c6de..4d0c53c 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -501,23 +501,6 @@ class SQLStorageTests(unittest.TestCase): cur.execute("SELECT * FROM EmailedBridges") self.assertEquals(len(cur.fetchall()), 1) - db.addBridgeBlock(b2.fingerprint, 'us') - self.assertEquals(db.isBlocked(b2.fingerprint, 'us'), True) - db.delBridgeBlock(b2.fingerprint, 'us') - self.assertEquals(db.isBlocked(b2.fingerprint, 'us'), False) - db.addBridgeBlock(b2.fingerprint, 'uk') - db.addBridgeBlock(b3.fingerprint, 'uk') - self.assertEquals(set([b2.fingerprint, b3.fingerprint]), - set(db.getBlockedBridges('uk'))) - - db.addBridgeBlock(b2.fingerprint, 'cn') - db.addBridgeBlock(b2.fingerprint, 'de') - db.addBridgeBlock(b2.fingerprint, 'jp') - db.addBridgeBlock(b2.fingerprint, 'se') - db.addBridgeBlock(b2.fingerprint, 'kr') - - self.assertEquals(set(db.getBlockingCountries(b2.fingerprint)), - set(['uk', 'cn', 'de', 'jp', 'se', 'kr'])) self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) db.setWarnedEmail("def(a)example.com") self.assertEquals(db.getWarnedEmail("def(a)example.com"), True) @@ -529,27 +512,6 @@ class SQLStorageTests(unittest.TestCase): db.cleanWarnedEmails(t+200) self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) -class ParseCountryBlockFileTests(unittest.TestCase): - - def testParseCountryBlockFile(self): - simpleBlock = "%s:%s %s\n" - countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] - test = str() - for i in range(100): - test += simpleBlock % (randomIPString(), randomPort(), - randomCountrySpec()) - test+=gettimestamp() - - for a,p,c in bridgedb.Bridges.parseCountryBlockFile(test.split('\n')): - assert type(a) in (ipaddr.IPv6Address, ipaddr.IPv4Address) - assert isinstance(p, addr.PortList) - assert isinstance(c, list) - assert len(c) > 0 - for y in c: - assert y in countries - #print "address: %s" % a - #print "portlist: %s" % p - #print "countries: %s" % c class BridgeStabilityTests(unittest.TestCase): def setUp(self): @@ -689,7 +651,7 @@ def testSuite(): loader = unittest.TestLoader() for klass in [IPBridgeDistTests, SQLStorageTests, EmailBridgeDistTests, - ParseCountryBlockFileTests, BridgeStabilityTests]: + BridgeStabilityTests]: suite.addTest(loader.loadTestsFromTestCase(klass)) for module in [ bridgedb.Bridges,

1 0

[bridgedb/develop] Improve documentation for b.bridgerequest.BridgeRequestBase attributes.
by isis＠torproject.org 16 Apr '15

16 Apr '15

commit 33656cd687eb74874eb52ed28a65b7704fd78262 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 05:51:17 2015 +0000 Improve documentation for b.bridgerequest.BridgeRequestBase attributes. --- lib/bridgedb/bridgerequest.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index ff8e289..f653450 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -33,8 +33,8 @@ class IRequestBridges(Interface): transports = Attribute( "A list of strings of Pluggable Transport types requested.") notBlockedIn = Attribute( - "A list of 2-4 letter country codes. The distributed bridges should " - "not be blocked in these countries.") + "A list of two-character country codes. The distributed bridges " + "should not be blocked in these countries.") valid = Attribute( "A boolean. Should be ``True`` if the client's request was valid.") client = Attribute( @@ -87,12 +87,18 @@ class BridgeRequestBase(object): implements(IRequestBridges) def __init__(self, addressClass=None): + #: (:class:`ipaddr.IPv4Address` or :class:`ipaddr.IPv6Address`) The IP + #: version of bridge addresses to distribute to the client. self.addressClass = addressClass if not ((self.addressClass is ipaddr.IPv4Address) or (self.addressClass is ipaddr.IPv6Address)): self.addressClass = ipaddr.IPv4Address + #: (list) A list of callables used to filter bridges from a hashring. self.filters = list() + #: (list) A list of strings of Pluggable Transport types requested. self.transports = list() + #: (list) A list of two-character country codes. The distributed bridges + #: should not be blocked in these countries. self.notBlockedIn = list() #: This should be some information unique to the client making the #: request for bridges, such that we are able to HMAC this unique data @@ -100,6 +106,7 @@ class BridgeRequestBase(object): #: bridge addresses they get in the request response). It defaults to #: the string ``'default'``. self.client = 'default' + #: (bool) Should be ``True`` if the client's request was valid. self.valid = False def getHashringPlacement(self, key, client=None):

1 0

[bridgedb/develop] Fix missing random module import to bridgedb.test.util.
by isis＠torproject.org 16 Apr '15

16 Apr '15

commit 4ff20fd52aab80958e3c3f2af0908e003d907761 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 06:31:37 2015 +0000 Fix missing random module import to bridgedb.test.util. --- lib/bridgedb/test/util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index f276dc4..234a9b6 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -17,6 +17,7 @@ from __future__ import unicode_literals import errno import ipaddr import os +import random from functools import wraps

1 0

[bridgedb/develop] Add missing ipaddr module to bridgedb.test.util.
by isis＠torproject.org 16 Apr '15

16 Apr '15

commit 7a1a54fdb1f980afb0c791f26dc5c4b851db32a5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 06:08:55 2015 +0000 Add missing ipaddr module to bridgedb.test.util. --- lib/bridgedb/test/util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 2949eca..f276dc4 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -15,6 +15,7 @@ from __future__ import print_function from __future__ import unicode_literals import errno +import ipaddr import os from functools import wraps

1 0