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

[tor-browser-spec/master] Do not remove the previous release until after sending the MAR update signal.
by mikeperry＠torproject.org 01 Apr '15

01 Apr '15

commit c62d03e28f7338bd60a503fb125b0d1648e70b0a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 31 21:19:51 2015 -0700 Do not remove the previous release until after sending the MAR update signal. Also fix some incorrect paths and ensure we stop using the -build suffix after signing. --- processes/ReleaseProcess | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 12abd46..bde1a7c 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -75,32 +75,31 @@ # Only needed if you are not owner of the marsigner cert export NSS_CERTNAME=your_certname make signmars - # Then, re-attach storage, and rsync signed MARs to builddir - torsocks rsync -avP /media/storage/TBB/tor-browser-bundle/gitian/$TORBROWSER_BUILDDIR/*.mar people.torproject.org:public_html/builds/$TORBROWSER_BUILDDIR + # Now, re-attach storage to the online computer, and sync the signed + # results to a version-only directory (without the build number) + torsocks ssh people.torproject.org "cp -a public_html/builds/$TORBROWSER_BUILDDIR public_html/builds/$TORBROWSER_VERSION" + torsocks rsync -avP /media/storage/TBB/tor-browser-bundle/gitian/$TORBROWSER_BUILDDIR/*.mar people.torproject.org:public_html/builds/$TORBROWSER_VERSION #. Sign individual bundle files: # XXX: Document #. Clear out old builds, transfer builds to staticiforme #. Remote: - torsocks ssh staticiforme.torproject.org "rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/$OLD_TORBROWSER_VERSION" - torsocks rsync -avP $TORBROWSER_BUILDDIR/ staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrows… + # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix + torsocks rsync -avP $TORBROWSER_VERSION staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrows… torsocks ssh staticiforme.torproject.org "chmod g+w,o+r -R /srv/dist-master.torproject.org/htdocs/torbrowser/*" torsocks ssh staticiforme.torproject.org "static-update-component dist.torproject.org" #. Local to staticiforme: - # XXX: Still requires $OLD_TORBROWSER_VERSION to be set manually cd ~/tbb-builds/tor-browser-bundle/gitian git pull origin eval $( ./get-tb-version release ) # or alpha / beta - wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~mikeperry/builds/$TORBROWSER_BUILDDIR - rm $TORBROWSER_BUILDDIR/index.html* - rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/$OLD_TORBROWSER_VERSION - mv $TORBROWSER_BUILDDIR /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION -# We need to adjust permissions *after* we copied the new version to dist-master + # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix + wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~mikeperry/builds/$TORBROWSER_VERSION + rm $TORBROWSER_VERSION/index.html* + mv $TORBROWSER_VERSION /srv/dist-master.torproject.org/htdocs/torbrowser/ chmod 775 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION chmod 664 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION/* - # Set the owner to the group - chown :torwww $TORBROWSER_VERSION -R + chown -R :torwww /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION static-update-component dist.torproject.org #. Update website's torbrowser versions file in the website git @@ -116,6 +115,7 @@ torsocks git push origin master:master cd .. + #. Create blog post from changelog # XXX: Template? # See https://blog.torproject.org/blog/tor-browser-352-released for now @@ -132,6 +132,9 @@ chmod 644 htdocs/$TORBROWSER_UPDATE_CHANNEL/.htaccess chmod 755 htdocs/$TORBROWSER_UPDATE_CHANNEL/ torsocks rsync -av htdocs/$TORBROWSER_UPDATE_CHANNEL staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrows… + # Finally, remove old version as we point the update channel at the new version. + # XXX: CAREFUL! $OLD_TOR_BROWSER_VERSION must be set! + torsocks ssh staticiforme.torproject.org "rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/$OLD_TORBROWSER_VERSION" torsocks ssh staticiforme.torproject.org "static-update-component dist.torproject.org" #. Update website's torbrowser versions file to remove old versions

1 0

[webwml/master] Update mirroring disk space requirements
by sebastian＠torproject.org 01 Apr '15

01 Apr '15

commit 1dbe92c50b4add85e4ce80b31b63be7842adf614 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 1 06:21:37 2015 +0200 Update mirroring disk space requirements --- docs/en/running-a-mirror.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/running-a-mirror.wml b/docs/en/running-a-mirror.wml index 3f8d7fa..39d0a38 100644 --- a/docs/en/running-a-mirror.wml +++ b/docs/en/running-a-mirror.wml @@ -18,8 +18,8 @@ page</a>. We've included some sample commands and configuration below to make the initial setup and ongoing maintenance a minimal effort. The Tor website and distribution directory currently require roughly - 24GB of disk space, but this number can fluctuate. Expect space - requirements of up to 30 GB. + 30 GB of disk space, but this number can fluctuate. Expect space + requirements of up to 50 GB. </p> <h2><a class="anchor" href="#sysconfig">Configuring your System</a></h2> <p>

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 01 Apr '15

01 Apr '15

commit 2940cf939125832a25c354a32c759fdf299dd187 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 1 04:15:47 2015 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index e1517ca..76910e8 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -144,7 +144,7 @@ <!ENTITY torbutton.prefs.engine3 "Yahoo.com"> <!ENTITY torbutton.prefs.engine4 "startpage.com"> <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> -<!ENTITY torbutton.prefs.fix_google_srch "在 Google 搜索栏搜索时分割平台和语言信息。"> +<!ENTITY torbutton.prefs.fix_google_srch "在 Google 搜索栏搜索时去掉平台和语言信息。"> <!ENTITY torbutton.prefs.transparentTor "Tor 强化透明代理（需要自设 TransProxy 或 Tor 路由）"> <!ENTITY torbutton.prefs.priv_caption "隐私设置"> <!ENTITY torbutton.prefs.block_disk "禁止记录浏览历史或网站数据（启用隐私浏览模式）">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 01 Apr '15

01 Apr '15

commit be856a85c9a0fc0ad11d72f375f481215114eec2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 1 03:45:46 2015 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 7a1ebba..e1517ca 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -150,20 +150,20 @@ <!ENTITY torbutton.prefs.block_disk "禁止记录浏览历史或网站数据（启用隐私浏览模式）"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.block_plugins "禁用浏览器插件（比如 Flash）"> -<!ENTITY torbutton.prefs.resist_fingerprinting "请修改区别你与其他 Tor 浏览器用户的详细信息"> +<!ENTITY torbutton.prefs.resist_fingerprinting "对相关 Tor 浏览器信息进行修改，以区别你与其他 Tor 用户"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_low "低（默认）"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "该选项可为用户提供最佳体验。"> +<!ENTITY torbutton.prefs.sec_low_usable_desc "该选项可提供最佳的用户体验。"> <!ENTITY torbutton.prefs.sec_low_desc "该安全级别将启用所有浏览器功能。"> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "禁用 SVG OpenType 字体渲染功能。"> <!ENTITY torbutton.prefs.sec_med_low "中低"> -<!ENTITY torbutton.prefs.sec_gen_desc "该安全级别具有以下更改（鼠标悬停可查看细节）："> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频媒体通过 NoScript 实现点击播放。"> -<!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可使用 NoScript 工具栏按钮来启用这些媒体对象。"> +<!ENTITY torbutton.prefs.sec_gen_desc "该安全级别设置如下（光标悬停查看更多信息）："> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频需通过 NoScript 点击播放。"> +<!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可通过 NoScript 工具栏按钮播放这些媒体。"> <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站的脚本可能运行更慢。"> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本执行变慢。"> <!ENTITY torbutton.prefs.sec_jar_desc "禁用远程 JAR 文件。"> <!ENTITY torbutton.prefs.sec_jar_tooltip "网站上很少出现 JAR 文件，但可能成为 XSS 及其他攻击的源头。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。"> @@ -174,8 +174,8 @@ <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "禁用 Graphite 字体渲染。"> <!ENTITY torbutton.prefs.sec_svg_desc "禁用某些图像类型。"> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "禁用 SVG 图像。"> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript 在所有非 HTTPS 网站上被禁用。"> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "可按站点通过 NoScript 工具栏按钮上启用 JavaScript。"> +<!ENTITY torbutton.prefs.sec_js_https_desc "对于非 HTTPS 网站，默认禁用 JavaScript。"> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "可通过工具栏上的 NoScript 按钮，启用某个网站上的 JavaScript。"> <!ENTITY torbutton.prefs.sec_high "高"> <!ENTITY torbutton.prefs.sec_all_js_desc "默认禁用所有网站 JavaScript。"> <!ENTITY torbutton.prefs.sec_audio_video_desc "禁用大多数音频和视频格式。">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 01 Apr '15

01 Apr '15

commit e1bb81090c503090bf37c413699bcf1a690646a2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 1 03:15:47 2015 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 90076de..7a1ebba 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -153,7 +153,7 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "请修改区别你与其他 Tor 浏览器用户的详细信息"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_low "低（默认）"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "该选项提供最具可用性的用户体验。"> +<!ENTITY torbutton.prefs.sec_low_usable_desc "该选项可为用户提供最佳体验。"> <!ENTITY torbutton.prefs.sec_low_desc "该安全级别将启用所有浏览器功能。"> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "禁用 SVG OpenType 字体渲染功能。"> <!ENTITY torbutton.prefs.sec_med_low "中低">

1 0

[webwml/master] Add new TBB versions
by mikeperry＠torproject.org 01 Apr '15

01 Apr '15

commit 82364b3bd8b6f53106b035be44902b96bd9ef5a4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 31 20:13:23 2015 -0700 Add new TBB versions --- include/versions.wmi | 20 ++++++++++---------- projects/torbrowser/RecommendedTBBVersions | 10 +++++++++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 87cfcd6..7b2fc82 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -19,11 +19,11 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>4.0.5</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>4.5a4</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>4.0.6</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>4.5a5</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>4.0.5</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>4.5a4</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>4.0.6</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>4.5a5</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -32,18 +32,18 @@ <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.5</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.5</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5a4</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5a4</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.6</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.6</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5a5</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5a5</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.5</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.6</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5a4</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5a5</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 213cee6..aade89f 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -6,5 +6,13 @@ "4.5a4", "4.5a4-Linux", "4.5a4-MacOS", -"4.5a4-Windows" +"4.5a4-Windows", +"4.0.6", +"4.0.6-Linux", +"4.0.6-MacOS", +"4.0.6-Windows", +"4.5a5", +"4.5a5-Linux", +"4.5a5-MacOS", +"4.5a5-Windows" ]

1 0

[torspec/master] correct author list on proposal 223 (by request)
by nickm＠torproject.org 01 Apr '15

01 Apr '15

commit 59e4c5e1ace270df2eaab071531cc2a79626e30b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 31 21:59:11 2015 -0400 correct author list on proposal 223 (by request) --- proposals/223-ace-handshake.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/223-ace-handshake.txt b/proposals/223-ace-handshake.txt index 60ec088..7887725 100644 --- a/proposals/223-ace-handshake.txt +++ b/proposals/223-ace-handshake.txt @@ -1,6 +1,6 @@ Filename: 223-ace-handshake.txt Title: Ace: Improved circuit-creation key exchange -Author: Esfandiar Mohammadi +Author: Esfandiar Mohammadi, Aniket Kate, Michael Backes Created: 22-July-2013 Status: Open

1 0

[bridgedb/develop] Change Dist.uniformMap() to truncated IPv6 addresses to their /32.
by isis＠torproject.org 01 Apr '15

01 Apr '15

commit c91def00b30be2ae130c9884a58bb700e093afb4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 12:21:00 2015 +0000 Change Dist.uniformMap() to truncated IPv6 addresses to their /32. * FIXES #15522: https://bugs.torproject.org/15522 --- lib/bridgedb/Dist.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 466db84..6bb41b9 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -49,7 +49,7 @@ class EmailRequestedKey(Exception): def uniformMap(ip): """Map an IP to an arbitrary 'area' string, such that any two IPv4 addresses in the same ``/16`` subnet, or any two IPv6 addresses in the - same ``/64`` subnet, get the same string. + same ``/32`` subnet, get the same string. >>> from bridgedb import Dist >>> Dist.uniformMap('1.2.3.4') @@ -57,9 +57,9 @@ def uniformMap(ip): >>> Dist.uniformMap('1.2.211.154') '1.2.0.0/16' >>> Dist.uniformMap('2001:f::bc1:b13:2808') - '2001:f::/64' + '2001:f::/32' >>> Dist.uniformMap('2a00:c98:2030:a020:2::42') - '2a00:c98:2030:a020::/64' + '2a00:c98::/32' :param str ip: A string representing an IPv4 or IPv6 address. :rtype: str @@ -71,8 +71,8 @@ def uniformMap(ip): # in a hashring. address = ipaddr.IPAddress(ip) if address.version == 6: - truncated = ':'.join(address.exploded.split(':')[:4]) - subnet = str(ipaddr.IPv6Network(truncated + "::/64")) + truncated = ':'.join(address.exploded.split(':')[:2]) + subnet = str(ipaddr.IPv6Network(truncated + "::/32")) return subnet else: truncated = '.'.join(address.exploded.split('.')[:2])

1 0

[bridgedb/develop] Merge branch 'fix/15522-ipv6-enumeration' into develop
by isis＠torproject.org 01 Apr '15

01 Apr '15

commit 0341b7253eb76feb7f9fccd4b73572b270902fed Merge: 83e84d1 c91def0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 23:23:21 2015 +0000 Merge branch 'fix/15522-ipv6-enumeration' into develop lib/bridgedb/Dist.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[bridgedb/develop] Move unittest utility functions for generating random IP addresses.
by isis＠torproject.org 01 Apr '15

01 Apr '15

commit 7620d5e511a9e48f1423d4b3bda335529ba9562b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 00:48:21 2015 +0000 Move unittest utility functions for generating random IP addresses. * MOVE several functions for generating random IP addresses from bridgedb.test.legacy_Tests to bridgedb.test.util. --- lib/bridgedb/test/legacy_Tests.py | 57 +++++++++++++------------------------ lib/bridgedb/test/util.py | 26 +++++++++++++++++ 2 files changed, 45 insertions(+), 38 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index d416d22..cd0c6de 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -36,38 +36,20 @@ from bridgedb.Stability import BridgeHistory from bridgedb.parse import addr from bridgedb.test import deprecated_networkstatus as networkstatus +from bridgedb.test.util import bracketIPv6 +from bridgedb.test.util import randomIP +from bridgedb.test.util import randomIPv4 +from bridgedb.test.util import randomIPv6 +from bridgedb.test.util import randomIPString +from bridgedb.test.util import randomIPv4String +from bridgedb.test.util import randomIPv6String from math import log + def suppressWarnings(): warnings.filterwarnings('ignore', '.*tmpnam.*') -def randomIP(): - if random.choice(xrange(2)): - return randomIP4() - return randomIP6() - -def randomIP4(): - return ipaddr.IPv4Address(random.getrandbits(32)) - -def randomIP4String(): - return randomIP4().compressed - -def randomIP6(): - return ipaddr.IPv6Address(random.getrandbits(128)) - -def randomIP6String(): - return bracketIP6(randomIP6().compressed) - -def randomIPString(): - if random.choice(xrange(2)): - return randomIP4String() - return randomIP6String() - -def bracketIP6(ip): - """Put brackets around an IPv6 address, just as tor does.""" - return "[%s]" % ip - def random16IP(): upper = "123.123." # same 16 lower = ".".join([str(random.randrange(1,256)) for _ in xrange(2)]) @@ -111,7 +93,7 @@ def randomCountrySpec(): def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, transports=False): nn = "bridge-%s"%random.randrange(0,1000000) - ip = ipaddr.IPAddress(randomIP4()) + ip = ipaddr.IPAddress(randomIPv4()) fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) b.setStatus(running, stable) @@ -121,7 +103,7 @@ def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, for i in xrange(8): # Only add or_addresses if they are valid. Otherwise, the test # will randomly fail if an invalid address is chosen: - address = randomIP4String() + address = randomIPv4String() portlist = addr.PortList(randomPortSpec()) if addr.isValidIP(address): oraddrs.append((address, portlist,)) @@ -145,7 +127,7 @@ def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, transports=False): nn = "bridge-%s"%random.randrange(0,1000000) - ip = ipaddr.IPAddress(randomIP6()) + ip = ipaddr.IPAddress(randomIPv6()) fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) b.setStatus(running, stable) @@ -155,10 +137,10 @@ def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, for i in xrange(8): # Only add or_addresses if they are valid. Otherwise, the test # will randomly fail if an invalid address is chosen: - address = randomIP6() + address = randomIPv6() portlist = addr.PortList(randomPortSpec()) if addr.isValidIP(address): - address = bracketIP6(address) + address = bracketIPv6(address) oraddrs.append((address, portlist,)) for address, portlist in oraddrs: @@ -317,7 +299,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(500): - bridges = d.getBridgesForIP(randomIP4String(), + bridges = d.getBridgesForIP(randomIPv4String(), "faketimestamp", bridgeFilterRules=[filterBridgesByIP6]) bridge = random.choice(bridges) @@ -333,7 +315,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(500): - bridges = d.getBridgesForIP(randomIP4String(), + bridges = d.getBridgesForIP(randomIPv4String(), "faketimestamp", bridgeFilterRules=[filterBridgesByIP4]) bridge = random.choice(bridges) @@ -349,7 +331,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(50): - bridges = d.getBridgesForIP(randomIP4String(), + bridges = d.getBridgesForIP(randomIPv4String(), "faketimestamp", 1, bridgeFilterRules=[ filterBridgesByIP4, @@ -373,7 +355,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(5): - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + b = d.getBridgesForIP(randomIPv4String(), "x", 1, bridgeFilterRules=[ filterBridgesByIP4, filterBridgesByIP6]) assert len(b) == 0 @@ -396,10 +378,10 @@ class IPBridgeDistTests(unittest.TestCase): b.blockingCountries[key] = set(['cn']) for i in xrange(5): - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + b = d.getBridgesForIP(randomIPv4String(), "x", 1, bridgeFilterRules=[ filterBridgesByNotBlockedIn("cn")]) assert len(b) == 0 - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + b = d.getBridgesForIP(randomIPv4String(), "x", 1, bridgeFilterRules=[ filterBridgesByNotBlockedIn("us")]) assert len(b) > 0 @@ -722,4 +704,3 @@ def main(): suppressWarnings() unittest.TextTestRunner(verbosity=1).run(testSuite()) - diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index bec590d..2949eca 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -111,6 +111,32 @@ def getBridgeDBPID(pidfile="bridgedb.pid"): return pid +def bracketIPv6(ip): + """Put brackets around an IPv6 address, just as tor does.""" + return "[%s]" % ip + +def randomIPv4(): + return ipaddr.IPv4Address(random.getrandbits(32)) + +def randomIPv6(): + return ipaddr.IPv6Address(random.getrandbits(128)) + +def randomIP(): + if random.choice(xrange(2)): + return randomIPv4() + return randomIPv6() + +def randomIPv4String(): + return randomIPv4().compressed + +def randomIPv6String(): + return bracketIPv6(randomIPv6().compressed) + +def randomIPString(): + if random.choice(xrange(2)): + return randomIPv4String() + return randomIPv6String() + #: Mixin class for use with :api:`~twisted.trial.unittest.TestCase`. A #: ``TestCaseMixin`` can be used to add additional methods, which should be

1 0