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

[check/master] Clean up
by arlo＠torproject.org 24 Mar '14

24 Mar '14

commit 538751bb71922e628bb6dcc298fe2ecbc9ddbbd2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Mar 23 21:01:38 2014 -0700 Clean up --- handlers.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/handlers.go b/handlers.go index 27b6e40..e806048 100644 --- a/handlers.go +++ b/handlers.go @@ -40,16 +40,12 @@ func RootHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain var ( err error isTor bool + host string + onOff string fingerprint string ) - // get remote ip - host, err := GetHost(r) - - // determine if we're in Tor - if err != nil { - isTor = false - } else { + if host, err = GetHost(r); err == nil { fingerprint, isTor = Exits.IsTor(host) } @@ -61,7 +57,6 @@ func RootHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain // string used for classes and such // in the template - var onOff string if isTor { onOff = "on" } else { @@ -86,14 +81,12 @@ func RootHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain } -type IPResp struct { - IsTor bool -} +type IPResp struct{ IsTor bool } func APIHandler(Exits *Exits) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") - isTor := false + var isTor bool if host, err := GetHost(r); err == nil { _, isTor = Exits.IsTor(host) }

1 0

r26669: {website} Update TBB links from obfsproxy page (website/trunk/projects/en)
by George Kadianakis 24 Mar '14

24 Mar '14

Author: asn Date: 2014-03-24 03:26:26 +0000 (Mon, 24 Mar 2014) New Revision: 26669 Modified: website/trunk/projects/en/obfsproxy.wml Log: Update TBB links from obfsproxy page Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2014-03-23 13:39:59 UTC (rev 26668) +++ website/trunk/projects/en/obfsproxy.wml 2014-03-24 03:26:26 UTC (rev 26669) @@ -69,12 +69,10 @@ <h2><a class="anchor" href="#download">Download the Pluggable Transports Tor Browser Bundle</a></h2> - - We've been making experimental bundles that include obfsproxy and - are specially designed to circumvent censorship. You can download - them from the - <a href="<page docs/pluggable-transports>#download">pluggable transports page</a>. - + As of Tor Browser 3.6-beta-1, obfsproxy is now included in the +<a +href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta">official +Tor Browser packages</a>. <h2><a class="anchor" href="#instructions">Installation Instructions</a></h2>

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit 03eba201d8e909193e825c773eb2839043c7d571 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 03:15:42 2014 +0000 Update translations for tails-misc_completed --- km.po | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/km.po b/km.po index 432de04..1f33964 100644 --- a/km.po +++ b/km.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-11 07:40+0000\n" +"POT-Creation-Date: 2014-03-23 08:55+0100\n" +"PO-Revision-Date: 2014-03-24 02:50+0000\n" "Last-Translator: khoemsokhem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -19,11 +19,11 @@ msgstr "" "Language: km\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:31 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "Tor is ready" msgstr "Tor គឺរួចរាល់ហើយ" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:32 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 msgid "You can now access the Internet." msgstr "ឥឡូវអ្នកអាចប្រើអ៊ីនធឺណិតបាន។" @@ -343,6 +343,29 @@ msgid "" "following directory for more information:" msgstr "មានបញ្ហាពេល I2P ចាប់ផ្ដើម។ មើលកំណត់ហេតុនៅក្នុងថតខាងក្រោមសម្រាប់ព័ត៌មានលម្អិត៖" +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +msgid "error:" +msgstr "កំហុស៖" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +msgid "Error" +msgstr "កំហុស" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +msgid "" +"Not enough memory available to check for upgrades.\n" +"\n" +"Make sure this system satisfies the requirements for running Tails.\n" +"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n" +"\n" +"Try to restart Tails to check for upgrades again.\n" +"\n" +"Or do a manual upgrade.\n" +"See https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "មិនមានអង្គចងចាំគ្រប់គ្រាន់ដើម្បីពិនិត្យមើលបច្ចុប្បន្នភាព។\n\nប្រាកដថាប្រព័ន្ធនេះឆ្លើយតបតម្រូវការដើម្បីដំណើរការ Tails ។\nសូមមើល file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nព្យាយាមចាប់ផ្ដើម Tails ឡើងវិញដើម្បីពិនិត្យមើលបច្ចុប្បន្នភាពម្ដងទៀត។\n\nឬធ្វើបច្ចុប្បន្នភាពដោយដៃ។\nSee https://tails.boum.org/doc/first_steps/upgrade#manual" + #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" msgstr "ព្រមាន៖ បានរកឃើញម៉ាស៊ីននិម្មិត!" @@ -360,14 +383,6 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>ស្វែងយល់បន្ថែម...</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 -msgid "error:" -msgstr "កំហុស៖" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 -msgid "Error" -msgstr "កំហុស" - #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Do you really want to launch the Unsafe Browser?" msgstr "តើអ្នកពិតជាចង់ចាប់ផ្ដើមកម្មវិធីគ្មានសុវត្ថិភាពមែនឬ?"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit 71e6c3c49a65cc4adbdc535f990ab9b774ded562 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 03:15:37 2014 +0000 Update translations for tails-misc --- km.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/km.po b/km.po index 1ca524f..1f33964 100644 --- a/km.po +++ b/km.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-23 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-24 02:50+0000\n" +"Last-Translator: khoemsokhem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -364,7 +364,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "" +msgstr "មិនមានអង្គចងចាំគ្រប់គ្រាន់ដើម្បីពិនិត្យមើលបច្ចុប្បន្នភាព។\n\nប្រាកដថាប្រព័ន្ធនេះឆ្លើយតបតម្រូវការដើម្បីដំណើរការ Tails ។\nសូមមើល file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nព្យាយាមចាប់ផ្ដើម Tails ឡើងវិញដើម្បីពិនិត្យមើលបច្ចុប្បន្នភាពម្ដងទៀត។\n\nឬធ្វើបច្ចុប្បន្នភាពដោយដៃ។\nSee https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 23 Mar '14

23 Mar '14

commit 790798f406bbd860166f3cd20ed86791b990be5f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 23 23:15:40 2014 +0000 Update translations for tails-misc_completed --- de.po | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/de.po b/de.po index b677223..9301447 100644 --- a/de.po +++ b/de.po @@ -9,13 +9,14 @@ # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 # malexmave <max(a)velcommuta.de>, 2014 # to_ba, 2014 +# rike <u(a)451f.org>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-11 14:41+0000\n" -"Last-Translator: to_ba\n" +"POT-Creation-Date: 2014-03-23 08:55+0100\n" +"PO-Revision-Date: 2014-03-23 23:10+0000\n" +"Last-Translator: rike <u(a)451f.org>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +24,11 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:31 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "Tor is ready" msgstr "Tor ist bereit" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:32 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 msgid "You can now access the Internet." msgstr "Sie haben nun Zugriff auf das Internet." @@ -350,6 +351,29 @@ msgid "" "following directory for more information:" msgstr "Beim Start von I2P ist ein Fehler aufgetreten. Details können in den Protokollen im folgenden Verzeichnis eingesehen werden:" +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +msgid "error:" +msgstr "Fehler:" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +msgid "Error" +msgstr "Fehler" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +msgid "" +"Not enough memory available to check for upgrades.\n" +"\n" +"Make sure this system satisfies the requirements for running Tails.\n" +"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n" +"\n" +"Try to restart Tails to check for upgrades again.\n" +"\n" +"Or do a manual upgrade.\n" +"See https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "Nicht genügend Speicher vorhanden, um nach Upgrades zu suchen.\nStellen Sie sicher, dass dieses System den Minimalanforderungen für Tails entspricht.\nSiehe file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nStarten Sie Tails noch einmal, um erneut nach Upgrades zu suchen.\n\nOder aktualisieren Sie manuell.\nBeachten Sie dazu https://tails.boum.org/doc/first_steps/upgrade#manual" + #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" msgstr "Warnung: Virtuelle Maschine entdeckt!" @@ -367,14 +391,6 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Mehr erfahren …</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 -msgid "error:" -msgstr "Fehler:" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 -msgid "Error" -msgstr "Fehler" - #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Möchten Sie wirklich den unsicheren Browser starten?"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Mar '14

23 Mar '14

commit 1544ab59bc2ce753975d582f23f5764f07d5d006 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 23 23:15:36 2014 +0000 Update translations for tails-misc --- de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de.po b/de.po index d33adbb..9301447 100644 --- a/de.po +++ b/de.po @@ -9,13 +9,14 @@ # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 # malexmave <max(a)velcommuta.de>, 2014 # to_ba, 2014 +# rike <u(a)451f.org>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-23 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-23 23:10+0000\n" +"Last-Translator: rike <u(a)451f.org>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -371,7 +372,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "" +msgstr "Nicht genügend Speicher vorhanden, um nach Upgrades zu suchen.\nStellen Sie sicher, dass dieses System den Minimalanforderungen für Tails entspricht.\nSiehe file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nStarten Sie Tails noch einmal, um erneut nach Upgrades zu suchen.\n\nOder aktualisieren Sie manuell.\nBeachten Sie dazu https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 23 Mar '14

23 Mar '14

commit e3c9a70329e6087319254abb6ce35a9356e39414 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 23 21:45:39 2014 +0000 Update translations for tails-misc_completed --- nl.po | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/nl.po b/nl.po index 4fda279..4699e44 100644 --- a/nl.po +++ b/nl.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# jjjdddsssxxx <a227675(a)drdrb.net>, 2014 # Adriaan Callaerts <adriaan.callaerts(a)gmail.com>, 2013 # cialenhh <c1914502(a)drdrb.com>, 2013 # erwindelaat <erwin.de.laat(a)cleveridge.org>, 2014 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-12 23:50+0000\n" -"Last-Translator: Syrion <transifex(a)syrion.net>\n" +"POT-Creation-Date: 2014-03-23 08:55+0100\n" +"PO-Revision-Date: 2014-03-23 21:30+0000\n" +"Last-Translator: jjjdddsssxxx <a227675(a)drdrb.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,11 +25,11 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:31 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "Tor is ready" msgstr "Tor is klaar" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:32 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 msgid "You can now access the Internet." msgstr "U heeft nu toegang tot het Internet" @@ -351,6 +352,29 @@ msgid "" "following directory for more information:" msgstr "Er ging iets mis terwijl I2P aan het starten was. Bekijk de logs in de volgende map voor meer informatie:" +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +msgid "error:" +msgstr "fout:" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +msgid "Error" +msgstr "Fout" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +msgid "" +"Not enough memory available to check for upgrades.\n" +"\n" +"Make sure this system satisfies the requirements for running Tails.\n" +"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n" +"\n" +"Try to restart Tails to check for upgrades again.\n" +"\n" +"Or do a manual upgrade.\n" +"See https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "Niet genoeg geheugen beschikbaar om voor upgrades te checken.\n\nCheck of dit systeem aan de vereisten voor het uitvoeren van Tails voldoet.\nZie file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nProbeer Tails te restarten om weer voor upgrades te checken.\n\nOf doe een handmatige upgrade.\nZie https://tails.boum.org/doc/first_steps/upgrade#manual" + #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" msgstr "Waarschuwing: virtuele machine gedetecteerd!" @@ -368,14 +392,6 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Kom meer te weten...</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 -msgid "error:" -msgstr "fout:" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 -msgid "Error" -msgstr "Fout" - #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Ben je zeker dat je de Onveilige Browser wil starten?"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Mar '14

23 Mar '14

commit af12c35aaad9299bf4894508ad5b6487b7fb9848 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 23 21:45:36 2014 +0000 Update translations for tails-misc --- nl.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nl.po b/nl.po index 3ba0b7f..4699e44 100644 --- a/nl.po +++ b/nl.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# jjjdddsssxxx <a227675(a)drdrb.net>, 2014 # Adriaan Callaerts <adriaan.callaerts(a)gmail.com>, 2013 # cialenhh <c1914502(a)drdrb.com>, 2013 # erwindelaat <erwin.de.laat(a)cleveridge.org>, 2014 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-23 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-23 21:30+0000\n" +"Last-Translator: jjjdddsssxxx <a227675(a)drdrb.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -372,7 +373,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "" +msgstr "Niet genoeg geheugen beschikbaar om voor upgrades te checken.\n\nCheck of dit systeem aan de vereisten voor het uitvoeren van Tails voldoet.\nZie file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nProbeer Tails te restarten om weer voor upgrades te checken.\n\nOf doe een handmatige upgrade.\nZie https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!"

1 0

[stem/master] Controller sometimes provides microdescriptor router status entries
by atagar＠torproject.org 23 Mar '14

23 Mar '14

commit d70fa9cdd85924ef2e24ceebc2ce348f50634d80 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 23 14:24:09 2014 -0700 Controller sometimes provides microdescriptor router status entries As pointed out by mr-4 on... https://trac.torproject.org/7646 Tor's 'GETINFO ns/*' methods provide standard v3 router status entries when Tor isn't using microdescriptors, and microdescriptor flavored entries when it is. Changing our Controller's get_netword_status() and get_network_statuses() methods to provide the right return type. This is a clunkier for our users but there's not much that Stem can do about that. Oh well. :( --- docs/change_log.rst | 1 + docs/faq.rst | 2 +- stem/control.py | 37 ++++++++++++++++++++++++++++++++++--- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 6b90ca9..a02750c 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -49,6 +49,7 @@ The following are only available within Stem's `git repository * Added `support for CELL_STATS events <api/response.html#stem.response.events.CellStatsEvent>`_ (:spec:`6f2919a`) * Added `support for TB_EMPTY events <api/response.html#stem.response.events.TokenBucketEmptyEvent>`_ (:spec:`6f2919a`) * Added `support for HS_DESC events <api/response.html#stem.response.events.HSDescEvent>`_ (:spec:`a67ac4d`, :trac:`10807`) + * Changed :func:`~stem.control.Controller.get_network_status` and :func:`~stem.control.Controller.get_network_statuses` to provide :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` if Tor is using microdescriptors (:trac:`7646`) * **Utilities** diff --git a/docs/faq.rst b/docs/faq.rst index 4e79251..cb70ba5 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -184,7 +184,7 @@ To get the credential for your AUTHENTICATE command we will use **hexdump**... **I'm using password authentication** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Tor's other method of authentication is a credential you know. To use it you ask Tor to hash your password, then use that in your torrc... +Tor's other method of authentication is a credential you know. To use it ask Tor to hash your password, then use that in your torrc... :: diff --git a/stem/control.py b/stem/control.py index 0d91587..8ea9fe7 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1413,10 +1413,21 @@ class Controller(BaseController): or nickname. If the relay identifier could be either a fingerprint *or* nickname then it's queried as a fingerprint. + This provides + :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` + instances if tor is using microdescriptors... + + :: + + controller.get_conf('UseMicrodescriptors', '0') == '1' + + ... and :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` + otherwise. + :param str relay: fingerprint or nickname of the relay to be queried :param object default: response if the query fails - :returns: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` + :returns: :class:`~stem.descriptor.router_status_entry.RouterStatusEntry` for the given relay :raises: @@ -1441,7 +1452,11 @@ class Controller(BaseController): raise ValueError("'%s' isn't a valid fingerprint or nickname" % relay) desc_content = self.get_info(query, get_bytes = True) - return stem.descriptor.router_status_entry.RouterStatusEntryV3(desc_content) + + if self.get_conf('UseMicrodescriptors', '0') == '1': + return stem.descriptor.router_status_entry.RouterStatusEntryMicroV3(desc_content) + else: + return stem.descriptor.router_status_entry.RouterStatusEntryV3(desc_content) except Exception as exc: if default == UNDEFINED: raise exc @@ -1453,6 +1468,17 @@ class Controller(BaseController): Provides an iterator for all of the router status entries that tor presently knows about. + This provides + :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` + instances if tor is using microdescriptors... + + :: + + controller.get_conf('UseMicrodescriptors', '0') == '1' + + ... and :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` + otherwise. + :param list default: items to provide if the query fails :returns: iterates over @@ -1463,6 +1489,11 @@ class Controller(BaseController): default was provided """ + if self.get_conf('UseMicrodescriptors', '0') == '1': + desc_class = stem.descriptor.router_status_entry.RouterStatusEntryMicroV3 + else: + desc_class = stem.descriptor.router_status_entry.RouterStatusEntryV3 + try: # TODO: We should iterate over the descriptors as they're read from the # socket rather than reading the whole thing into memory. @@ -1474,7 +1505,7 @@ class Controller(BaseController): desc_iterator = stem.descriptor.router_status_entry._parse_file( io.BytesIO(desc_content), True, - entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV3, + entry_class = desc_class, ) for desc in desc_iterator:

1 0

[check/master] Start adding an ip endpoint to the api
by arlo＠torproject.org 23 Mar '14

23 Mar '14

commit 727327d4f1f3ecd5209f5ea2e827676019c56459 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Mar 23 14:10:00 2014 -0700 Start adding an ip endpoint to the api * This is trac 11270 and github #23 --- check.go | 3 ++- handlers.go | 27 ++++++++++++++++++--------- utils.go | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/check.go b/check.go index 00b25b6..27277ba 100644 --- a/check.go +++ b/check.go @@ -60,9 +60,10 @@ func main() { // routes http.HandleFunc("/", RootHandler(CompileTemplate(*basePath, domain, "index.html"), exits, domain, Phttp, Locales)) bulk := BulkHandler(CompileTemplate(*basePath, domain, "bulk.html"), exits, domain) - http.HandleFunc("/api/bulk", bulk) http.HandleFunc("/torbulkexitlist", bulk) http.HandleFunc("/cgi-bin/TorBulkExitList.py", bulk) + http.HandleFunc("/api/bulk", bulk) + http.HandleFunc("/api/ip", APIHandler(exits)) // start the server log.Printf("Listening on port: %d\n", *port) diff --git a/handlers.go b/handlers.go index be9bd6a..27b6e40 100644 --- a/handlers.go +++ b/handlers.go @@ -2,6 +2,7 @@ package main import ( "bytes" + "encoding/json" "fmt" "github.com/samuel/go-gettext/gettext" "html/template" @@ -11,7 +12,6 @@ import ( "net/http" "regexp" "strconv" - "strings" "time" ) @@ -44,14 +44,7 @@ func RootHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain ) // get remote ip - host := r.Header.Get("X-Forwarded-For") - if len(host) > 0 { - parts := strings.Split(host, ",") - // apache will append the remote address - host = strings.TrimSpace(parts[len(parts)-1]) - } else { - host, _, err = net.SplitHostPort(r.RemoteAddr) - } + host, err := GetHost(r) // determine if we're in Tor if err != nil { @@ -93,6 +86,22 @@ func RootHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain } +type IPResp struct { + IsTor bool +} + +func APIHandler(Exits *Exits) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json") + isTor := false + if host, err := GetHost(r); err == nil { + _, isTor = Exits.IsTor(host) + } + ip, _ := json.Marshal(IPResp{isTor}) + w.Write(ip) + } +} + func BulkHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain) http.HandlerFunc { ApiPath := regexp.MustCompile("^/api/") diff --git a/utils.go b/utils.go index 737aa29..88da175 100644 --- a/utils.go +++ b/utils.go @@ -8,11 +8,13 @@ import ( "io" "io/ioutil" "log" + "net" "net/http" "net/url" "os" "path" "strconv" + "strings" ) func UpToDate(r *http.Request) bool { @@ -49,6 +51,19 @@ func GetQS(q url.Values, param string, deflt int) (num int, str string) { return } +func GetHost(r *http.Request) (host string, err error) { + // get remote ip + host = r.Header.Get("X-Forwarded-For") + if len(host) > 0 { + parts := strings.Split(host, ",") + // apache will append the remote address + host = strings.TrimSpace(parts[len(parts)-1]) + } else { + host, _, err = net.SplitHostPort(r.RemoteAddr) + } + return +} + var HaveManual = map[string]bool{ "ar": true, "zh_CN": true,

1 0