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

[tpo/staging] easier to localize
by emmapeel＠torproject.org 06 Mar '19

06 Mar '19

commit 0edb2a7602f9589bd16cd63c221bd5ce3f127389 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 2 02:05:22 2019 +0100 easier to localize --- templates/footer.html | 2 +- templates/macros/downloads.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index 364e704..af22b33 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -53,7 +53,7 @@ <div class="col-12 d-flex justify-content-center"> <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> {% from "macros/footer.html" import render_faq %} - <p class="text-primary text-light">{{ _('Trademark, copyright notices, and rules for use by third parties can be found in our %s')|format(render_faq())|safe }}.</p> + <p class="text-primary text-light">{{ _('Trademark, copyright notices, and rules for use by third parties can be found in our %(link_to_faq)s')|format(link_to_faq=render_faq())|safe }}.</p> </div> <div class="col-sm-2 mt-5 d-none d-sm-block"> <div class="btn-group dropdown float-right"> diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index 2ceaef2..a080cf2 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -44,5 +44,5 @@ {% endmacro %} {% macro render_tor_browser_manual() %} - <a class="mx-auto" href="https://tb-manual.torproject.org" target="_blank"><u>tor browser manual</u></a> +<a class="mx-auto" href="https://tb-manual.torproject.org" target="_blank"><u>{{ _('tor browser manual') }}</u></a> {% endmacro %}

1 0

[tpo/staging] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging
by emmapeel＠torproject.org 06 Mar '19

06 Mar '19

commit e8d695e9b91a459e3bfba4f90cb292e8ede63cff Merge: 0edb2a7 c8ccd63 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 2 02:51:03 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging .gitignore | 3 ++ assets/scss/_tor.scss | 2 +- assets/scss/_tpo.scss | 9 +++++- assets/static/bootstrap.css | 8 ++++- assets/static/bootstrap.css.map | 2 +- content/about/history/contents.lr | 35 +++++++++++----------- content/projects/contents.lr | 5 ++++ .../torbrowser/RecommendedTBBVersions/contents.lr | 16 ++++++++++ content/projects/torbrowser/contents.lr | 5 ++++ databags/versions.ini | 8 ++--- models/text.ini | 7 +++++ templates/empty.html | 7 ++--- templates/footer.html | 5 ++-- templates/home.html | 4 +-- templates/navbar.html | 2 +- 15 files changed, 83 insertions(+), 35 deletions(-)

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 05 Mar '19

05 Mar '19

commit b789986609e9617c536b53d03d3a41dd9e1e464c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 5 23:54:11 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/ka/LC_MESSAGES/messages.po | 57 ++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/locale/ka/LC_MESSAGES/messages.po b/locale/ka/LC_MESSAGES/messages.po index dcd96fed1..0779fd214 100644 --- a/locale/ka/LC_MESSAGES/messages.po +++ b/locale/ka/LC_MESSAGES/messages.po @@ -192,7 +192,8 @@ msgstr "მხარი დაუჭირეთ Tor-პროექტს დ #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:647 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:48 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:71 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:641 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:516 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:654 msgid "Tor: Strength in Numbers" msgstr "Tor: სიძლიერე ციფრებშია" @@ -481,7 +482,7 @@ msgstr "CVC" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:441 #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:493 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:435 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:487 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:500 msgid "Choose your size and fit." msgstr "შეარჩიეთ თქვენი ზომა და შეკერვის სახე" @@ -507,22 +508,21 @@ msgid "Donating:" msgstr "შემოწირულობა:" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:483 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:477 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:478 msgid "Donate" msgstr "გაიღეთ შემოწირულობა" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:497 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:491 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:504 msgid "T-Shirt" msgstr "მაისური" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:501 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:495 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:508 msgid "Choose your size and fit for each shirt." msgstr "შეარჩიეთ თქვენი ზომები თითოეული პერანგისთვის" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:505 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:499 msgid "" "Tor at the Heart of Internet, Powering Digital Resistance or Open " "Observvatory of Network Interference (OONI) T-Shirt" @@ -531,71 +531,70 @@ msgstr "" "Observvatory of Network Interference (OONI) მაისური" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:509 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:503 msgid "Strength in Numbers T-Shirt" msgstr "სიძლიერე ციფრებშია მაისური" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:513 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:507 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:520 msgid "Choose your size." msgstr "მიუთითეთ თქვენი ზომა." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:517 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:511 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:524 msgid "Sweatshirt" msgstr "მოსაცმელი" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:521 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:515 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:528 msgid "A required field is missing from the form." msgstr "აუცილებელი ველები შესავსებია." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:523 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:517 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:530 msgid "Please reload the page and try again." msgstr "გთხოვთ ხელახლა გახსნათ გვერდი კვლავ სცადოთ." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:527 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:521 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:534 msgid "There was a problem submitting your request to the server:<br>" msgstr "ხარვეზი წარმოიქმნა მოთხოვნის სერვერზე გადაგზავნისას: <br>" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:531 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:525 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:538 msgid "validation failed" msgstr "დამოწმება ვერ მოხერხდა" #. notes: __field_name__ will be replaced with the field name in the #. javascript. #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:537 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:531 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:544 msgid "__field_name__ must be filled out." msgstr "__ველის_სახელი__ უნდა შეივსოს." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:542 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:536 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:549 msgid "This field is required" msgstr "ველი აუცილებელია" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:546 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:540 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:553 msgid "Invalid email address." msgstr "არამართებული ელფოსტა." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:550 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:544 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:557 msgid "per month" msgstr "ყოველთვიურად" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:564 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:558 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:571 msgid "One moment while we shovel coal into our servers." msgstr "გთხოვთ მოითმინოთ, სანამ საწვავს მივაწვდით ჩვენს სერვერებს." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:654 #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:662 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:648 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:656 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:661 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:669 msgid "" "Stand up for the universal human rights to privacy and freedom and help keep" " Tor robust and secure." @@ -605,7 +604,7 @@ msgstr "" "განმტკიცებაში." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:656 -#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:650 +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:663 msgid "Mozilla will match your gift and double your impact." msgstr "Mozilla გაიღებს ზუსტად იმავე თანხას და გააორმაგებს თქვენს წვლილს." @@ -2056,3 +2055,19 @@ msgstr "XL" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:90 msgid "XXL" msgstr "XXL" + +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:488 +msgid "Gift Selected" +msgstr "საჩუქარი შერჩეულია" + +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:492 +msgid "No Gift Selected" +msgstr "საჩუქარი არაა შერჩეული" + +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:496 +msgid "Sticker Pack" +msgstr "მისაწეპებლების ნაკრები" + +#: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:512 +msgid "T-Shirt Pack" +msgstr "მაისურების ნაკრები"

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 05 Mar '19

05 Mar '19

commit 5ed2c612a73e9e956841099cee9d641c6d048a5f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 5 23:45:27 2019 +0000 Update translations for donatepages-messagespot --- locale/ka/LC_MESSAGES/messages.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/ka/LC_MESSAGES/messages.po b/locale/ka/LC_MESSAGES/messages.po index ee1044bf7..0779fd214 100644 --- a/locale/ka/LC_MESSAGES/messages.po +++ b/locale/ka/LC_MESSAGES/messages.po @@ -2058,16 +2058,16 @@ msgstr "XXL" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:488 msgid "Gift Selected" -msgstr "" +msgstr "საჩუქარი შერჩეულია" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:492 msgid "No Gift Selected" -msgstr "" +msgstr "საჩუქარი არაა შერჩეული" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:496 msgid "Sticker Pack" -msgstr "" +msgstr "მისაწეპებლების ნაკრები" #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:512 msgid "T-Shirt Pack" -msgstr "" +msgstr "მაისურების ნაკრები"

1 0

[goptlib/master] Check for error of SetDeadline in DialOr.
by dcf＠torproject.org 05 Mar '19

05 Mar '19

commit 8af304d1828d2c735c612c1d338bc6ac4b0f40c8 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 5 14:05:10 2019 -0700 Check for error of SetDeadline in DialOr. https://bugs.torproject.org/15826 --- pt.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pt.go b/pt.go index cc0ed8c..c2895b8 100644 --- a/pt.go +++ b/pt.go @@ -932,7 +932,11 @@ func DialOr(info *ServerInfo, addr, methodName string) (*net.TCPConn, error) { if err != nil { return nil, err } - s.SetDeadline(time.Now().Add(5 * time.Second)) + err = s.SetDeadline(time.Now().Add(5 * time.Second)) + if err != nil { + s.Close() + return nil, err + } err = extOrPortAuthenticate(s, info) if err != nil { s.Close() @@ -943,7 +947,11 @@ func DialOr(info *ServerInfo, addr, methodName string) (*net.TCPConn, error) { s.Close() return nil, err } - s.SetDeadline(time.Time{}) + err = s.SetDeadline(time.Time{}) + if err != nil { + s.Close() + return nil, err + } return s, nil }

1 0

[goptlib/master] Refactor extOrPortSetup in DialOr.
by dcf＠torproject.org 05 Mar '19

05 Mar '19

commit ff3defd597a05fa1cf123ed518a224bc049d84be Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 5 14:14:19 2019 -0700 Refactor extOrPortSetup in DialOr. --- pt.go | 40 +++++++++++++++++++++++----------------- pt_test.go | 24 ++++++++++++------------ 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/pt.go b/pt.go index c2895b8..95695ac 100644 --- a/pt.go +++ b/pt.go @@ -883,7 +883,7 @@ func extOrPortRecvCommand(s io.Reader) (cmd uint16, body []byte, err error) { // OKAY or DENY response command from the server. If addr or methodName is "", // the corresponding command is not sent. Returns nil if and only if OKAY is // received. -func extOrPortSetup(s io.ReadWriter, addr, methodName string) error { +func extOrPortSetMetadata(s io.ReadWriter, addr, methodName string) error { var err error if addr != "" { @@ -915,6 +915,27 @@ func extOrPortSetup(s io.ReadWriter, addr, methodName string) error { return nil } +func extOrPortSetup(s net.Conn, timeout time.Duration, + info *ServerInfo, addr, methodName string) error { + err := s.SetDeadline(time.Now().Add(5 * time.Second)) + if err != nil { + return err + } + err = extOrPortAuthenticate(s, info) + if err != nil { + return err + } + err = extOrPortSetMetadata(s, addr, methodName) + if err != nil { + return err + } + err = s.SetDeadline(time.Time{}) + if err != nil { + return err + } + return nil +} + // Dial info.ExtendedOrAddr if defined, or else info.OrAddr, and return an open // *net.TCPConn. If connecting to the extended OR port, extended OR port // authentication à la 217-ext-orport-auth.txt is done before returning; an @@ -932,22 +953,7 @@ func DialOr(info *ServerInfo, addr, methodName string) (*net.TCPConn, error) { if err != nil { return nil, err } - err = s.SetDeadline(time.Now().Add(5 * time.Second)) - if err != nil { - s.Close() - return nil, err - } - err = extOrPortAuthenticate(s, info) - if err != nil { - s.Close() - return nil, err - } - err = extOrPortSetup(s, addr, methodName) - if err != nil { - s.Close() - return nil, err - } - err = s.SetDeadline(time.Time{}) + err = extOrPortSetup(s, 5*time.Second, info, addr, methodName) if err != nil { s.Close() return nil, err diff --git a/pt_test.go b/pt_test.go index f9f4790..ce26b16 100644 --- a/pt_test.go +++ b/pt_test.go @@ -704,28 +704,28 @@ func TestExtOrPortRecvCommand(t *testing.T) { } } -// set up so that extOrPortSetup can write to one buffer and read from another. -type mockSetupBuf struct { +// set up so that extOrPortSetMetadata can write to one buffer and read from another. +type mockSetMetadataBuf struct { bytes.Buffer ReadBuf bytes.Buffer } -func (buf *mockSetupBuf) Read(p []byte) (int, error) { +func (buf *mockSetMetadataBuf) Read(p []byte) (int, error) { n, err := buf.ReadBuf.Read(p) return n, err } -func testExtOrPortSetupIndividual(t *testing.T, addr, methodName string) { +func testExtOrPortSetMetadataIndividual(t *testing.T, addr, methodName string) { var err error - var buf mockSetupBuf + var buf mockSetMetadataBuf // fake an OKAY response. err = extOrPortSendCommand(&buf.ReadBuf, extOrCmdOkay, []byte{}) if err != nil { t.Fatal(err) } - err = extOrPortSetup(&buf, addr, methodName) + err = extOrPortSetMetadata(&buf, addr, methodName) if err != nil { - t.Fatalf("error in extOrPortSetup: %s", err) + t.Fatalf("error in extOrPortSetMetadata: %s", err) } for { cmd, body, err := extOrPortRecvCommand(&buf.Buffer) @@ -751,13 +751,13 @@ func testExtOrPortSetupIndividual(t *testing.T, addr, methodName string) { } } -func TestExtOrPortSetup(t *testing.T) { +func TestExtOrPortSetMetadata(t *testing.T) { const addr = "127.0.0.1:40000" const methodName = "alpha" - testExtOrPortSetupIndividual(t, "", "") - testExtOrPortSetupIndividual(t, addr, "") - testExtOrPortSetupIndividual(t, "", methodName) - testExtOrPortSetupIndividual(t, addr, methodName) + testExtOrPortSetMetadataIndividual(t, "", "") + testExtOrPortSetMetadataIndividual(t, addr, "") + testExtOrPortSetMetadataIndividual(t, "", methodName) + testExtOrPortSetMetadataIndividual(t, addr, methodName) } func TestMakeStateDir(t *testing.T) {

1 0

[goptlib/master] Test for failure of SetDeadline in extOrPortSetup.
by dcf＠torproject.org 05 Mar '19

05 Mar '19

commit c538911ed6f8fe50a268505a88561999e98d8566 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 5 16:05:24 2019 -0700 Test for failure of SetDeadline in extOrPortSetup. --- pt_test.go | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test_authcookie | 2 + 2 files changed, 141 insertions(+) diff --git a/pt_test.go b/pt_test.go index 15907ef..70f5533 100644 --- a/pt_test.go +++ b/pt_test.go @@ -11,8 +11,11 @@ import ( "path" "sort" "testing" + "time" ) +const testAuthCookiePath = "test_authcookie" + func TestErrors(t *testing.T) { Stdout = ioutil.Discard @@ -763,6 +766,142 @@ func TestExtOrPortSetMetadata(t *testing.T) { testExtOrPortSetMetadataIndividual(t, addr, methodName) } +func simulateServerExtOrPortAuth(r io.Reader, w io.Writer, authCookie []byte) error { + // send auth types + _, err := w.Write([]byte{1, 0}) + if err != nil { + return err + } + // read client auth type + buf := make([]byte, 1) + _, err = io.ReadFull(r, buf) + if err != nil { + return err + } + if buf[0] != 1 { + return fmt.Errorf("didn't get client auth type 1") + } + // read client nonce + clientNonce := make([]byte, 32) + _, err = io.ReadFull(r, clientNonce) + if err != nil { + return err + } + // send server hash and nonce + serverNonce := make([]byte, 32) + serverHash := computeServerHash(authCookie, clientNonce, serverNonce) + _, err = w.Write(serverHash) + if err != nil { + return err + } + _, err = w.Write(serverNonce) + if err != nil { + return err + } + // read client hash + clientHash := make([]byte, 32) + _, err = io.ReadFull(r, clientHash) + if err != nil { + return err + } + // send success status + _, err = w.Write([]byte{1}) + if err != nil { + return err + } + return nil +} + +type failSetDeadlineAfter struct { + n int + err error +} + +func (c *failSetDeadlineAfter) try() error { + if c.n > 0 { + c.n-- + return nil + } + return c.err +} + +func (c *failSetDeadlineAfter) SetDeadline(_ time.Time) error { + return c.try() +} + +func (c *failSetDeadlineAfter) SetReadDeadline(_ time.Time) error { + return c.try() +} + +func (c *failSetDeadlineAfter) SetWriteDeadline(_ time.Time) error { + return c.try() +} + +// a fake Conn whose Set*Deadline functions fail after a certain number of +// calls. +type connFailSetDeadline struct { + io.Reader + io.Writer + failSetDeadlineAfter +} + +func (c *connFailSetDeadline) Close() error { + return nil +} + +func (c *connFailSetDeadline) LocalAddr() net.Addr { + return &net.IPAddr{net.IPv4(0, 0, 0, 0), ""} +} + +func (c *connFailSetDeadline) RemoteAddr() net.Addr { + return &net.IPAddr{net.IPv4(0, 0, 0, 0), ""} +} + +// Test that a failure of SetDeadline is reported. +func TestExtOrPortSetupFailSetDeadline(t *testing.T) { + authCookie, err := readAuthCookieFile(testAuthCookiePath) + if err != nil { + panic(err) + } + + // extOrPortSetup calls SetDeadline twice, so try failing the call after + // differing delays. + expectedErr := fmt.Errorf("distinguished error") + for _, delay := range []int{0, 1, 2} { + upstreamR, upstreamW := io.Pipe() + downstreamR, downstreamW := io.Pipe() + + // mock ExtORPort to talk to + go func() { + // handle auth + err := simulateServerExtOrPortAuth(upstreamR, downstreamW, authCookie) + if err != nil { + return + } + // discard succeeding client data + go func() { + io.Copy(ioutil.Discard, upstreamR) + }() + // fake an OKAY response. + err = extOrPortSendCommand(downstreamW, extOrCmdOkay, []byte{}) + if err != nil { + return + } + }() + + // make a Conn that will fail SetDeadline after a certain number + // of calls. + s := &connFailSetDeadline{downstreamR, upstreamW, failSetDeadlineAfter{delay, expectedErr}} + serverInfo := &ServerInfo{AuthCookiePath: testAuthCookiePath} + err = extOrPortSetup(s, 1*time.Second, serverInfo, "", "") + if delay < 2 && err != expectedErr { + t.Fatalf("delay %v: expected error %v, got %v", delay, expectedErr, err) + } else if delay >= 2 && err != nil { + t.Fatalf("delay %v: got error %v", delay, err) + } + } +} + func TestMakeStateDir(t *testing.T) { os.Clearenv() diff --git a/test_authcookie b/test_authcookie new file mode 100644 index 0000000..0df0cfb --- /dev/null +++ b/test_authcookie @@ -0,0 +1,2 @@ +! Extended ORPort Auth Cookie ! +this file is used in test code.

1 0

[goptlib/master] Report a Close error in readAuthCookieFile.
by dcf＠torproject.org 05 Mar '19

05 Mar '19

commit 3be4b5e2d3ba2add44e0d0307ad3f2487f8ad208 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 5 16:14:35 2019 -0700 Report a Close error in readAuthCookieFile. https://bugs.torproject.org/15826#comment:1 --- pt.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pt.go b/pt.go index 95695ac..f7929e6 100644 --- a/pt.go +++ b/pt.go @@ -616,12 +616,17 @@ func readAuthCookie(f io.Reader) ([]byte, error) { // Read and validate the contents of an auth cookie file. Returns the 32-byte // cookie. See section 4.2.1.2 of 217-ext-orport-auth.txt. -func readAuthCookieFile(filename string) ([]byte, error) { +func readAuthCookieFile(filename string) (cookie []byte, err error) { f, err := os.Open(filename) if err != nil { return nil, err } - defer f.Close() + defer func() { + closeErr := f.Close() + if err == nil { + err = closeErr + } + }() return readAuthCookie(f) }

1 0

[goptlib/master] Refactor testExtOrPortSetMetadataIndividual.
by dcf＠torproject.org 05 Mar '19

05 Mar '19

commit 5347d025110627cf4f2631434534790ca3b33651 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 5 14:42:12 2019 -0700 Refactor testExtOrPortSetMetadataIndividual. --- pt_test.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pt_test.go b/pt_test.go index ce26b16..15907ef 100644 --- a/pt_test.go +++ b/pt_test.go @@ -706,13 +706,16 @@ func TestExtOrPortRecvCommand(t *testing.T) { // set up so that extOrPortSetMetadata can write to one buffer and read from another. type mockSetMetadataBuf struct { - bytes.Buffer - ReadBuf bytes.Buffer + ReadBuf bytes.Buffer + WriteBuf bytes.Buffer } func (buf *mockSetMetadataBuf) Read(p []byte) (int, error) { - n, err := buf.ReadBuf.Read(p) - return n, err + return buf.ReadBuf.Read(p) +} + +func (buf *mockSetMetadataBuf) Write(p []byte) (int, error) { + return buf.WriteBuf.Write(p) } func testExtOrPortSetMetadataIndividual(t *testing.T, addr, methodName string) { @@ -721,14 +724,14 @@ func testExtOrPortSetMetadataIndividual(t *testing.T, addr, methodName string) { // fake an OKAY response. err = extOrPortSendCommand(&buf.ReadBuf, extOrCmdOkay, []byte{}) if err != nil { - t.Fatal(err) + panic(err) } err = extOrPortSetMetadata(&buf, addr, methodName) if err != nil { t.Fatalf("error in extOrPortSetMetadata: %s", err) } for { - cmd, body, err := extOrPortRecvCommand(&buf.Buffer) + cmd, body, err := extOrPortRecvCommand(&buf.WriteBuf) if err != nil { t.Fatalf("error in extOrPortRecvCommand: %s", err) }

1 0

[meek/master] Can use bytes.Reader, don't need bytes.Buffer.
by dcf＠torproject.org 05 Mar '19

05 Mar '19

commit 5848703da3fbf48b4d67b5abd48171cd4935dca7 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 5 16:19:50 2019 -0700 Can use bytes.Reader, don't need bytes.Buffer. --- meek-client-torbrowser/protocol_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meek-client-torbrowser/protocol_test.go b/meek-client-torbrowser/protocol_test.go index e127c4f..63e48d2 100644 --- a/meek-client-torbrowser/protocol_test.go +++ b/meek-client-torbrowser/protocol_test.go @@ -53,13 +53,13 @@ func TestGrepHelperAddr(t *testing.T) { "meek-http-helper: listen " + expectedAddr + " \n", "meek-http-helper: listen " + expectedAddr + "abc\n", } { - b := bytes.NewBufferString(test) + b := bytes.NewReader([]byte(test)) s, err := grepHelperAddrTimeout(b) if err != io.EOF { t.Errorf("%q → (%q, %v), should have been %v", test, s, err, io.EOF) } // test again with an endless reader - b = bytes.NewBufferString(test) + b = bytes.NewReader([]byte(test)) s, err = grepHelperAddrTimeout(io.MultiReader(b, &infiniteReader{})) if err != errTimedout { t.Errorf("%q → (%q, %v), should have been %v", test, s, err, errTimedout) @@ -73,13 +73,13 @@ func TestGrepHelperAddr(t *testing.T) { "junk\nmeek-http-helper: listen " + expectedAddr + "\njunk", "meek-http-helper: listen " + expectedAddr + "\nmeek-http-helper: listen 1.2.3.4:9999\n", } { - b := bytes.NewBufferString(test) + b := bytes.NewReader([]byte(test)) s, err := grepHelperAddrTimeout(b) if err != nil || s != expectedAddr { t.Errorf("%q → (%q, %v), should have been %q", test, s, err, expectedAddr) } // test again with an endless reader - b = bytes.NewBufferString(test) + b = bytes.NewReader([]byte(test)) s, err = grepHelperAddrTimeout(io.MultiReader(b, &infiniteReader{})) if err != nil || s != expectedAddr { t.Errorf("%q → (%q, %v), should have been %q", test, s, err, expectedAddr)

1 0