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

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit f1dbb8bd5d7ff35b93fe7480660fc4e3c2515698 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 03:22:41 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-ja.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tor-outreach2019-2020-ja.md b/tor-outreach2019-2020-ja.md index b0fb2f71f..2a03ee5bf 100644 --- a/tor-outreach2019-2020-ja.md +++ b/tor-outreach2019-2020-ja.md @@ -8,11 +8,11 @@ しかし最近、彼女は以前の検索に関連する広告が彼女をオンラインで追跡していることに気付きました。 -This feels so invasive that she does some research on online ads and learns that it's not just advertisers tracking her but also her ISP, analytics companies, social media platforms, and more. +これは非常に侵襲的であるため、彼女はオンライン広告の調査を行い、彼女を追跡している広告主だけでなく、ISP、分析会社、ソーシャルメディアプラットフォームなどでもあることを知ります。 -Aleisha decides she wants to find and use software that doesn't collect her data, doesn't track her, and doesn't tell other services anything private about her. +Aleishaは、自分のデータを収集せず、追跡もせず、他のサービスに彼女についてプライベートなことを伝えないソフトウェアを見つけて使用したいと考えています。 -She goes to a privacy training at a local hackerspace and learns about **Tor Browser**, the only web browser that allows her to browse anonymously. +彼女は近くののハッカースペースでプライバシートレーニングに参加し、匿名で使用できる唯一のWebブラウザ、** Tor Browser **について学びます。 ---

1 0

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit 516e4a8ed22eb23a10253a370d4c6ea1a3280cde Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 02:52:37 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-ja.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tor-outreach2019-2020-ja.md b/tor-outreach2019-2020-ja.md index 0cb403965..b0fb2f71f 100644 --- a/tor-outreach2019-2020-ja.md +++ b/tor-outreach2019-2020-ja.md @@ -1,12 +1,12 @@ -# Tor Outreach Material 2019-2020 +# Tor Outreach資料2019-2020 -# 1. TOR FOR PRIVACY +# 1.プライバシーのためのTor -### Privacy is a human right +### プライバシーは人権です -Like many of us, Aleisha spends most of her time online--connecting with friends, posting on social media, and browsing the web. +私たちの多くと同様に、Aleishaはほとんどの時間をオンラインで過ごしています。友人と連絡、ソーシャルメディアへの投稿、Webの閲覧です。 -But lately, she's noticed that advertisements related to her previous searches are following her around online. +しかし最近、彼女は以前の検索に関連する広告が彼女をオンラインで追跡していることに気付きました。 This feels so invasive that she does some research on online ads and learns that it's not just advertisers tracking her but also her ISP, analytics companies, social media platforms, and more. @@ -143,20 +143,20 @@ We need your help to make Tor more usable and secure for people everywhere. You can volunteer with Tor by writing code, running a relay, creating documentation, offering user support, or telling people in your community about Tor. -The Tor community is governed by a code of conduct, and we outline our set of promises to the community in our social contract. +Torコミュニティは行動規範によって管理されており、社会契約でコミュニティに対する一連の約束をまとめています。 -Learn more about Tor by visiting our website, our wiki, finding us on IRC, joining one of our mailing lists, or signing up for Tor News at newsletter.torproject.org. +Torの詳細については、私たちのWebサイト、またはWikiをご覧になるか、IRCで検索、メーリングリストへの参加、またはnewsletter.torproject.orgでのTorニュースへのサインアップしてください。 -## 8. Download Tor +## 8. Torをダウンロード -Tor for Desktop +デスクトップ用Tor torproject.org/download -TOR ON MOBILE +モバイル上のTor ### Android -Tor Browser for Android is available from GooglePlay. +Android用Torブラウザは、GooglePlayから入手できます。 ### iOS -Onion Browser, developed by M. Tigas, is the only browser we recommend for iOS. +M. Tigasが開発したOnion Browserは、iOSに推奨される唯一のブラウザーです。

1 0

[translation/torbutton-browseronboardingproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties_completed
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit fc80003709f72295bafb7e9235f53b54f30f873f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 02:51:50 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- ja/browserOnboarding.properties | 106 ++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/ja/browserOnboarding.properties b/ja/browserOnboarding.properties index 2044835c9..2cfe67e07 100644 --- a/ja/browserOnboarding.properties +++ b/ja/browserOnboarding.properties @@ -2,70 +2,70 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=ようこそ -onboarding.tour-tor-welcome.title=準備が整いました。 -onboarding.tour-tor-welcome.description=Tor Browser は、ウェブブラウジング中に、最高水準のプライバシーとセキュリティを提供します。あなたは現在、トラッキング、監視、および検閲から保護されています。このクイックのオンボードは方法を提示します。 -onboarding.tour-tor-welcome.next-button=プライバシー設定へ +# onboarding.tour-tor-welcome=Welcome +# onboarding.tour-tor-welcome.title=You’re ready. +# onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. +# onboarding.tour-tor-welcome.next-button=Go to Privacy -onboarding.tour-tor-privacy=プライバシー -onboarding.tour-tor-privacy.title=トラッカーとスヌーパーを追い払う。 -onboarding.tour-tor-privacy.description=Tor Browser は、Cookie を分離し、セッション後にブラウザの履歴を削除します。これらの変更により、あなたのプライバシーとセキュリティがブラウザによって保護されます。ネットワークレベルでの保護方法については、「Tor ネットワーク」をクリックしてください。 -onboarding.tour-tor-privacy.button=Tor ネットワークへ +# onboarding.tour-tor-privacy=Privacy +# onboarding.tour-tor-privacy.title=Snub trackers and snoopers. +# onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. +# onboarding.tour-tor-privacy.button=Go to Tor Network -onboarding.tour-tor-network=Tor ネットワーク -onboarding.tour-tor-network.title=分散型ネットワークを旅する。 -onboarding.tour-tor-network.description=Tor Browser は、世界中の何千人ものボランティアによって運営されている Tor ネットワークにあなたを接続します。 VPN とは異なり、インターネットをプライベートに楽しむために信頼する必要があるのは、1つの障害点や1つの存在ではありません。 -onboarding.tour-tor-network.button=サーキットディスプレイへ +# onboarding.tour-tor-network=Tor Network +# onboarding.tour-tor-network.title=Travel a decentralized network. +# onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. +# onboarding.tour-tor-network.button=Go to Circuit Display -onboarding.tour-tor-circuit-display=サーキットディスプレイ -onboarding.tour-tor-circuit-display.title=あなたのパスを見る。 -onboarding.tour-tor-circuit-display.description=アクセスするドメインごとに、トラフィックは世界中の3つの Tor リレー間のサーキットで中継および暗号化されます。あなたがどこから接続しているかをウェブサイトは知りません。サーキットディスプレイで「このサイトに新しいサーキットを使用する」をクリックすると、新しいサーキットをリクエストすることができます。 -onboarding.tour-tor-circuit-display.button=私のパスを見る -onboarding.tour-tor-circuit-display.next-button=セキュリティへ +# onboarding.tour-tor-circuit-display=Circuit Display +# onboarding.tour-tor-circuit-display.title=See your path. +# onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +# onboarding.tour-tor-circuit-display.button=See My Path +# onboarding.tour-tor-circuit-display.next-button=Go to Security -onboarding.tour-tor-security=セキュリティ -onboarding.tour-tor-security.title=あなたの体験を選択する。 -onboarding.tour-tor-security.description=また、ブラウザのセキュリティを強化するための追加設定も提供しています。私たちのセキュリティ設定では、コンピュータの攻撃に使用される可能性のある要素をブロックすることができます。以下をクリックして、さまざまな設定の機能を確認してください -onboarding.tour-tor-security.description-suffix=お知らせ：デフォルト設定では、NoScriptとHTTPS Everywhereはツールバーに表示されていませんが、カスタマイズによって追加することができます。 -onboarding.tour-tor-security-level.button=セキュリティレベルを表示する -onboarding.tour-tor-security-level.next-button=体験のヒントへ +# onboarding.tour-tor-security=Security +# onboarding.tour-tor-security.title=Choose your experience. +# onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. +# onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. +# onboarding.tour-tor-security-level.button=See Your Security Level +# onboarding.tour-tor-security-level.next-button=Go to Experience Tips -onboarding.tour-tor-expect-differences=体験のヒント。 -onboarding.tour-tor-expect-differences.title=いくつかの違いを理解する。 -onboarding.tour-tor-expect-differences.description=Tor によって提供されるすべてのセキュリティとプライバシー機能を使用すると、インターネットをブラウジングした時の、あなたの体験は少し変化する場合があります。読み込みは少し遅くなるかもしれないし、あなたのセキュリティレベルによっては、いくつかの要素が動作しないか、読み込まれないかもしれません。また、あなたはロボットではなく、人間であることを証明するように求められることがあるかもしれません。 -onboarding.tour-tor-expect-differences.button=よくある質問を見る -onboarding.tour-tor-expect-differences.next-button=オニオンサービスへ +# onboarding.tour-tor-expect-differences=Experience Tips +# onboarding.tour-tor-expect-differences.title=Expect some differences. +# onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. +# onboarding.tour-tor-expect-differences.button=See FAQs +# onboarding.tour-tor-expect-differences.next-button=Go to Onion Services -onboarding.tour-tor-onion-services=Onion サービス -onboarding.tour-tor-onion-services.title=更なる保護。 -onboarding.tour-tor-onion-services.description=Onion サービスは、検閲に対する追加のセーフガードを含む、提供者と訪問者への余分な保護を提供する .onion で終わるサイトです。Onion サービスでは、誰でもコンテンツやサービスを匿名で提供できます。下のボタンから DuckDuckGo Onion サイトにアクセスしてみてください。 -onboarding.tour-tor-onion-services.button=Onion サイトを訪問 -onboarding.tour-tor-onion-services.next-button=完了しました +# onboarding.tour-tor-onion-services=Onion Services +# onboarding.tour-tor-onion-services.title=Be extra protected. +# onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. +# onboarding.tour-tor-onion-services.button=Visit an Onion +# onboarding.tour-tor-onion-services.next-button=Done -onboarding.overlay-icon-tooltip-updated2=最新情報\n%S に -onboarding.tour-tor-update.prefix-new=新規 -onboarding.tour-tor-update.prefix-updated=更新しました +# onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S +# onboarding.tour-tor-update.prefix-new=New +# onboarding.tour-tor-update.prefix-updated=Updated -onboarding.tour-tor-toolbar=ツールバー -onboarding.tour-tor-toolbar-update-8.5.title=ツールバーレイアウト -onboarding.tour-tor-toolbar-update-8.5.description=ブラウザーツールバーレイアウトを改善しました。Torbuttonアイコンをアドレスバーの右に動いた、そしてその隣にセキュリティレベルアイコンも追加しました。 -onboarding.tour-tor-toolbar-update-8.5.next-button=セキュリティへ +# onboarding.tour-tor-toolbar=Toolbar +# onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout +# onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser toolbar layout. We moved the Torbutton icon after the URL bar, and we added a security level icon next to it. +# onboarding.tour-tor-toolbar-update-8.5.next-button=Go to Security -onboarding.tour-tor-security-update-8.5.title=セキュリティレベル体験 -onboarding.tour-tor-security-update-8.5.description=表示されるセキュリティレベル情報そして設定インターフェイスは改善されました。セキュリティスライダーを今のレベルを常に表示するツールバーアイコンに変更しました。クリックするとレベルについての詳細は表示され、あるいはセキュリティ設定を変更する。 +# onboarding.tour-tor-security-update-8.5.title=Security level experience +# onboarding.tour-tor-security-update-8.5.description=We improved how you see and set your security level. We replaced the security slider with a toolbar icon that makes your current level visible at all times. Click it to view details about your current level or to change your security settings. # Circuit Display onboarding. -onboarding.tor-circuit-display.next=次へ -onboarding.tor-circuit-display.done=完了しました -onboarding.tor-circuit-display.one-of-three=3の1 -onboarding.tor-circuit-display.two-of-three=3の2 -onboarding.tor-circuit-display.three-of-three=3の3 +# onboarding.tor-circuit-display.next=Next +# onboarding.tor-circuit-display.done=Done +# onboarding.tor-circuit-display.one-of-three=1 of 3 +# onboarding.tor-circuit-display.two-of-three=2 of 3 +# onboarding.tor-circuit-display.three-of-three=3 of 3 -onboarding.tor-circuit-display.intro.title=サーキットはどのように機能しますか？ -onboarding.tor-circuit-display.intro.msg=サーキットは無作為に割り付けられるリレー、Torトラフィックを送信するように設定される世界中のPC、で構成されます。サーキットはプライベートにネットを閲覧できる、そしてオニオンサービスと接続できるようにします。 +# onboarding.tor-circuit-display.intro.title=How do circuits work? +# onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. -onboarding.tor-circuit-display.diagram.title=サーキットディスプレイ -onboarding.tor-circuit-display.diagram.msg=この図形がこのウェブサイトのサーキットを構成するリレーを表示します。異なるサイトでの活動を相関させれないようにするために、各サイトは別のサーキットを利用します。 +# onboarding.tor-circuit-display.diagram.title=Circuit Display +# onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. -onboarding.tor-circuit-display.new-circuit.title=新しいサーキットが必要ですか? -onboarding.tor-circuit-display.new-circuit.msg=見ようとするサイトに接続できない場合、あるいは正しくロードされない場合、このボタンで新しいサーキットでリロードできます。 +# onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? +# onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.

1 0

[translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit 211be8b8c393abc910d9612fa5fb4c81d0b4ae74 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 02:51:43 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- ja/browserOnboarding.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ja/browserOnboarding.properties b/ja/browserOnboarding.properties index 2044835c9..4f530c435 100644 --- a/ja/browserOnboarding.properties +++ b/ja/browserOnboarding.properties @@ -57,9 +57,9 @@ onboarding.tour-tor-security-update-8.5.description=表示されるセキュリ # Circuit Display onboarding. onboarding.tor-circuit-display.next=次へ onboarding.tor-circuit-display.done=完了しました -onboarding.tor-circuit-display.one-of-three=3の1 -onboarding.tor-circuit-display.two-of-three=3の2 -onboarding.tor-circuit-display.three-of-three=3の3 +onboarding.tor-circuit-display.one-of-three=3のうち1 +onboarding.tor-circuit-display.two-of-three=3のうち2 +onboarding.tor-circuit-display.three-of-three=3のうち3 onboarding.tor-circuit-display.intro.title=サーキットはどのように機能しますか？ onboarding.tor-circuit-display.intro.msg=サーキットは無作為に割り付けられるリレー、Torトラフィックを送信するように設定される世界中のPC、で構成されます。サーキットはプライベートにネットを閲覧できる、そしてオニオンサービスと接続できるようにします。

1 0

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 07 Oct '19

07 Oct '19

commit 3568717376dfc733e0006c39bb502c1a65963e35 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 7 02:51:13 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ja/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/torbutton.dtd b/ja/torbutton.dtd index 1894af5d7..d602f009f 100644 --- a/ja/torbutton.dtd +++ b/ja/torbutton.dtd @@ -1,6 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "新しい識別子"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "このサイト用の新しい Tor サーキット"> +<!ENTITY torbutton.context_menu.new_circuit "このサイトに新しいサーキットを使う"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.networksettings "Tor ネットワークの設定…"> <!ENTITY torbutton.context_menu.networksettings.key "N"> @@ -46,4 +46,4 @@ <!ENTITY torbutton.prefs.sec_restore_defaults "デフォルトにもどす"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "詳細セキュリティ設定…"> <!ENTITY torbutton.circuit_display.title "Tor サーキット"> -<!ENTITY torbutton.circuit_display.new_circuit "このサイトに新しいサーキットを使用する"> +<!ENTITY torbutton.circuit_display.new_circuit "このサイトに新しいサーキットを使う">

1 0

[stem/master] Minor doc header adjustment
by atagar＠torproject.org 07 Oct '19

07 Oct '19

commit 02da8d9769fb5ed5b3cdf898c940951e3c5d4908 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 6 12:56:20 2019 -0700 Minor doc header adjustment --- stem/descriptor/certificate.py | 2 +- stem/descriptor/hidden_service.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/certificate.py b/stem/descriptor/certificate.py index e336bbda..6ba92ee7 100644 --- a/stem/descriptor/certificate.py +++ b/stem/descriptor/certificate.py @@ -200,7 +200,7 @@ class Ed25519CertificateV1(Ed25519Certificate): elif cert_type == 7: raise ValueError('Ed25519 certificate cannot have a type of 7. This is reserved for RSA identity cross-certification.') elif cert_type == 8: - # see rend-spec-v3.txt appendix E for these defintions + # see rend-spec-v3.txt appendix E for these definitions self.type = CertType.HS_V3_DESC_SIGNING elif cert_type == 9: self.type = CertType.HS_V3_INTRO_AUTH diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 601348d9..3277e183 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -21,6 +21,10 @@ These are only available through the Controller's BaseHiddenServiceDescriptor - Common parent for hidden service descriptors |- HiddenServiceDescriptorV2 - Version 2 hidden service descriptor +- HiddenServiceDescriptorV3 - Version 3 hidden service descriptor + +- decrypt - decrypt and parse encrypted layers + + OuterLayer - First encrypted layer of a hidden service v3 descriptor + InnerLayer - Second encrypted layer of a hidden service v3 descriptor .. versionadded:: 1.4.0 """

1 0

[stem/master] Stylistic adjustments
by atagar＠torproject.org 07 Oct '19

07 Oct '19

commit beba313269d087fc569d3a4b1ccc1e98ba6c210d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 6 19:05:38 2019 -0700 Stylistic adjustments Mostly just fixups for pycodestyle... STATIC CHECKS * /home/atagar/Desktop/stem/test/integ/control/controller.py line 1126 - E303 too many blank lines (2) | @test.require.controller line 1151 - use single rather than double quotes | self.assertTrue(addr1.startswith("127."), line 1152 - use single rather than double quotes | "%s did not start with 127."%addr1) line 1152 - E228 missing whitespace around modulo operator | "%s did not start with 127."%addr1) line 1153 - use single rather than double quotes | self.assertEquals(target, "quux") line 1161 - use single rather than double quotes | self.assertTrue(addr2.startswith("[fe"), line 1162 - use single rather than double quotes | "%s did not start with [fe."%addr2) line 1162 - E228 missing whitespace around modulo operator | "%s did not start with [fe."%addr2) line 1163 - use single rather than double quotes | self.assertEquals(target, "quibble") line 1169 - use single rather than double quotes | for line in s.split("\n"): line 1170 - E701 multiple statements on one line (colon) | if not line.strip(): continue line 1171 - E231 missing whitespace after ',' | k,v,timeout = line.split() line 1178 - use single rather than double quotes | self.assertEquals(m["1.2.1.2"], "ifconfig.me") line 1179 - use single rather than double quotes | self.assertEquals(m["1.2.3.4"], "foobar.example.com") line 1180 - use single rather than double quotes | self.assertEquals(m["1.2.3.5"], "barfuzz.example.com") line 1181 - use single rather than double quotes | self.assertEquals(m[addr1], "quux") line 1182 - use single rather than double quotes | self.assertEquals(m[addr2], "quibble") line 1187 - use single rather than double quotes | self.assertEquals(m["1.2.1.2"], "ifconfig.me") line 1188 - use single rather than double quotes | self.assertEquals(m["1.2.3.4"], "foobar.example.com") line 1189 - use single rather than double quotes | self.assertEquals(m["1.2.3.5"], "barfuzz.example.com") line 1190 - use single rather than double quotes | self.assertEquals(m[addr1], "quux") line 1191 - use single rather than double quotes | self.assertEquals(m[addr2], "quibble") line 1197 - use single rather than double quotes | self.assertEquals(m.get("1.2.1.2"), None) line 1198 - use single rather than double quotes | self.assertEquals(m.get("1.2.3.4"), None) --- test/integ/control/controller.py | 66 +++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 3980a318..c7394575 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1122,80 +1122,98 @@ class TestController(unittest.TestCase): ip_addr = response[response.find(b'\r\n\r\n'):].strip() self.assertTrue(stem.util.connection.is_valid_ipv4_address(stem.util.str_tools._to_unicode(ip_addr)), "'%s' isn't an address" % ip_addr) - @test.require.controller def test_mapaddress_offline(self): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: # Try mapping one element, make sure the result is as expected. + map1 = {'1.2.1.2': 'ifconfig.me'} x = controller.map_address(map1) self.assertEqual(x, map1) # Try mapping two elements, make sure the result is as expected. + map2 = {'1.2.3.4': 'foobar.example.com', '1.2.3.5': 'barfuzz.example.com'} + x = controller.map_address(map2) self.assertEqual(x, map2) # Try mapping zero elements, get an error. + self.assertRaises(stem.InvalidRequest, controller.map_address, {}) # Try a virtual mapping to IPv4 + map3 = {'0.0.0.0': 'quux'} x = controller.map_address(map3) self.assertEquals(len(x), 1) - (addr1, target) = list(x.items())[0] + addr1, target = list(x.items())[0] + # The default IPv4 virtualaddressrange is 127.192.0.0/10 - self.assertTrue(addr1.startswith("127."), - "%s did not start with 127."%addr1) - self.assertEquals(target, "quux") + + self.assertTrue(addr1.startswith('127.'), '%s did not start with 127.' % addr1) + self.assertEquals(target, 'quux') # Try a virtual mapping to IPv6 + map4 = {'::': 'quibble'} x = controller.map_address(map4) self.assertEquals(len(x), 1) - (addr2, target) = list(x.items())[0] + addr2, target = list(x.items())[0] + # The default IPv6 virtualaddressrange is FE80::/10 - self.assertTrue(addr2.startswith("[fe"), - "%s did not start with [fe."%addr2) - self.assertEquals(target, "quibble") + + self.assertTrue(addr2.startswith('[fe'), '%s did not start with [fe.' % addr2) + self.assertEquals(target, 'quibble') def parse_mapping_list(s): # Helper function -- parse the response from getinfo address-mappings # into a dict. + result = dict() - for line in s.split("\n"): - if not line.strip(): continue - k,v,timeout = line.split() + + for line in s.split('\n'): + if not line.strip(): + continue + + k, v, timeout = line.split() result[k] = v + return result # Ask for a list of all the address mappings we've added. + x = controller.get_info(['address-mappings/control']) m = parse_mapping_list(x['address-mappings/control']) - self.assertEquals(m["1.2.1.2"], "ifconfig.me") - self.assertEquals(m["1.2.3.4"], "foobar.example.com") - self.assertEquals(m["1.2.3.5"], "barfuzz.example.com") - self.assertEquals(m[addr1], "quux") - self.assertEquals(m[addr2], "quibble") + + self.assertEquals(m['1.2.1.2'], 'ifconfig.me') + self.assertEquals(m['1.2.3.4'], 'foobar.example.com') + self.assertEquals(m['1.2.3.5'], 'barfuzz.example.com') + self.assertEquals(m[addr1], 'quux') + self.assertEquals(m[addr2], 'quibble') # Ask for a list of all the address mappings. + x = controller.get_info(['address-mappings/all']) m = parse_mapping_list(x['address-mappings/all']) - self.assertEquals(m["1.2.1.2"], "ifconfig.me") - self.assertEquals(m["1.2.3.4"], "foobar.example.com") - self.assertEquals(m["1.2.3.5"], "barfuzz.example.com") - self.assertEquals(m[addr1], "quux") - self.assertEquals(m[addr2], "quibble") + + self.assertEquals(m['1.2.1.2'], 'ifconfig.me') + self.assertEquals(m['1.2.3.4'], 'foobar.example.com') + self.assertEquals(m['1.2.3.5'], 'barfuzz.example.com') + self.assertEquals(m[addr1], 'quux') + self.assertEquals(m[addr2], 'quibble') # Now ask for a list of only the mappings configured with the # configuration. Ours should not be there. + x = controller.get_info(['address-mappings/config']) m = parse_mapping_list(x['address-mappings/config']) - self.assertEquals(m.get("1.2.1.2"), None) - self.assertEquals(m.get("1.2.3.4"), None) + + self.assertEquals(m.get('1.2.1.2'), None) + self.assertEquals(m.get('1.2.3.4'), None) self.assertEquals(m.get(addr1), None) self.assertEquals(m.get(addr2), None)

1 0

[stem/master] Simplify test helper and assertions
by atagar＠torproject.org 07 Oct '19

07 Oct '19

commit 751d9e9b1c8e4eb305951e411137d89ba35a2328 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 6 19:33:50 2019 -0700 Simplify test helper and assertions --- test/integ/control/controller.py | 69 +++++++++++++++------------------------- 1 file changed, 26 insertions(+), 43 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index c7394575..bcfc4606 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1127,13 +1127,13 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - # Try mapping one element, make sure the result is as expected. + # try mapping one element, ensuring results are as expected map1 = {'1.2.1.2': 'ifconfig.me'} x = controller.map_address(map1) self.assertEqual(x, map1) - # Try mapping two elements, make sure the result is as expected. + # try mapping two elements, ensuring results are as expected map2 = {'1.2.3.4': 'foobar.example.com', '1.2.3.5': 'barfuzz.example.com'} @@ -1141,81 +1141,64 @@ class TestController(unittest.TestCase): x = controller.map_address(map2) self.assertEqual(x, map2) - # Try mapping zero elements, get an error. + # try mapping zero elements self.assertRaises(stem.InvalidRequest, controller.map_address, {}) - # Try a virtual mapping to IPv4 + # try a virtual mapping to IPv4, the default virtualaddressrange is 127.192.0.0/10 map3 = {'0.0.0.0': 'quux'} x = controller.map_address(map3) self.assertEquals(len(x), 1) addr1, target = list(x.items())[0] - # The default IPv4 virtualaddressrange is 127.192.0.0/10 - self.assertTrue(addr1.startswith('127.'), '%s did not start with 127.' % addr1) self.assertEquals(target, 'quux') - # Try a virtual mapping to IPv6 + # try a virtual mapping to IPv6, the default IPv6 virtualaddressrange is FE80::/10 map4 = {'::': 'quibble'} x = controller.map_address(map4) self.assertEquals(len(x), 1) addr2, target = list(x.items())[0] - # The default IPv6 virtualaddressrange is FE80::/10 - self.assertTrue(addr2.startswith('[fe'), '%s did not start with [fe.' % addr2) self.assertEquals(target, 'quibble') - def parse_mapping_list(s): - # Helper function -- parse the response from getinfo address-mappings - # into a dict. - - result = dict() - - for line in s.split('\n'): - if not line.strip(): - continue + def address_mappings(addr_type): + response = controller.get_info(['address-mappings/%s' % addr_type]) + result = {} + for line in response['address-mappings/%s' % addr_type].splitlines(): k, v, timeout = line.split() result[k] = v return result - # Ask for a list of all the address mappings we've added. + # ask for a list of all the address mappings we've added - x = controller.get_info(['address-mappings/control']) - m = parse_mapping_list(x['address-mappings/control']) + self.assertEquals({ + '1.2.1.2': 'ifconfig.me', + '1.2.3.4': 'foobar.example.com', + '1.2.3.5': 'barfuzz.example.com', + addr1: 'quux', + addr2: 'quibble', + }, address_mappings('control')) - self.assertEquals(m['1.2.1.2'], 'ifconfig.me') - self.assertEquals(m['1.2.3.4'], 'foobar.example.com') - self.assertEquals(m['1.2.3.5'], 'barfuzz.example.com') - self.assertEquals(m[addr1], 'quux') - self.assertEquals(m[addr2], 'quibble') + # ask for a list of all the address mappings - # Ask for a list of all the address mappings. - - x = controller.get_info(['address-mappings/all']) - m = parse_mapping_list(x['address-mappings/all']) - - self.assertEquals(m['1.2.1.2'], 'ifconfig.me') - self.assertEquals(m['1.2.3.4'], 'foobar.example.com') - self.assertEquals(m['1.2.3.5'], 'barfuzz.example.com') - self.assertEquals(m[addr1], 'quux') - self.assertEquals(m[addr2], 'quibble') + self.assertEquals({ + '1.2.1.2': 'ifconfig.me', + '1.2.3.4': 'foobar.example.com', + '1.2.3.5': 'barfuzz.example.com', + addr1: 'quux', + addr2: 'quibble', + }, address_mappings('all')) # Now ask for a list of only the mappings configured with the # configuration. Ours should not be there. - x = controller.get_info(['address-mappings/config']) - m = parse_mapping_list(x['address-mappings/config']) - - self.assertEquals(m.get('1.2.1.2'), None) - self.assertEquals(m.get('1.2.3.4'), None) - self.assertEquals(m.get(addr1), None) - self.assertEquals(m.get(addr2), None) + self.assertEquals({}, address_mappings('config')) @test.require.controller @test.require.online

1 0

[stem/master] test_mapaddress_offline: make it work with python3.
by atagar＠torproject.org 07 Oct '19

07 Oct '19

commit fd7737b4cd43cfaf540ab7da2a34c48bc2623ed8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 20:18:06 2019 -0400 test_mapaddress_offline: make it work with python3. --- test/integ/control/controller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index a1d0655b..3980a318 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1146,7 +1146,7 @@ class TestController(unittest.TestCase): map3 = {'0.0.0.0': 'quux'} x = controller.map_address(map3) self.assertEquals(len(x), 1) - (addr1, target) = x.items()[0] + (addr1, target) = list(x.items())[0] # The default IPv4 virtualaddressrange is 127.192.0.0/10 self.assertTrue(addr1.startswith("127."), "%s did not start with 127."%addr1) @@ -1156,7 +1156,7 @@ class TestController(unittest.TestCase): map4 = {'::': 'quibble'} x = controller.map_address(map4) self.assertEquals(len(x), 1) - (addr2, target) = x.items()[0] + (addr2, target) = list(x.items())[0] # The default IPv6 virtualaddressrange is FE80::/10 self.assertTrue(addr2.startswith("[fe"), "%s did not start with [fe."%addr2)

1 0

[stem/master] Add an offline test for mapaddress.
by atagar＠torproject.org 07 Oct '19

07 Oct '19

commit 4ec8b7c9303148149b3af8a52f0ef63383b30708 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 20:11:31 2019 -0400 Add an offline test for mapaddress. --- test/integ/control/controller.py | 77 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index ef90de80..a1d0655b 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1122,6 +1122,83 @@ class TestController(unittest.TestCase): ip_addr = response[response.find(b'\r\n\r\n'):].strip() self.assertTrue(stem.util.connection.is_valid_ipv4_address(stem.util.str_tools._to_unicode(ip_addr)), "'%s' isn't an address" % ip_addr) + + @test.require.controller + def test_mapaddress_offline(self): + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + # Try mapping one element, make sure the result is as expected. + map1 = {'1.2.1.2': 'ifconfig.me'} + x = controller.map_address(map1) + self.assertEqual(x, map1) + + # Try mapping two elements, make sure the result is as expected. + map2 = {'1.2.3.4': 'foobar.example.com', + '1.2.3.5': 'barfuzz.example.com'} + x = controller.map_address(map2) + self.assertEqual(x, map2) + + # Try mapping zero elements, get an error. + self.assertRaises(stem.InvalidRequest, controller.map_address, {}) + + # Try a virtual mapping to IPv4 + map3 = {'0.0.0.0': 'quux'} + x = controller.map_address(map3) + self.assertEquals(len(x), 1) + (addr1, target) = x.items()[0] + # The default IPv4 virtualaddressrange is 127.192.0.0/10 + self.assertTrue(addr1.startswith("127."), + "%s did not start with 127."%addr1) + self.assertEquals(target, "quux") + + # Try a virtual mapping to IPv6 + map4 = {'::': 'quibble'} + x = controller.map_address(map4) + self.assertEquals(len(x), 1) + (addr2, target) = x.items()[0] + # The default IPv6 virtualaddressrange is FE80::/10 + self.assertTrue(addr2.startswith("[fe"), + "%s did not start with [fe."%addr2) + self.assertEquals(target, "quibble") + + def parse_mapping_list(s): + # Helper function -- parse the response from getinfo address-mappings + # into a dict. + result = dict() + for line in s.split("\n"): + if not line.strip(): continue + k,v,timeout = line.split() + result[k] = v + return result + + # Ask for a list of all the address mappings we've added. + x = controller.get_info(['address-mappings/control']) + m = parse_mapping_list(x['address-mappings/control']) + self.assertEquals(m["1.2.1.2"], "ifconfig.me") + self.assertEquals(m["1.2.3.4"], "foobar.example.com") + self.assertEquals(m["1.2.3.5"], "barfuzz.example.com") + self.assertEquals(m[addr1], "quux") + self.assertEquals(m[addr2], "quibble") + + # Ask for a list of all the address mappings. + x = controller.get_info(['address-mappings/all']) + m = parse_mapping_list(x['address-mappings/all']) + self.assertEquals(m["1.2.1.2"], "ifconfig.me") + self.assertEquals(m["1.2.3.4"], "foobar.example.com") + self.assertEquals(m["1.2.3.5"], "barfuzz.example.com") + self.assertEquals(m[addr1], "quux") + self.assertEquals(m[addr2], "quibble") + + # Now ask for a list of only the mappings configured with the + # configuration. Ours should not be there. + x = controller.get_info(['address-mappings/config']) + m = parse_mapping_list(x['address-mappings/config']) + self.assertEquals(m.get("1.2.1.2"), None) + self.assertEquals(m.get("1.2.3.4"), None) + self.assertEquals(m.get(addr1), None) + self.assertEquals(m.get(addr2), None) + @test.require.controller @test.require.online @test.require.version(Requirement.MICRODESCRIPTOR_IS_DEFAULT)

1 0