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

[bridgedb/develop] Fix an error in HTTPServer.py with requests for bridges?format=plain.
by isis＠torproject.org 08 May '15

08 May '15

commit 28ea3c489c945f954e99bd996bb24bd879fb817e Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 8 23:27:05 2015 +0000 Fix an error in HTTPServer.py with requests for bridges?format=plain. --- lib/bridgedb/HTTPServer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 2e0398c..42e1c54 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -770,7 +770,10 @@ class WebResourceBridges(resource.Resource): if format == 'plain': request.setHeader("Content-Type", "text/plain") - rendered = bridgeLines + try: + rendered = bytes(bridgeLines) + except Exception as err: + rendered = replaceErrorPage(err) else: request.setHeader("Content-Type", "text/html; charset=utf-8") qrcode = None

1 0

[bridgedb/develop] Merge branch 'hotfix/0.3.2-format-plain-bytes' into develop
by isis＠torproject.org 08 May '15

08 May '15

commit 522961f1dd2e58320237df7ea4e3e100bf7d2eb4 Merge: 5e1afa3 28ea3c4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 8 23:40:30 2015 +0000 Merge branch 'hotfix/0.3.2-format-plain-bytes' into develop lib/bridgedb/HTTPServer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[stem/master] Add ADD_ONION, DEL_ONION, and HSPOST to tor-prompt
by atagar＠torproject.org 08 May '15

08 May '15

commit 6e0ffacf8df46cb72463a95c3965aff973ac01e0 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 8 10:16:26 2015 -0700 Add ADD_ONION, DEL_ONION, and HSPOST to tor-prompt Recognizing the new hidden service commands added in... https://gitweb.torproject.org/torspec.git/commit/?id=f5ff369 https://gitweb.torproject.org/torspec.git/commit/?id=aaf2434 --- stem/interpreter/settings.cfg | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/stem/interpreter/settings.cfg b/stem/interpreter/settings.cfg index 696ff3f..e026f6f 100644 --- a/stem/interpreter/settings.cfg +++ b/stem/interpreter/settings.cfg @@ -81,7 +81,10 @@ help.general | ATTACHSTREAM - associates an application's stream with a tor circuit | REDIRECTSTREAM - sets a stream's destination | CLOSESTREAM - closes the given stream +| ADD_ONION - create a new hidden service +| DEL_ONION - delete a hidden service that was created with ADD_ONION | HSFETCH - retrieve a hidden service descriptor, providing it in a HS_DESC_CONTENT event +| HSPOST - uploads a hidden service descriptor | RESOLVE - issues an asynchronous dns or rdns request over tor | TAKEOWNERSHIP - instructs tor to quit when this control connection is closed | PROTOCOLINFO - queries version and controller authentication information @@ -113,7 +116,10 @@ help.usage CLOSECIRCUIT => CLOSECIRCUIT CircuitID [IfUnused] help.usage ATTACHSTREAM => ATTACHSTREAM StreamID CircuitID [HOP=HopNum] help.usage REDIRECTSTREAM => REDIRECTSTREAM StreamID Address [Port] help.usage CLOSESTREAM => CLOSESTREAM StreamID Reason [Flag] +help.usage ADD_ONION => KeyType:KeyBlob [Flags=Flag] (Port=Port [,Target])... +help.usage DEL_ONION => ServiceID help.usage HSFETCH => HSFETCH (HSAddress/v2-DescId) [SERVER=Server]... +help.usage HSPOST => [SERVER=Server] DESCRIPTOR help.usage RESOLVE => RESOLVE [mode=reverse] address help.usage TAKEOWNERSHIP => TAKEOWNERSHIP help.usage PROTOCOLINFO => PROTOCOLINFO [ProtocolVersion] @@ -247,10 +253,20 @@ help.description.closestream |Closes the given stream, the reason being an integer matching a reason as |per section 6.3 of the tor-spec. +help.description.add_onion +|Creates a new hidden service. Unlike 'SETCONF HiddenServiceDir...' this +|doesn't persist the service to disk. + +help.description.del_onion +|Delete a hidden service that was created with ADD_ONION. + help.description.hsfetch |Retrieves the descriptor for a hidden service. This is an asynchronous |request, with the descriptor provided by a HS_DESC_CONTENT event. +help.description.hspost +|Uploads a descriptor to a hidden service directory. + help.description.resolve |Performs IPv4 DNS resolution over tor, doing a reverse lookup instead if |"mode=reverse" is included. This request is processed in the background and

1 0

[tor-messenger-build/master] Update cert_override.txt with jabber.ccc.de HS address
by sukhbir＠torproject.org 08 May '15

08 May '15

commit 6894b26d77d7c8c8707df9e24477c8647d3bbd32 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri May 8 13:00:37 2015 -0400 Update cert_override.txt with jabber.ccc.de HS address --- projects/instantbird/cert_override.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/instantbird/cert_override.txt b/projects/instantbird/cert_override.txt index fbe9a6f..4abc006 100644 --- a/projects/instantbird/cert_override.txt +++ b/projects/instantbird/cert_override.txt @@ -1,3 +1,4 @@ # PSM Certificate Override Settings file # This is a generated file! Do not edit. +okj7xc6j2szr2y75.onion:5222 OID.2.16.840.1.101.3.4.2.1 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41 MU AAAAAAAAAAAAAAADAAAAew308jB5MRAwDgYDVQQKEwdSb290IENBMR4wHAYDVQQL ExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNBIENlcnQgU2lnbmlu ZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAY2FjZXJ0Lm9yZw== jabber.ccc.de:5222 OID.2.16.840.1.101.3.4.2.1 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41 U AAAAAAAAAAAAAAADAAAAew308jB5MRAwDgYDVQQKEwdSb290IENBMR4wHAYDVQQL ExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNBIENlcnQgU2lnbmlu ZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAY2FjZXJ0Lm9yZw==

1 0

[stem/master] Include HS_DESC attributes added for HSPOST
by atagar＠torproject.org 08 May '15

08 May '15

commit 7f2592028c2bff6f25fff7d37c322f489cf6b30d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 8 09:47:46 2015 -0700 Include HS_DESC attributes added for HSPOST Tor's new HSPOST action adds a few new values to HS_DESC. Noting them in our enums. Presently I'm unsure if adding a method for HSPOST itself would be useful or not, so leaving that up to DonnchaC... https://gitweb.torproject.org/torspec.git/commit/?id=aaf2434 --- stem/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stem/__init__.py b/stem/__init__.py index 4752a99..92299cf 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -406,7 +406,9 @@ Library for working with the tor process. HSDescAction Description =============== =========== **REQUESTED** uncached hidden service descriptor is being requested + **UPLOAD** descriptor is being uploaded with HSPOST **RECEIVED** hidden service descriptor has been retrieved + **UPLOADED** descriptor was uploaded with HSPOST **IGNORE** fetched descriptor was ignored because we already have its v0 descriptor **FAILED** we were unable to retrieve the descriptor =============== =========== @@ -420,6 +422,7 @@ Library for working with the tor process. =================== =========== **BAD_DESC** descriptor was unparseable **QUERY_REJECTED** hidden service directory refused to provide the descriptor + **UPLOAD_REJECTED** descriptor was rejected by the hidden service directory **NOT_FOUND** descriptor with the given identifier wasn't found **UNEXPECTED** failure type is unknown =================== =========== @@ -807,7 +810,9 @@ TokenBucket = stem.util.enum.UppercaseEnum( HSDescAction = stem.util.enum.UppercaseEnum( 'REQUESTED', + 'UPLOAD', 'RECEIVED', + 'UPLOADED', 'IGNORE', 'FAILED', ) @@ -815,6 +820,7 @@ HSDescAction = stem.util.enum.UppercaseEnum( HSDescReason = stem.util.enum.UppercaseEnum( 'BAD_DESC', 'QUERY_REJECTED', + 'UPLOAD_REJECTED', 'NOT_FOUND', 'UNEXPECTED', )

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 08 May '15

08 May '15

commit c9e04ac2663b85a0ba390285ea11314124994da3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 8 15:45:46 2015 +0000 Update translations for tails-misc_completed --- sq.po | 72 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/sq.po b/sq.po index 96110df..99d0348 100644 --- a/sq.po +++ b/sq.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-03-03 21:51+0000\n" +"POT-Creation-Date: 2015-05-02 23:47+0200\n" +"PO-Revision-Date: 2015-05-08 15:33+0000\n" "Last-Translator: Bujar Tafili\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n" "MIME-Version: 1.0\n" @@ -18,11 +18,11 @@ msgstr "" "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43 msgid "Tor is ready" msgstr "Tor është gati" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44 msgid "You can now access the Internet." msgstr "Ju s'mund të qaseni në Internet." @@ -96,128 +96,132 @@ msgstr "_Deshifroni/Verifikoni Tabelën e Shënimeve" msgid "_Manage Keys" msgstr "_Administroni Çelësat" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:244 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:208 +msgid "_Open Text Editor" +msgstr "_Hapeni Redaktuesin e Tekstit" + +#: config/chroot_local-includes/usr/local/bin/gpgApplet:252 msgid "The clipboard does not contain valid input data." msgstr "Tabelën e Shënimeve nuk përmban të dhëna hyrëse të vlefshme." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:295 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:297 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:299 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:303 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:305 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:307 msgid "Unknown Trust" msgstr "Besueshmëri e Panjohur" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:301 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:309 msgid "Marginal Trust" msgstr "Besueshmëri Anësore" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:303 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:311 msgid "Full Trust" msgstr "Besueshmëri e Plotë" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:305 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:313 msgid "Ultimate Trust" msgstr "Besueshmëri e Skajshme" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:358 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:366 msgid "Name" msgstr "Emri" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:359 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:367 msgid "Key ID" msgstr "ID Kyçe" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:360 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:368 msgid "Status" msgstr "Gjendja" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:392 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:400 msgid "Fingerprint:" msgstr "Gjurmë:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:395 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:403 msgid "User ID:" msgid_plural "User IDs:" msgstr[0] "ID e përdoruesit" msgstr[1] "ID-të e përdoruesve" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:425 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:433 msgid "None (Don't sign)" msgstr "Asnjë (Mos nënshkruani)" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:488 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:496 msgid "Select recipients:" msgstr "Përzgjidhni marrësit:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:496 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Hide recipients" msgstr "Fshihni marrësit" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:499 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:507 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." msgstr "Fshihni ID-të e përdoruesve të të gjithë marrësve të një mesazhi të fshehur. Përndryshe, çdokush që sheh mesazhin e fshehur mund të shohë edhe se kush janë marrësit." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:505 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:513 msgid "Sign message as:" msgstr "Nënshkruajeni mesazhin si:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:509 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:517 msgid "Choose keys" msgstr "Përzgjidhni çelësat" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:549 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:557 msgid "Do you trust these keys?" msgstr "A i besoni këta çelësa?" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:552 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:560 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" msgstr[0] "Çelësi i përzgjedhur, që vijon, s'është plotësisht i besueshëm:" msgstr[1] "Çelësat e përzgjedhur, që vijojnë, s'janë plotësisht të besueshëm:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:570 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:578 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" msgstr[0] " A e besoni mjaftueshëm këtë çelës, sa ta përdorni atë gjithsesi?" msgstr[1] "A i besoni mjaftueshëm këta çelësa, sa t'i përdorni ata gjithsesi?" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:583 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:591 msgid "No keys selected" msgstr "S'është përzgjedhur asnjë çelës" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:585 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:593 msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." msgstr "Ju duhet të përzgjidhni një çelës personal për të shënuar mesazhin, apo disa çelësa publikë për ta fshehur mesazhin, ose të dyja." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:613 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:621 msgid "No keys available" msgstr "S'ka çelësa të disponueshëm" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:615 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:623 msgid "" "You need a private key to sign messages or a public key to encrypt messages." msgstr "Ju nevojitet një çelës personal për të shënuar mesazhin ose një çelës publik për ta fshehur atë." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:743 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:751 msgid "GnuPG error" msgstr "Gabim i GnuPG" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:764 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:772 msgid "Therefore the operation cannot be performed." msgstr "Për këtë arsye operacioni s'mund të kryhet." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:814 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:822 msgid "GnuPG results" msgstr "Rezultatet GnuPG" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:820 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:828 msgid "Output of GnuPG:" msgstr "Produkti i GnuPG:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:845 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:853 msgid "Other messages provided by GnuPG:" msgstr "Mesazhet e tjera të ofruara nga GnuPG:"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 08 May '15

08 May '15

commit 3c8469a3450de3be6f29a9854dae3644b3a91a99 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 8 15:45:41 2015 +0000 Update translations for tails-misc --- sq.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sq.po b/sq.po index 7651539..99d0348 100644 --- a/sq.po +++ b/sq.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-05-03 08:25+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-05-08 15:33+0000\n" +"Last-Translator: Bujar Tafili\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,7 +98,7 @@ msgstr "_Administroni Çelësat" #: config/chroot_local-includes/usr/local/bin/gpgApplet:208 msgid "_Open Text Editor" -msgstr "" +msgstr "_Hapeni Redaktuesin e Tekstit" #: config/chroot_local-includes/usr/local/bin/gpgApplet:252 msgid "The clipboard does not contain valid input data."

1 0

[tor-messenger-build/master] Force set the resource to "Instantbird"
by sukhbir＠torproject.org 08 May '15

08 May '15

commit a428310319310d62ca4681244d625187b6ba3f02 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri May 8 10:45:02 2015 -0400 Force set the resource to "Instantbird" The default resource is determined by the brand name, which in our case is "Tor Messenger". We are pretending to be "Instantbird" so override the default resource. --- projects/instantbird/config | 1 + projects/instantbird/xmpp-resource.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 06c4cbe..3e25e50 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -70,6 +70,7 @@ input_files: - filename: ctcp-time.patch - filename: ctcp-ping.patch - filename: xmpp-onion.patch + - filename: xmpp-resource.patch - filename: version.patch - filename: branding/name.patch - filename: branding/default.png diff --git a/projects/instantbird/xmpp-resource.patch b/projects/instantbird/xmpp-resource.patch new file mode 100644 index 0000000..3e861da --- /dev/null +++ b/projects/instantbird/xmpp-resource.patch @@ -0,0 +1,13 @@ +diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js +index f99a238..a35f99a 100644 +--- a/chat/protocols/xmpp/xmpp.js ++++ b/chat/protocols/xmpp/xmpp.js +@@ -34,7 +34,7 @@ XMPPProtocol.prototype = { + + options: { + resource: {get label() _("options.resource"), +- get default() XMPPDefaultResource}, ++ default: "Instantbird"}, + priority: {get label() _("options.priority"), default: 0}, + connection_security: { + get label() _("options.connectionSecurity"),

1 0

[tor-messenger-build/master] Use onion addresses for known XMPP servers (#13855)
by sukhbir＠torproject.org 08 May '15

08 May '15

commit b1c51f30108667a017bdb620dbdd39c59373ad60 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri May 8 10:26:03 2015 -0400 Use onion addresses for known XMPP servers (#13855) For known XMPP servers that allow for access via a hidden service, Tor Messenger will set the server to the onion address automatically. --- projects/instantbird/config | 2 +- projects/instantbird/xmpp-onion.patch | 107 +++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 4fd4585..06c4cbe 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -59,7 +59,6 @@ input_files: - filename: spi-cacert.der - filename: preferences.patch - filename: irc.patch - - filename: xmpp.patch - filename: gtalk-resource.patch - filename: top-protocols.patch - filename: disable-links.patch @@ -70,6 +69,7 @@ input_files: - filename: cert_override.txt - filename: ctcp-time.patch - filename: ctcp-ping.patch + - filename: xmpp-onion.patch - filename: version.patch - filename: branding/name.patch - filename: branding/default.png diff --git a/projects/instantbird/xmpp-onion.patch b/projects/instantbird/xmpp-onion.patch new file mode 100644 index 0000000..46a1a76 --- /dev/null +++ b/projects/instantbird/xmpp-onion.patch @@ -0,0 +1,107 @@ +From 6bd2fc6cbc618e8fcd38411854da2527556e0114 Mon Sep 17 00:00:00 2001 +From: Sukhbir Singh <sukhbir(a)torproject.org> +Date: Fri, 8 May 2015 10:19:31 -0400 +Subject: [PATCH] Use onion addresses for known XMPP servers (#13855) + +--- + im/content/accountWizard.js | 35 ++++++++++++++++++++++++++++++++++- + im/content/accountWizard.xul | 5 +++-- + 2 files changed, 37 insertions(+), 3 deletions(-) + +diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js +index 707f1c7..e763165 100644 +--- a/im/content/accountWizard.js ++++ b/im/content/accountWizard.js +@@ -7,6 +7,14 @@ Cu.import("resource:///modules/imServices.jsm"); + + const PREF_EXTENSIONS_GETMOREPROTOCOLSURL = "extensions.getMoreProtocolsURL"; + ++// Borrowed and inspired by xmpp-client. ++const kServerOnions = { ++ "riseup.net": "4cjw6cwpeaeppfqz.onion", ++ "jabber.ccc.de": "okj7xc6j2szr2y75.onion", ++ "jabber.otr.im": "5rgdtlawqkcplz75.onion", ++ "jabber.calyxinstitute.org": "ijeeynrc6x2uy5ob.onion", ++} ++ + var accountWizard = { + onload: function aw_onload() { + let topProtoList = document.getElementById("topprotolist"); +@@ -105,6 +113,21 @@ var accountWizard = { + return textbox; + }, + ++ insertOnionAddress: function aw_insertOnionAddress() { ++ // Currently, we only use onion addresses for XMPP. ++ if (this.proto.id == "prpl-jabber") { ++ // If the value of the domain is one for which there exists a ++ // hidden service, replace the address with the onion address. ++ let jabberDomain = document.getElementById("username-split-0"); ++ if (jabberDomain.value in kServerOnions) { ++ this.onionAddress = kServerOnions[jabberDomain.value]; ++ } ++ else { ++ this.onionAddress = ""; ++ } ++ } ++ }, ++ + showUsernamePage: function aw_showUsernamePage() { + let proto = this.proto.id; + if ("userNameBoxes" in this && this.userNameProto == proto) { +@@ -160,11 +183,20 @@ var accountWizard = { + document.getElementById("accountusername").next = next; + }, + ++ setOnionAddress: function aw_setOnionAddress() { ++ if (this.proto.id == "prpl-jabber") { ++ document.getElementById("prpl-jabber-server").value = this.onionAddress; ++ } ++ }, ++ + showAdvanced: function aw_showAdvanced() { + // ensure we don't destroy user data if it's not necessary + let id = this.proto.id; +- if ("protoSpecOptId" in this && this.protoSpecOptId == id) ++ if ("protoSpecOptId" in this && this.protoSpecOptId == id) { ++ // But we should still set the onion address, if it exists. ++ this.setOnionAddress(); + return; ++ } + this.protoSpecOptId = id; + + /* FIXME +@@ -172,6 +204,7 @@ var accountWizard = { + !this.proto.newMailNotification; + */ + this.populateProtoSpecificBox(); ++ this.setOnionAddress(); + + let proxyVisible = this.proto.usePurpleProxy; + if (proxyVisible) { +diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul +index 5fa5b82..89f88fe 100644 +--- a/im/content/accountWizard.xul ++++ b/im/content/accountWizard.xul +@@ -59,7 +59,8 @@ + label="&accountUsernameTitle.label;" + onpageshow="accountWizard.showUsernamePage();" + onpagehide="accountWizard.hideUsernamePage();" +- onpagerewound="return accountWizard.rewindFromUsernamePage();"> ++ onpagerewound="return accountWizard.rewindFromUsernamePage();" ++ onpageadvanced="return accountWizard.insertOnionAddress();"> + <description id="usernameInfo"/> + <separator/> + <vbox id="userNameBox"/> +@@ -98,7 +99,7 @@ + <checkbox id="newMailNotification" + label="&accountAdvanced.newMailNotification.label;" hidden="true"/> + +- <groupbox id="protoSpecificGroupbox" class="collapsable" closed="true" ++ <groupbox id="protoSpecificGroupbox" class="collapsable" closed="false" + onkeypress="accountWizard.onGroupboxKeypress(event)"> + <caption id="protoSpecificCaption" + onclick="accountWizard.toggleGroupbox('protoSpecificGroupbox')"/> +-- +2.1.4 +

1 0

[tor-messenger-build/master] mozilla: switch to release branch
by boklm＠torproject.org 08 May '15

08 May '15

commit e8725707e86c836d5b2217ec290815c6d7a19f1a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 8 13:32:39 2015 +0200 mozilla: switch to release branch The release branch now contains Firefox 38. --- projects/mozilla/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mozilla/config b/projects/mozilla/config index ea23187..b4e278c 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,7 +1,7 @@ # vim: filetype=yaml version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/gecko-dev -git_hash: master +git_hash: release src: | #!/bin/sh set -e

1 0