October 2017 - tor-commits - lists.torproject.org

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 28 Oct '17

28 Oct '17

commit 6fac6dee98f2f4e9cebd893115dd175c5185535e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 28 03:50:32 2017 +0000 Update translations for tor-browser-manual --- id/id.po | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 83 insertions(+), 9 deletions(-) diff --git a/id/id.po b/id/id.po index d04d32449..145cafef5 100644 --- a/id/id.po +++ b/id/id.po @@ -1,9 +1,10 @@ # Translators: # zk <zamani.karmana(a)gmail.com>, 2016 # Mark Hiro <akmalgaul(a)gmail.com>, 2016 -# Rendiyono Wahyu Saputro <rendi.7936(a)gmail.com>, 2016 +# Irham Duilah <irhamduilah03(a)gmail.com>, 2016 # Jaya Wijaya <SecretCommission(a)tormail.org>, 2016 # runasand <inactive+runasand(a)transifex.com>, 2016 +# Rendiyono Wahyu Saputro <rendi.7936(a)gmail.com>, 2016 # Lucas Susanto <susantolucas(a)yahoo.com>, 2016 # Arif Budiman <arifbudiman(a)gmail.com>, 2016 # hpiece 8 <hpiece8(a)gmail.com>, 2017 @@ -11,7 +12,6 @@ # Eljuno Kasih <eljunotrie_anggoro(a)yahoo.co.id>, 2017 # Yerry Borang <yerry.borang(a)gmail.com>, 2017 # adhisuryo i <adhisuryo(a)gmail.com>, 2017 -# Irham Duilah <irhamduilah03(a)gmail.com>, 2017 # Faisal Bustamam <ical(a)riseup.net>, 2017 # Benyamin Adrianus Dos Santos <bendroxnahak(a)gmail.com>, 2017 # Dinar Lubis <goarhudinar(a)yahoo.com>, 2017 @@ -616,6 +616,12 @@ msgid "" "xref=\"circumvention\">Circumvention</link> screen to configure a pluggable " "transport." msgstr "" +"Layar pertama menanyakan jika akses ke jaringan Tor di blokir atau di sensor" +" pada koneksi anda. Jika anda tidak yakin hal ini menjadi kasus, pilih " +"\"No\". Jika anda mengetahui bahwa jaringan di sensor, atau anda mencoba dan" +" gagal terhubung dengan jaringan Tor dan tidak ada yang lain yang berhasil, " +"pilih \"yes\". Anda akan dibawa pada 1) circumvention 2) layar untuk " +"mengkonfigurasi pluggable transport" #: first-time.page:55 msgid "" @@ -746,6 +752,9 @@ msgid "" " ./start-tor-browser.desktop\n" " " msgstr "" +"\n" +" ./start-tor-browser.desktop\n" +" " #: managing-identities.page:6 msgid "Learn how to control personally-identifying information in Tor Browser" @@ -778,6 +787,12 @@ msgid "" " Browser includes some additional features that help you control what " "information can be tied to your identity." msgstr "" +"Menggunakan jaringan Tor, dapat menghentikan pengamat menemukan lokasi dan " +"alamat IP anda yang sebenarnya, namun jika walaupun tanpa informasi tersebut" +" pengamat masih mungkin dapat menghubungkan lokasi aktifitas anda yang " +"berbeda beda secara keseluruhan. Untuk tujuan ini, Tor Browser menyertakan " +"beberapa fitur tambahan yang akan membantu anda mengkontrol informasi apa " +"yang akan disertakan pada identitas anda. " #: managing-identities.page:29 msgid "The URL bar" @@ -818,10 +833,12 @@ msgid "" "You can see a diagram of the circuit that Tor Browser is using for the " "current tab in the onion menu." msgstr "" +"Kamu dapat melihat diagram dari sirkuit yang digunakan Tor Browser pada tab " +"saat ini di menu onion." #: managing-identities.page:55 msgid "Logging in over Tor" -msgstr "" +msgstr "Masuk lebih dari Tor" #: managing-identities.page:56 msgid "" @@ -829,6 +846,10 @@ msgid "" "there may be situations in which it makes sense to use Tor with websites " "that require usernames, passwords, or other identifying information." msgstr "" +"Meskipun Tor Browser dirancang untuk memungkinkan anonimitas total pengguna " +"di web, mungkin ada situasi di mana masuk akal untuk menggunakan Tor dengan " +"situs web yang memerlukan nama pengguna, kata sandi, atau informasi " +"identitas lainnya." #: managing-identities.page:62 msgid "" @@ -839,6 +860,13 @@ msgid "" "you reveal to the websites you browse. Logging in using Tor Browser is also " "useful if the website you are trying to reach is censored on your network." msgstr "" +"Bila kamu masuk ke sebuah situs menggunakan peramban reguler, kamu juga " +"menunjukkan alamat IP dan lokasi geografis anda dalam prosesnya. Hal yang " +"sama seringkali juga terjadi saat kamu mengirim surel. Masuk ke dalam media " +"sosial atau akun surel anda menggunakan Tor Browser memungkinkan anda untuk " +"memilih informasi mana yang ingin anda ungkap ke situs yang anda kunjungi. " +"Masuk menggunakan Tor Browser juga berguna bila situs yang kamu coba untuk " +"akses disensor pada jaringan anda." #: managing-identities.page:72 msgid "" @@ -853,6 +881,9 @@ msgid "" "See the <link xref=\"secure-connections\">Secure Connections</link> page for" " important information on how to secure your connection when logging in." msgstr "" +"Lihat halaman<link xref=\"secure-connections\">Secure " +"Connections</link>untuk informasi penting tentang cara mengamankan koneksi " +"Anda saat login." #: managing-identities.page:87 msgid "" @@ -863,10 +894,17 @@ msgid "" "following the site’s recommended procedure for account recovery, or " "contacting the operators and explaining the situation." msgstr "" +"Tor Browser seringkali membuat koneksi anda seakan-akan datang dari bagian " +"dunia yang sama sekali berbeda. Sejumlah situs, seperti bank atau penyedia " +"email mungkin saja mengartikan ini sebagai tanda bahwa akun anda telah " +"diretas atau terkompromikan dan mengkunci anda dari layanan. Satu-satunya " +"cara untuk memecahkan masalah ini adalah dengan mematuhi prosedur yang " +"direkomendasikan oleh situs yang dimaksud untuk menjalankan pemulihan akun " +"atau menghubungi operator manusia dan menjelaskan situasi anda." #: managing-identities.page:101 msgid "Changing identities and circuits" -msgstr "" +msgstr "Mengubah identitas dan sirkuit" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -878,12 +916,17 @@ msgid "" "external ref='media/managing-identities/new_identity.png' " "md5='15b01e35fa83185d94b57bf0ccf09d76'" msgstr "" +"external ref='media/managing-identities/new_identity.png' " +"md5='15b01e35fa83185d94b57bf0ccf09d76'" #: managing-identities.page:105 msgid "" "Tor Browser features “New Identity” and “New Tor Circuit for this Site” " "options, located in the Torbutton menu." msgstr "" +"Pilihan fitur Tor Browser \"New Identity (Identitas Baru)\" dan \"New Tor " +"Circuit for this Site (Sirkuit Tor Baru untuk situs ini)\" berada di menu " +"Torbutton." #: managing-identities.page:111 msgid "New Identity" @@ -1031,10 +1074,13 @@ msgid "" "methods that do not use Flash. These methods may be compatible with Tor " "Browser." msgstr "" +"Sejumlah situs video (misalnya Youtube) menawarkan metode pengiriman " +"alternatif yang tidak menggunakan Flash. Metode ini mungkin cocok dengan Tor" +" Browser." #: plugins.page:31 msgid "JavaScript" -msgstr "" +msgstr "JavaScript" #: plugins.page:32 msgid "" @@ -1043,6 +1089,10 @@ msgid "" "Unfortunately, JavaScript can also enable attacks on the security of the " "browser, which might lead to deanonymization." msgstr "" +"JavaScript merupakan bahasa pemograman yang digunakan peramban yang " +"menawarkan elemen interaktif semisal video, animasi, audio, dan linemasa. " +"Sayangnya, JavaScript juga memudahkan serangan keamanan terhadap peramban " +"yang bisa mengarah pada hilangnya anonimitas." #: plugins.page:39 msgid "" @@ -1081,6 +1131,8 @@ msgid "" "Tor Browser is based on Firefox, and any browser add-ons or themes that are " "compatible with Firefox can also be installed in Tor Browser." msgstr "" +"Tor Browser berbasiskan pada Firefox, dan setiap add-ons atau tema peramban " +"yang cocok dengan Firefox dapat dipasang pada Tor Browser." #: plugins.page:64 msgid "" @@ -1094,6 +1146,7 @@ msgstr "" #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" msgstr "" +"Pelajari bagaimana mengamankan data anda memakai Tor Browser dan HTTPS" #: secure-connections.page:12 msgid "Secure Connections" @@ -1262,10 +1315,16 @@ msgid "" "disabled by default on all non-<link xref=\"secure-" "connections\">HTTPS</link> sites." msgstr "" +"Pada level ini, HTML5 media audio dan visual menjadi click-to-play lewat " +"NoScript; semua optimalisasi kinerja JavaScript akan di-nonaktif-kan; " +"beberapa formula matematika kemngkinan tidak ditampilkan secara baik; " +"sejumlah perubahan fitur huruf di-nonaktif-kan; sejumlah jenis gambar di-" +"nonaktif-kan; dan JavaScript di-nonaktif-kan secara otomatif pada semua " +"non-<link xref=\"secure-connections\">HTTPS</link>sites" #: security-slider.page:64 msgid "Medium-Low" -msgstr "Menengah-Rendah" +msgstr "Menengah-Bawah" #: security-slider.page:65 msgid "" @@ -1274,24 +1333,30 @@ msgid "" "optimizations are disabled, causing some websites to run more slowly; and " "some mathematical equations may not display properly." msgstr "" +"Pada level ini, HTML5 media audio dan visual menjadi click-to-play lewat " +"NoScript, beberapa <link xref=\"plugins\">JavaScript</link>Optimalisasi " +"kinerja nonaktif, membuat sejumllah websites berjalan lambat; dan sejumlah " +"formula matematika tidak akan ditampilkan dengan baik." #: security-slider.page:73 msgid "Low" -msgstr "" +msgstr "Bawah" #: security-slider.page:74 msgid "" "At this level, all browser features are enabled. This is the most usable " "option." msgstr "" +"Pada level ini, semua fitur peramban dapat digunakan. Ini adalah pilihan " +"yang paling berguna." #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" -msgstr "" +msgstr "Jenis-jenis pluggable transport" #: transports.page:10 msgid "Pluggable Transports" -msgstr "" +msgstr "Pluggable Transports" #: transports.page:12 msgid "" @@ -1300,12 +1365,18 @@ msgid "" "Provider or other authority is actively blocking connections to the Tor " "network." msgstr "" +"Pluggable transports adalah perkakas yang Tor bisa gunakan untuk menyamarkan" +" lalu lintas ini untuk pengiriman keluar. Ini bisa berguna dalam situasi-" +"situasi di mana penyedia layanan internet atau otoritas lain aktif memblokir" +" koneksi ke jaringan Tor." #: transports.page:21 msgid "" "Currently there are six pluggable transports available, but more are being " "developed." msgstr "" +"Sekarang terdapat tiga pluggable transports dapat diakses, tapi lebih untuk " +"pengembangan." #: transports.page:28 msgid "obfs3" @@ -1376,6 +1447,9 @@ msgid "" " running the program, and clicking the “Connect” button if you are using it " "for the first time." msgstr "" +"Anda sudah bisa mulai berselancar di internet menggunakan Tor Browser segera" +" setelah menjalankan program dan menekan tombol \"Connect\" jika anda " +"menggunakannya pertama kali." #: troubleshooting.page:21 msgid "Quick fixes"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 28 Oct '17

28 Oct '17

commit dcface8fbb6820fde4e8ea86bd9b735fbc74d6fc Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 28 03:20:50 2017 +0000 Update translations for tor-browser-manual --- id/id.po | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/id/id.po b/id/id.po index 7230cd078..d04d32449 100644 --- a/id/id.po +++ b/id/id.po @@ -440,10 +440,16 @@ msgid "" "“32-bit” or “64-bit” software: this depends on the model of the computer you" " are using." msgstr "" +"GetTor akan merespon dengan email yang memuat tautan dari sumber pengunduh " +"paket Tor Browser, tanda tangan kriptografi (diperlukan untuk memverikasi " +"unduhan), sidik jari pengguna utama yang akan digunakan untuk membuat tanda " +"tangan, dan paket checksum. Anda akan di tawarkan dengan dua pilihan " +"perangkat lunak: '32 bit\" atau 64 bit. Pilihan ini tergantung dengan model " +"komputer yang anda gunakan" #: downloading.page:57 msgid "To use GetTor via Twitter:" -msgstr "" +msgstr "Mengunakan GetTor melalui Twitter" #: downloading.page:62 msgid "" @@ -471,7 +477,7 @@ msgstr "" #: downloading.page:84 msgid "Satori" -msgstr "" +msgstr "Satori" #: downloading.page:85 msgid "" @@ -693,7 +699,7 @@ msgstr "Sophos Antivirus untuk Mac" #: known-issues.page:32 msgid "Microsoft Security Essentials" -msgstr "" +msgstr "Microsoft Security yang penting" #: known-issues.page:37 msgid "" @@ -730,6 +736,8 @@ msgid "" "Tor Browser can also be started from the command line by running the " "following command from inside the Tor Browser directory:" msgstr "" +"Tor Browser bisa juga di mulai dari garis command dengan menjalankan " +"perintah dari dalam direktori Tor Browser" #: known-issues.page:66 #, no-wrap @@ -756,6 +764,11 @@ msgid "" "trackers, and advertising beacons, all of which can link your activity " "across different sites." msgstr "" +"Saat kamu terkoneksi ke sebuah situs, bukan hanya operator situs tersebut " +"yang bisa merekam informasi mengenai kunjungan anda. Kebanyakan situs saat " +"ini menggunakan banyak sekali layanan pihak ketiga, termasuk tombol \"Like\"" +" pada sosial media, analisis pelacak, dan suar iklan, yang semuanya bisa " +"mengkaitkan aktivitasmu di situs yang berbeda." #: managing-identities.page:20 msgid "" @@ -768,7 +781,7 @@ msgstr "" #: managing-identities.page:29 msgid "The URL bar" -msgstr "" +msgstr "Bar URL" #: managing-identities.page:30 msgid "" @@ -797,6 +810,8 @@ msgid "" "external ref='media/managing-identities/circuit_full.png' " "md5='bd46d22de952fee42643be46d3f95928'" msgstr "" +"external ref='media/managing-identities/circuit_full.png' " +"md5='bd46d22de952fee42643be46d3f95928'" #: managing-identities.page:48 msgid "" @@ -830,6 +845,8 @@ msgid "" "When you log in to a website over Tor, there are several points you should " "bear in mind:" msgstr "" +"Ketika anda masuk ke sebuah website memakai TOR, ada sejumlah hal yang mesti" +" anda ingat:" #: managing-identities.page:79 msgid "" @@ -900,7 +917,7 @@ msgstr "" #: onionsites.page:6 msgid "Services that are only accessible using Tor" -msgstr "" +msgstr "Layanan hanya bisa diakses menggunakan Tor" #: onionsites.page:10 msgid "Onion Services" @@ -963,7 +980,7 @@ msgstr "" #: onionsites.page:58 troubleshooting.page:10 msgid "Troubleshooting" -msgstr "" +msgstr "Tawaran solusi" #: onionsites.page:59 msgid "" @@ -1292,13 +1309,16 @@ msgstr "" #: transports.page:28 msgid "obfs3" -msgstr "" +msgstr "obfs3" #: transports.page:33 msgid "" "obfs3 makes Tor traffic look random, so that it does not look like Tor or " "any other protocol. obfs3 bridges will work in most places." msgstr "" +"obfs3 membuat lalu lintas Tor tampak acak, jadi nantinya tidak akan tampak " +"seperti Tor atau protokol lainnya. obfs3 bridges akan bekerja di banyak " +"tempat." #: transports.page:42 msgid "obfs4" @@ -1310,6 +1330,9 @@ msgid "" "from finding bridges by Internet scanning. obfs4 bridges are less likely to " "be blocked than obfs3 bridges." msgstr "" +"obfs4 membuat lalu lintas Tor tampak acak seperti obfs3, dan juga mencegah " +"sensor dari menemukan bridges oleh pemindaian internet. obfs4 bridges " +"sedikit mirip dalam blokir dibandingkan obfs3 bridges." #: transports.page:56 msgid "Scramblesuit"

1 0

[bridgedb/master] Add CHANGELOG entries for version 0.5.0.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 9495ae881a622c4fb4e5e9cf052f896ca847d5e4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 28 00:26:27 2017 +0000 Add CHANGELOG entries for version 0.5.0. --- CHANGELOG | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 57e67cf..316e45d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,22 @@ +Changes in version 0.5.0 - 2017-10-28 + + * FIXES #23957 https://bugs.torproject.org/23957 + BridgeDB now supports bridge operators choosing how their bridge + will be distributed. See the "BridgeDistribution" torrc option in + tor's manpage for details. + + * FIXES #16650 https://bugs.torproject.org/16650 + BridgeDB is now accessible via select remote user interfaces + through a meek tunnel. + + * FIXES #22998 https://bugs.torproject.org/23033 + * FIXES #23033 https://bugs.torproject.org/23033 + * FIXES #23034 https://bugs.torproject.org/23034 + Upgrades BridgeDB to newer versions of Twisted and PyOpenSSL, and + fixes several issues due to non-backwards compatible changes + within those libraries. + + Changes in version 0.4.0 - 2017-01-09 * FIXES #21162 https://bugs.torproject.org/21162

1 0

[bridgedb/master] Merge branch 'release/0.5.0'
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 513cd253bf3c1a44cc005b7aef9253d6ac4954ac Merge: a09089c 9495ae8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 28 00:27:42 2017 +0000 Merge branch 'release/0.5.0' .test.requirements.txt | 2 +- .travis.requirements.txt | 4 +- .travis.yml | 20 ++-- CHANGELOG | 19 ++++ Makefile | 2 +- bridgedb.conf | 4 +- bridgedb/Bridges.py | 67 ++++++++---- bridgedb/Main.py | 8 +- bridgedb/Stability.py | 10 +- bridgedb/Storage.py | 24 +++++ bridgedb/bridgerequest.py | 4 +- bridgedb/bridges.py | 14 ++- bridgedb/captcha.py | 6 +- bridgedb/crypto.py | 6 +- bridgedb/distribute.py | 4 +- bridgedb/email/autoresponder.py | 4 +- bridgedb/email/distributor.py | 6 +- bridgedb/email/dkim.py | 4 +- bridgedb/email/request.py | 4 +- bridgedb/email/server.py | 4 +- bridgedb/email/templates.py | 4 +- bridgedb/filters.py | 4 +- bridgedb/geo.py | 2 +- bridgedb/https/distributor.py | 6 +- bridgedb/https/request.py | 4 +- bridgedb/https/server.py | 4 +- bridgedb/interfaces.py | 4 +- bridgedb/parse/descriptors.py | 4 +- bridgedb/parse/fingerprint.py | 4 +- bridgedb/parse/nickname.py | 6 +- bridgedb/parse/versions.py | 6 +- bridgedb/persistent.py | 6 +- bridgedb/proxy.py | 6 +- bridgedb/qrcodes.py | 4 +- bridgedb/runner.py | 6 +- bridgedb/safelog.py | 4 +- bridgedb/schedule.py | 4 +- bridgedb/strings.py | 6 +- {test => bridgedb/test}/README | 0 {test => bridgedb/test}/__init__.py | 0 {test => bridgedb/test}/deprecated.py | 6 +- {test => bridgedb/test}/email_helpers.py | 4 +- {test => bridgedb/test}/https_helpers.py | 4 +- {test => bridgedb/test}/legacy_Tests.py | 0 {test => bridgedb/test}/test_Bucket.py | 4 +- {test => bridgedb/test}/test_Main.py | 6 +- bridgedb/test/test_Storage.py | 115 +++++++++++++++++++++ {test => bridgedb/test}/test_Tests.py | 10 +- {test => bridgedb/test}/test_bridgedb.py | 4 +- {test => bridgedb/test}/test_bridgerequest.py | 4 +- {test => bridgedb/test}/test_bridges.py | 4 +- {test => bridgedb/test}/test_captcha.py | 4 +- {test => bridgedb/test}/test_configure.py | 4 +- {test => bridgedb/test}/test_crypto.py | 10 +- {test => bridgedb/test}/test_distribute.py | 4 +- .../test}/test_email_autoresponder.py | 6 +- {test => bridgedb/test}/test_email_distributor.py | 6 +- {test => bridgedb/test}/test_email_dkim.py | 0 {test => bridgedb/test}/test_email_request.py | 0 {test => bridgedb/test}/test_email_server.py | 6 +- {test => bridgedb/test}/test_email_templates.py | 0 {test => bridgedb/test}/test_filters.py | 4 +- {test => bridgedb/test}/test_geo.py | 4 +- {test => bridgedb/test}/test_https.py | 10 +- {test => bridgedb/test}/test_https_distributor.py | 12 +-- {test => bridgedb/test}/test_https_request.py | 4 +- {test => bridgedb/test}/test_https_server.py | 14 +-- {test => bridgedb/test}/test_interfaces.py | 4 +- {test => bridgedb/test}/test_parse_addr.py | 0 {test => bridgedb/test}/test_parse_descriptors.py | 6 +- {test => bridgedb/test}/test_parse_headers.py | 6 +- {test => bridgedb/test}/test_parse_nickname.py | 6 +- {test => bridgedb/test}/test_parse_options.py | 4 +- {test => bridgedb/test}/test_parse_versions.py | 4 +- {test => bridgedb/test}/test_persistent.py | 0 .../test}/test_persistentSaveAndLoad.py | 0 {test => bridgedb/test}/test_proxy.py | 6 +- {test => bridgedb/test}/test_qrcodes.py | 4 +- {test => bridgedb/test}/test_safelog.py | 0 {test => bridgedb/test}/test_schedule.py | 4 +- {test => bridgedb/test}/test_smtp.py | 4 +- {test => bridgedb/test}/test_translations.py | 6 +- {test => bridgedb/test}/test_txrecaptcha.py | 4 +- {test => bridgedb/test}/test_util.py | 6 +- {test => bridgedb/test}/util.py | 6 +- bridgedb/translations.py | 4 +- bridgedb/txrecaptcha.py | 4 +- bridgedb/util.py | 6 +- requirements.txt | 6 +- setup.py | 4 +- test/test_Storage.py | 56 ---------- 91 files changed, 425 insertions(+), 274 deletions(-)

1 0

[bridgedb/develop] Add support for respecting "bridge-distribution-request" lines.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 75206116fe6f39538f522776a158ca79959a6e79 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 27 02:16:30 2017 +0000 Add support for respecting "bridge-distribution-request" lines. * CLOSES #23957: https://bugs.torproject.org/23957 --- bridgedb/Bridges.py | 65 +++++++++++++++++++++++++++++++++++++++-------------- bridgedb/Storage.py | 24 ++++++++++++++++++++ bridgedb/bridges.py | 10 +++++++++ 3 files changed, 82 insertions(+), 17 deletions(-) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index ddfb447..ac403b6 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -454,29 +454,60 @@ class BridgeSplitter(object): if not bridge.flags.running: return - # Determine which ring to put this bridge in if we haven't seen it - # before. - pos = self.hmac(bridge.identity) - n = int(pos[:8], 16) % self.totalP - pos = bisect.bisect_right(self.pValues, n) - 1 - assert 0 <= pos < len(self.rings) - ringname = self.rings[pos] - logging.info("%s placing bridge %s into hashring %s (via n=%s, pos=%s)." - % (self.__class__.__name__, bridge, ringname, n, pos)) - validRings = self.rings + self.pseudoRings + distribution_method = None + # If the bridge already has a distributor, use that. with bridgedb.Storage.getDB() as db: - ringname = db.insertBridgeAndGetRing(bridge, ringname, time.time(), - validRings) + distribution_method = db.getBridgeDistributor(bridge, validRings) + + if distribution_method: + logging.info("%s bridge %s was already in hashring %s" % + (self.__class__.__name__, bridge, distribution_method)) + else: + # Check if the bridge requested a specific distribution method. + if bridge.distribution_request: + distribution_method = bridge.distribution_request + logging.info("%s bridge %s requested placement in hashring %s" + % (self.__class__.__name__, bridge, + distribution_method)) + + # If they requested not to be distributed, honor the request: + if distribution_method == "none": + logging.info("%s bridge %s requested to not be distributed." + % (self.__class__.__name__, bridge)) + return + + # If we didn't know what they are talking about, or they requested + # "any" distribution method, and we've never seen this bridge + # before, then determine where to place it. + if ((distribution_method not in validRings) or + (distribution_method == "any")): + + pos = self.hmac(bridge.identity) + n = int(pos[:8], 16) % self.totalP + pos = bisect.bisect_right(self.pValues, n) - 1 + assert 0 <= pos < len(self.rings) + distribution_method = self.rings[pos] + logging.info(("%s placing bridge %s into hashring %s (via n=%s," + " pos=%s).") % (self.__class__.__name__, bridge, + distribution_method, n, pos)) + + with bridgedb.Storage.getDB() as db: + ringname = db.insertBridgeAndGetRing(bridge, distribution_method, + time.time(), validRings) db.commit() - # Pseudo distributors are always held in the "unallocated" ring - if ringname in self.pseudoRings: - ringname = "unallocated" + # Pseudo distributors are always held in the "unallocated" ring + if ringname in self.pseudoRings: + ringname = "unallocated" + + ring = self.ringsByName.get(ringname) + ring.insert(bridge) - ring = self.ringsByName.get(ringname) - ring.insert(bridge) + if ring is None: + logging.warn("Couldn't recognise ring named: '%s'" % ringname) + logging.info("Current rings: %s" % " ".join(self.ringsByName)) def dumpAssignments(self, f, description=""): for name,ring in self.ringsByName.iteritems(): diff --git a/bridgedb/Storage.py b/bridgedb/Storage.py index ea9d26b..4182c4b 100644 --- a/bridgedb/Storage.py +++ b/bridgedb/Storage.py @@ -145,6 +145,26 @@ class Database(object): self._cur.close() self._conn.close() + def getBridgeDistributor(self, bridge, validRings): + """If a ``bridge`` is already in the database, get its distributor. + + :rtype: None or str + :returns: The ``bridge`` distribution method, if one was + already assigned, otherwise, returns None. + """ + distribution_method = None + cur = self._cur + + cur.execute("SELECT id, distributor FROM Bridges WHERE hex_key = ?", + (bridge.fingerprint,)) + result = cur.fetchone() + + if result: + if result[1] in validRings: + distribution_method = result[1] + + return distribution_method + def insertBridgeAndGetRing(self, bridge, setRing, seenAt, validRings, defaultPool="unallocated"): '''Updates info about bridge, setting ring to setRing if none was set. @@ -175,6 +195,10 @@ class Database(object): timeToStr(seenAt), i)) return ring else: + # Check if this is currently a valid ring name. If not, move back + # into default pool. + if setRing not in validRings: + setRing = defaultPool # Insert it. cur.execute("INSERT INTO Bridges (hex_key, address, or_port, " "distributor, first_seen, last_seen) " diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py index 4386d4e..8b4bc1b 100644 --- a/bridgedb/bridges.py +++ b/bridgedb/bridges.py @@ -914,6 +914,12 @@ class Bridge(BridgeBackwardsCompatibility): currently serving clients (e.g. if the Bridge hit its configured ``RelayBandwidthLimit``); ``False`` otherwise. + :vartype distribution_request: str + :ivar distribution_request: If the bridge specified a + "bridgedb-distribution-request" line in its ``@type + bridge-server-descriptor``, the requested distribution method will be + stored here. If the line was absent, this will be set to ``"any"``. + :vartype _blockedIn: dict :ivar _blockedIn: A dictionary of ``ADDRESS:PORT`` pairs to lists of lowercased, two-letter country codes (e.g. ``"us"``, ``"gb"``, @@ -963,6 +969,7 @@ class Bridge(BridgeBackwardsCompatibility): self.flags = Flags() self.hibernating = False self._blockedIn = {} + self.distribution_request = "any" self.bandwidth = None self.bandwidthAverage = None @@ -1595,6 +1602,9 @@ class Bridge(BridgeBackwardsCompatibility): self._updateORAddresses(descriptor.or_addresses) self.hibernating = descriptor.hibernating + if descriptor.bridge_distribution: + self.distribution_request = descriptor.bridge_distribution + self.onionKey = descriptor.onion_key self.ntorOnionKey = descriptor.ntor_onion_key self.signingKey = descriptor.signing_key

1 0

[bridgedb/develop] Bump leekspin version to 2.2.0.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 163db1e141bd42601f4b05c50f609cfc0b17a760 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Oct 26 23:02:20 2017 +0000 Bump leekspin version to 2.2.0. --- .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index f48bba3..6a85c00 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -6,7 +6,7 @@ # $ make coverage # coverage==4.2 -leekspin==1.1.4 +git+https://git.torproject.org/user/isis/leekspin.git@bad0bed11a9018f65555b3c6998b26e2cb06f5b5#egg=leekspin-2.2.0.dev1-py2.7 mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/.travis.requirements.txt b/.travis.requirements.txt index de5e58a..092d4f2 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ coverage==4.2 coveralls==0.4.2 -leekspin==1.1.4 +git+https://git.torproject.org/user/isis/leekspin.git@bad0bed11a9018f65555b3c6998b26e2cb06f5b5#egg=leekspin-2.2.0.dev1-py2.7 mechanize==0.2.5 sure==1.2.2 Babel==0.9.6

1 0

[bridgedb/develop] Bump stem version to support bridge-distribution-request lines.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit d1354e56edf9303c62df65c0a38d060da8b6feb6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Oct 26 22:42:07 2017 +0000 Bump stem version to support bridge-distribution-request lines. --- .travis.requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 0c1dc95..de5e58a 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -28,5 +28,5 @@ gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 service_identity==14.0.0 -git+https://git.torproject.org/stem.git@ba8cee36a0348c1509ad3562051723b7948e19ce#egg=stem-1.4.1.dev0-py2.7 +git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7 zope.interface==3.6.1 diff --git a/requirements.txt b/requirements.txt index 644de6c..f60d817 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,5 @@ gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 service_identity==14.0.0 -git+https://git.torproject.org/stem.git@152fa89c33114619913d2be13e67adb4e55ce7ab#egg=stem-1.4.1.dev1-py2.7 +git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7 zope.interface==3.6.1

1 0

[bridgedb/develop] Add unittests for SQL to determine which distributor to allocate to.
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 48d4562f544c0635e0ce75a4151a68ff10c6908f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 27 23:30:24 2017 +0000 Add unittests for SQL to determine which distributor to allocate to. --- bridgedb/test/test_Storage.py | 69 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/bridgedb/test/test_Storage.py b/bridgedb/test/test_Storage.py index 8b0affd..dffba2b 100644 --- a/bridgedb/test/test_Storage.py +++ b/bridgedb/test/test_Storage.py @@ -1,17 +1,23 @@ #!/usr/bin/env python """Unittests for the :mod:`bridgedb.Storage` module.""" +import os +import threading +import time + from twisted.python import log from twisted.trial import unittest -import bridgedb.Storage as Storage from twisted.internet import reactor from twisted.internet.threads import deferToThread -import os -import threading -from time import sleep + +import bridgedb.Storage as Storage + +from bridgedb.test.util import generateFakeBridges class DatabaseTest(unittest.TestCase): def setUp(self): + self.fakeBridges = generateFakeBridges() + self.validRings = ['https', 'unallocated', 'email', 'moat'] self.dbfname = 'test-bridgedb.sqlite' Storage.setDBFilename(self.dbfname) @@ -22,7 +28,7 @@ class DatabaseTest(unittest.TestCase): def _runAndDie(self, timeout, func): with func(): - sleep(timeout) + time.sleep(timeout) def _cb_assertTrue(self, result): self.assertTrue(result) @@ -54,3 +60,56 @@ class DatabaseTest(unittest.TestCase): d2.addCallback(self._cb_assertFalse) d2.addErrback(self._eb_Failure) d2.addCallback(self._cb_assertTrue, Storage.getDB(False)) + + def test_insertBridgeAndGetRing_new_bridge(self): + bridge = self.fakeBridges[0] + Storage.initializeDBLock() + with Storage.getDB() as db: + ringname = db.insertBridgeAndGetRing(bridge, 'moat', + time.time(), + self.validRings) + self.assertIn(ringname, self.validRings) + + def test_insertBridgeAndGetRing_already_seen_bridge(self): + bridge = self.fakeBridges[0] + Storage.initializeDBLock() + with Storage.getDB() as db: + ringname = db.insertBridgeAndGetRing(bridge, 'moat', + time.time(), + self.validRings) + self.assertIn(ringname, self.validRings) + ringname = db.insertBridgeAndGetRing(bridge, 'https', + time.time(), + self.validRings) + self.assertIn(ringname, self.validRings) + self.assertEqual(ringname, 'moat') + + def test_getBridgeDistributor_recognised(self): + bridge = self.fakeBridges[0] + Storage.initializeDBLock() + with Storage.getDB() as db: + ringname = db.insertBridgeAndGetRing(bridge, 'moat', + time.time(), + self.validRings) + self.assertIn(ringname, self.validRings) + self.assertEqual(ringname, 'moat') + db.commit() + + with Storage.getDB() as db: + ringname = db.getBridgeDistributor(bridge, self.validRings) + self.assertEqual(ringname, 'moat') + + def test_getBridgeDistributor_unrecognised(self): + bridge = self.fakeBridges[0] + Storage.initializeDBLock() + with Storage.getDB() as db: + ringname = db.insertBridgeAndGetRing(bridge, 'godzilla', + time.time(), + self.validRings) + self.assertIn(ringname, self.validRings) + self.assertEqual(ringname, "unallocated") + db.commit() + + with Storage.getDB() as db: + ringname = db.getBridgeDistributor(bridge, self.validRings) + self.assertEqual(ringname, "unallocated")

1 0

[bridgedb/develop] Merge branch 'release/0.5.0'
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit 513cd253bf3c1a44cc005b7aef9253d6ac4954ac Merge: a09089c 9495ae8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 28 00:27:42 2017 +0000 Merge branch 'release/0.5.0' .test.requirements.txt | 2 +- .travis.requirements.txt | 4 +- .travis.yml | 20 ++-- CHANGELOG | 19 ++++ Makefile | 2 +- bridgedb.conf | 4 +- bridgedb/Bridges.py | 67 ++++++++---- bridgedb/Main.py | 8 +- bridgedb/Stability.py | 10 +- bridgedb/Storage.py | 24 +++++ bridgedb/bridgerequest.py | 4 +- bridgedb/bridges.py | 14 ++- bridgedb/captcha.py | 6 +- bridgedb/crypto.py | 6 +- bridgedb/distribute.py | 4 +- bridgedb/email/autoresponder.py | 4 +- bridgedb/email/distributor.py | 6 +- bridgedb/email/dkim.py | 4 +- bridgedb/email/request.py | 4 +- bridgedb/email/server.py | 4 +- bridgedb/email/templates.py | 4 +- bridgedb/filters.py | 4 +- bridgedb/geo.py | 2 +- bridgedb/https/distributor.py | 6 +- bridgedb/https/request.py | 4 +- bridgedb/https/server.py | 4 +- bridgedb/interfaces.py | 4 +- bridgedb/parse/descriptors.py | 4 +- bridgedb/parse/fingerprint.py | 4 +- bridgedb/parse/nickname.py | 6 +- bridgedb/parse/versions.py | 6 +- bridgedb/persistent.py | 6 +- bridgedb/proxy.py | 6 +- bridgedb/qrcodes.py | 4 +- bridgedb/runner.py | 6 +- bridgedb/safelog.py | 4 +- bridgedb/schedule.py | 4 +- bridgedb/strings.py | 6 +- {test => bridgedb/test}/README | 0 {test => bridgedb/test}/__init__.py | 0 {test => bridgedb/test}/deprecated.py | 6 +- {test => bridgedb/test}/email_helpers.py | 4 +- {test => bridgedb/test}/https_helpers.py | 4 +- {test => bridgedb/test}/legacy_Tests.py | 0 {test => bridgedb/test}/test_Bucket.py | 4 +- {test => bridgedb/test}/test_Main.py | 6 +- bridgedb/test/test_Storage.py | 115 +++++++++++++++++++++ {test => bridgedb/test}/test_Tests.py | 10 +- {test => bridgedb/test}/test_bridgedb.py | 4 +- {test => bridgedb/test}/test_bridgerequest.py | 4 +- {test => bridgedb/test}/test_bridges.py | 4 +- {test => bridgedb/test}/test_captcha.py | 4 +- {test => bridgedb/test}/test_configure.py | 4 +- {test => bridgedb/test}/test_crypto.py | 10 +- {test => bridgedb/test}/test_distribute.py | 4 +- .../test}/test_email_autoresponder.py | 6 +- {test => bridgedb/test}/test_email_distributor.py | 6 +- {test => bridgedb/test}/test_email_dkim.py | 0 {test => bridgedb/test}/test_email_request.py | 0 {test => bridgedb/test}/test_email_server.py | 6 +- {test => bridgedb/test}/test_email_templates.py | 0 {test => bridgedb/test}/test_filters.py | 4 +- {test => bridgedb/test}/test_geo.py | 4 +- {test => bridgedb/test}/test_https.py | 10 +- {test => bridgedb/test}/test_https_distributor.py | 12 +-- {test => bridgedb/test}/test_https_request.py | 4 +- {test => bridgedb/test}/test_https_server.py | 14 +-- {test => bridgedb/test}/test_interfaces.py | 4 +- {test => bridgedb/test}/test_parse_addr.py | 0 {test => bridgedb/test}/test_parse_descriptors.py | 6 +- {test => bridgedb/test}/test_parse_headers.py | 6 +- {test => bridgedb/test}/test_parse_nickname.py | 6 +- {test => bridgedb/test}/test_parse_options.py | 4 +- {test => bridgedb/test}/test_parse_versions.py | 4 +- {test => bridgedb/test}/test_persistent.py | 0 .../test}/test_persistentSaveAndLoad.py | 0 {test => bridgedb/test}/test_proxy.py | 6 +- {test => bridgedb/test}/test_qrcodes.py | 4 +- {test => bridgedb/test}/test_safelog.py | 0 {test => bridgedb/test}/test_schedule.py | 4 +- {test => bridgedb/test}/test_smtp.py | 4 +- {test => bridgedb/test}/test_translations.py | 6 +- {test => bridgedb/test}/test_txrecaptcha.py | 4 +- {test => bridgedb/test}/test_util.py | 6 +- {test => bridgedb/test}/util.py | 6 +- bridgedb/translations.py | 4 +- bridgedb/txrecaptcha.py | 4 +- bridgedb/util.py | 6 +- requirements.txt | 6 +- setup.py | 4 +- test/test_Storage.py | 56 ---------- 91 files changed, 425 insertions(+), 274 deletions(-)

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 28 Oct '17

28 Oct '17

commit f23f3630321e4b98db7ef47dfb596eb06ad94abb Merge: 96707e2 513cd25 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Oct 28 00:27:59 2017 +0000 Merge branch 'master' into develop CHANGELOG | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)

1 0