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

[tor/master] don't update dir_info_status when we have minimum dir info
by arma＠torproject.org 19 Feb '15

19 Feb '15

commit 70f46f7ae6617ee99f5067a0f0e47eac2042eae1 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 19 06:15:25 2015 -0500 don't update dir_info_status when we have minimum dir info Nothing ever uses the string when we're in "have minimum dir info" state. The flow of the function is "check for problems, if you see a problem write an explanation to dir_info_status and set res to 0". If you get to the end of the function without any problems, then res = 1 and we're all ready to start making circuits. (Changed after consultation with Yawning.) --- src/or/nodelist.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index ab05bce..29f00ac 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1703,22 +1703,6 @@ update_router_have_minimum_dir_info(void) res = 0; control_event_bootstrap(BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS, 0); goto done; - } else { - /* these messages can be excessive in testing networks */ - static ratelim_t last_warned = - RATELIM_INIT(NOTICE_DIR_INFO_STATUS_INTERVAL); - char *suppression_msg = NULL; - - tor_snprintf(dir_info_status, sizeof(dir_info_status), - "We have enough %sdescriptors: we have %d/%d, and " - "can build %d%% of likely paths. (We have %s.)", - using_md?"micro":"", num_present, num_usable, - (int)(paths*100), status); - - if ((suppression_msg = rate_limit_log(&last_warned, time(NULL)))) { - log_info(LD_NET, "%s%s", dir_info_status, suppression_msg); - tor_free(suppression_msg); - } } tor_free(status);

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 19 Feb '15

19 Feb '15

commit 91eb51c92094c3151e3036d5c3b3158131818482 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 19 09:45:49 2015 +0000 Update translations for torbutton-torbuttonproperties --- tr/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/torbutton.properties b/tr/torbutton.properties index d5d3276..b15b893 100644 --- a/tr/torbutton.properties +++ b/tr/torbutton.properties @@ -51,7 +51,7 @@ torbutton.popup.short_torbrowser = Önemli Torbutton bilgisi!\nTorbutton şimdi torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliğinizi ve anonimliğinizi zedeleyebilir.\n\nAynı zaman Tor'u atlatarak geçerli konumunuzu ve IP adresinizi ortaya çıkarabilir.\n\nEklentileri aktif etmek istiyor musunuz?\n torbutton.popup.never_ask_again = Bir daha sorma -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor Tarayıcısı tüm sekmeleri ve pencereleri kapatacak. Tüm web sitesi oturumları kaybolacaktır.\n\nOturumunuzu sıfırlamak için Tor tarayıcı yeniden başlatılsın mı?\n # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak tanımlayabilmek için kullanılabilen HTML5 tuvalindeki resim verisine erişmeye çalıştı.\n\nTor Tarayıcı bu web sitesine HTML5 tuval resim verisini çıkarmasına izin vermeli mi?

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 19 Feb '15

19 Feb '15

commit 83a6f8ea81a3b0eb7b7e6225bfd4de5bc1fd7f5b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 19 09:45:39 2015 +0000 Update translations for abouttor-homepage_completed --- tr/aboutTor.dtd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index bdcd023..e14481c 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "AMA, bu tarayıcı güncel değil."> <!ENTITY aboutTor.outOfDateTorOff.label "AYRICA, bu tarayıcı güncel değil."> -<!ENTITY aboutTor.outOfDate2.label "Soğana tıklayın ve Tor Tarayıcı Paketi Güncellemesini İndir'i seçin."> +<!ENTITY aboutTor.outOfDate2.label "Soğan'a tıklayın ve ardından Tor Tarayıcı Güncellemesini Denetle seçin."> <!ENTITY aboutTor.check.label "Tor Ağ Ayarlarını Test Edin"> @@ -25,6 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Ek bilgi:"> <!ENTITY aboutTor.torInfo2.label "Ülke ve IP Adresi:">

1 0

[tor-browser-bundle/master] There is a build2, let's use it then
by gk＠torproject.org 19 Feb '15

19 Feb '15

commit 03d9d9df1912d5c55dbe3e36f8664a434ba32d78 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 19 10:26:02 2015 +0000 There is a build2, let's use it then --- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0869d4e..8f6f915 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -37,7 +37,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 2f078b2..8bbba6e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -41,7 +41,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5

1 0

[tor-browser-bundle/master] Update config.yml for 4.5a4
by gk＠torproject.org 19 Feb '15

19 Feb '15

commit 7b46a3ce22e9b7760850b73e24271ce7e09a6a67 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 19 09:57:51 2015 +0000 Update config.yml for 4.5a4 --- tools/update-responses/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 7f1d7c9..a338745 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,14 +6,14 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 4.5a3 + alpha: 4.5a4 versions: - 4.5a3: - platformVersion: 31.4.0 + 4.5a4: + platformVersion: 31.5.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5a3 + download_url: https://www.torproject.org/dist/torbrowser/4.5a4 incremental_from: - - 4.5-alpha-2 + - 4.5a3 migrate_archs: osx32: osx64 osx32:

1 0

[bridgedb/develop] Remove unused import of bridgedb.geo in bridgedb.Bridges module.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 45b092770e776e19189f66a5aa081331a367f7fa Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 19 01:04:38 2015 +0000 Remove unused import of bridgedb.geo in bridgedb.Bridges module. Fix on dec1d60; it was my mistake that the hunk got added while rebasing the patches on top of the #9380 changes. --- lib/bridgedb/Bridges.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 0904d67..bdb911a 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -21,7 +21,6 @@ import random import bridgedb.Storage import bridgedb.Bucket -import bridgedb.geo from bridgedb.bridges import Bridge from bridgedb.crypto import getHMACFunc

1 0

[bridgedb/develop] Install libgeoip-dev and geoip-database packages for CI builds.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 21b9a3916c273e483a58d1101eb3991f65afc00b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 19 01:01:13 2015 +0000 Install libgeoip-dev and geoip-database packages for CI builds. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2765078..a0f4814 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ before_install: - chmod -R og-w $PYTHON_EGG_CACHE install: - - sudo apt-get install -qq --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools + - sudo apt-get install -qq --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools libgeoip-dev geoip-database - pip install -q --no-use-wheel -r .travis.requirements.txt - pip install -q --no-use-wheel Twisted==$TWISTED_VERSION pyOpenSSL==$PYOPENSSL_VERSION - make install

1 0

[bridgedb/develop] Merge branch 'fix/12872-bridge-geoip_r1' into develop
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 22d39691f7d4e773b95d172e6c0949b333e14c38 Merge: dd2398c 45b0927 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 19 04:14:48 2015 +0000 Merge branch 'fix/12872-bridge-geoip_r1' into develop .travis.yml | 2 +- lib/bridgedb/HTTPServer.py | 32 ++++--------- lib/bridgedb/bridges.py | 17 +++++++ lib/bridgedb/geo.py | 78 ++++++++++++++++++++++++++++++ lib/bridgedb/test/test_bridges.py | 12 +++++ lib/bridgedb/test/test_geo.py | 96 +++++++++++++++++++++++++++++++++++++ 6 files changed, 212 insertions(+), 25 deletions(-)

1 0

[bridgedb/develop] Add CHANGELOG entries for BridgeDB-0.3.0.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit dd2398c1b303bf0e7deaa4f03e3e20000d6fb906 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 19 04:14:23 2015 +0000 Add CHANGELOG entries for BridgeDB-0.3.0. --- CHANGELOG | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 8c21489..27aeed0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,56 @@ +Changes in version 0.3.0 - XXX + + * FIXES #2895 https://bugs.torproject.org/2895 + BridgeDB no longer assumes that any extrainfo descriptor files are + in chronological order. + + * FIXES #4405 https://bugs.torproject.org/4405 + BridgeDB now has a built-in timer mechanism for scheduling + cronjobesque events. This is now used to routinely download and + parse the list of Tor exit relays in a completely asynchronous + manner. + + * FIXES #9380 https://bugs.torproject.org/9380 + BridgeDB now uses Stem (https://stem.torproject.org) for its + parsers, and has better classes for parsing and storing + information on Bridges and their Pluggable Transports. + Additionally, all of BridgeDB's parses and the new + Bridge/PluggableTransport classes all have 100% unittest and + integration test coverage. + + * FIXES #11216 https://bugs.torproject.org/11216 + BridgeDB no longer parses any extrainfo descriptor files + cumulatively. Before, a Bridge which had a descriptor in + cached-extrainfo and in cached-extrainfo.new and supported obfs3, + obfs4, and scramblesuit transports would be parsed twice, + resulting in the Bridge having six transports. This is no longer + the case. + + * HOTFIXES an issue with non-deterministic unittest failures in + the Mechanize-based integrations tests in + lib/bridgedb/test/test_https.py. hotfix/0.2.4-mechanize-tags + + * FIXES #12872 https://bugs.torproject.org/12872 + BridgeDB now has geolocational information for Bridges, telling it + which country each Bridge's primary ORAddress is within, as well + as geolocational information for each PluggableTransport address. + Thanks to Alden S. Page for the patches. + +And includes the following general changes: + * CHANGES BridgeDB's continuous integration infrastructure to run + tests for: + - Twisted-13.2.0 (Debian Wheezy version), + - Twisted-14.0.2 (Debian Jessie version), and + - Twisted-15.0.0 (latest and greatest) + As well as testing both: + - pyOpenSSL-0.13.1 (Debian Wheezy version), and + - pyOpenSSL-0.14 (Debian Jessie version). + See https://travis-ci.org/isislovecruft/bridgedb/builds + + * FIXES an issue with the $PYTHON_EGG_CACHE directory being group + writable on Travis-CI build machines. + + Changes in version 0.2.4 - 2015-02-03 * HOTFIXES a UnicodeDecodeError resulting from patches for #12627.

1 0

[bridgedb/develop] Added countryCode attribute, refactored GeoIP logic into its own module.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit dec1d60e13087cd16cc7dd9feec1cd86828d275c Author: Alden S. Page <pagea(a)allegheny.edu> Date: Thu Jan 1 21:24:09 2015 -0500 Added countryCode attribute, refactored GeoIP logic into its own module. Instances of Bridge now keep track of their country codes. This should help us hand out bridges more intelligently. In particular, we will soon be able to withold bridges from .ir and .sy as per issue #12843. Since multiple modules make use of geoip (HTTPServer and Bridges), I moved the geoip logic out of HTTPServer and into its own module called geo.py. Signed-off-by: Isis Lovecruft <isis(a)torproject.org> I removed the bridgedb.Bridges.Bridge.coutryCode attribute because it'll need to be ported to bridgedb.bridges.Bridge now that #9380 is merged. --- lib/bridgedb/Bridges.py | 1 + lib/bridgedb/HTTPServer.py | 29 +++--------------- lib/bridgedb/geo.py | 71 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 25 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index bdb911a..0904d67 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -21,6 +21,7 @@ import random import bridgedb.Storage import bridgedb.Bucket +import bridgedb.geo from bridgedb.bridges import Bridge from bridgedb.crypto import getHMACFunc diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 389d5a4..3a51f7c 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -24,6 +24,7 @@ from functools import partial from ipaddr import IPv4Address from ipaddr import IPv6Address +from ipaddr import IPAddress import mako.exceptions from mako.template import Template @@ -38,6 +39,7 @@ from twisted.web import static from twisted.web.util import redirectTo import bridgedb.Dist +import bridgedb.geo from bridgedb import captcha from bridgedb import crypto @@ -55,7 +57,6 @@ from bridgedb.safelog import logSafely TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates') -GEOIP_DBFILE = '/usr/share/GeoIP/GeoIP.dat' rtl_langs = ('ar', 'he', 'fa', 'gu_IN', 'ku') # Setting `filesystem_checks` to False is recommended for production servers, @@ -71,23 +72,6 @@ lookup = TemplateLookup(directories=[TEMPLATE_DIR], collection_size=500) logging.debug("Set template root to %s" % TEMPLATE_DIR) -try: - # Make sure we have the database before trying to import the module: - if not os.path.isfile(GEOIP_DBFILE): # pragma: no cover - raise EnvironmentError("Could not find %r. On Debian-based systems, "\ - "please install the geoip-database package." - % GEOIP_DBFILE) - # This is a "pure" python version which interacts with the Maxmind GeoIP - # API (version 1). It requires, in Debian, the libgeoip-dev and - # geoip-database packages. - import pygeoip - geoip = pygeoip.GeoIP(GEOIP_DBFILE, flags=pygeoip.MEMORY_CACHE) - logging.info("GeoIP database loaded") -except Exception as err: # pragma: no cover - logging.warn("Error while loading geoip module: %r" % err) - geoip = None - - def replaceErrorPage(error, template_name=None): """Create a general error page for displaying in place of tracebacks. @@ -691,12 +675,8 @@ class WebResourceBridges(resource.Resource): else: ip = request.getClientIP() - # XXX This can also be a separate function - # XXX if the ip is None, this throws an exception - if geoip: - countryCode = geoip.country_code_by_addr(ip) - if countryCode: - logging.debug("Client request from GeoIP CC: %s" % countryCode) + # Record what country the client is in. + countryCode = bridgedb.geo.getCountryCode(IPAddress(ip)) # XXX separate function again format = request.args.get("format", None) @@ -806,7 +786,6 @@ class WebResourceBridges(resource.Resource): return rendered - class WebRoot(resource.Resource): """The parent resource of all other documents hosted by the webserver.""" diff --git a/lib/bridgedb/geo.py b/lib/bridgedb/geo.py new file mode 100644 index 0000000..b2be72c --- /dev/null +++ b/lib/bridgedb/geo.py @@ -0,0 +1,71 @@ +# +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: see AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# :license: 3-Clause BSD, see LICENSE for licensing information + +""" +Boilerplate setup for GeoIP. GeoIP allows us to look up the country code +associated with an IP address. This is a "pure" python version which interacts +with the Maxmind GeoIP API (version 1). It requires, in Debian, the libgeoip-dev +and geoip-database packages. +""" + +import logging +from os.path import isfile + +from bridgedb.safelog import logSafely +from ipaddr import IPv4Address, IPv6Address + +# IPv4 database +GEOIP_DBFILE = '/usr/share/GeoIP/GeoIP.dat' +# IPv6 database +GEOIPv6_DBFILE = '/usr/share/GeoIP/GeoIPv6.dat' +try: + # Make sure we have the database before trying to import the module: + if not (isfile(GEOIP_DBFILE) and isfile(GEOIPv6_DBFILE)): + raise EnvironmentError("Could not find %r. On Debian-based systems, "\ + "please install the geoip-database package." + % GEOIP_DBFILE) + + import pygeoip + geoip = pygeoip.GeoIP(GEOIP_DBFILE, flags=pygeoip.MEMORY_CACHE) + geoipv6 = pygeoip.GeoIP(GEOIPv6_DBFILE, flags=pygeoip.MEMORY_CACHE) + logging.info("GeoIP databases loaded") +except Exception as err: # pragma: no cover + logging.warn("Error while loading geoip module: %r" % err) + geoip = None + +def getCountryCode(IPAddr): + """Returns the two-letter country code of a given IP address. + + :param IPAddr: (:class:`ipaddr.IPAddress`) An IPv4 OR IPv6 address. + """ + ip = None + version = None + try: + ip = IPAddr.exploded + version = IPAddr.version + except AttributeError as err: + logging.warn("Wrong type passed to getCountryCode. Offending call:" + " %r" % err) + return None + + # GeoIP has two databases: one for IPv4 addresses, and one for IPv6 + # addresses. This will ensure we use the correct one. + db = None + if version == 4: + db = geoip + else: + db = geoipv6 + + # Look up the country code of the address. + countryCode = db.country_code_by_addr(ip) + if countryCode: + logging.debug("Looked up country code: %s" % countryCode) + return countryCode + else: + logging.debug("Country code was not detected. IP: %s" % ip) + return None

1 0