- tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 04 May '16

04 May '16

commit e24c9022722119f4d0d631c7e4d02e347b9dc83d Merge: 230a3d1 31332a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 14:47:13 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.8] Fix dnsserv.c assertion when no supported questions are requested.
by nickm＠torproject.org 04 May '16

04 May '16

commit 0ca3f495c6fad074606ab75942b64738ed61926a Author: Scott Dial <scott(a)scottdial.com> Date: Wed May 4 14:45:09 2016 -0400 Fix dnsserv.c assertion when no supported questions are requested. The problem is that "q" is always set on the first iteration even if the question is not a supported question. This set of "q" is not necessary, and will be handled after exiting the loop if there if a supported q->type was found. [Changes file by nickm] lease enter the commit message for your changes. Lines starting --- changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug18710 b/changes/bug18710 new file mode 100644 index 0000000..2693955 --- /dev/null +++ b/changes/bug18710 @@ -0,0 +1,6 @@ + o Major bugfixes (DNS proxy): + - Stop a crash that could occur when a client running with DNSPort + received a query with multiple address types, where the first + address type was not supported. Found and fixed by Scott Dial. + Fixes bug 18710; bugfix on 0.2.5.4-alpha. + diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index ecd45be..9b0368d 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -87,8 +87,6 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) for (i = 0; i < req->nquestions; ++i) { if (req->questions[i]->dns_question_class != EVDNS_CLASS_INET) continue; - if (! q) - q = req->questions[i]; switch (req->questions[i]->type) { case EVDNS_TYPE_A: case EVDNS_TYPE_AAAA: @@ -96,7 +94,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) /* We always pick the first one of these questions, if there is one. */ if (! supported_q) - supported_q = q; + supported_q = req->questions[i]; break; default: break;

1 0

[tor/maint-0.2.8] Merge branch 'bug18710_025' into maint-0.2.8
by nickm＠torproject.org 04 May '16

04 May '16

commit 31332a878db0d8f8d53fe4e535ec9ae812675315 Merge: 8f292f1 0ca3f49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 14:47:04 2016 -0400 Merge branch 'bug18710_025' into maint-0.2.8 changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[torbirdy/master] Update fetching preference value for default protocol
by sukhbir＠torproject.org 04 May '16

04 May '16

commit 602b5d8f7d342ec86f3494791e65ecc5bfd097a6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed May 4 13:35:53 2016 -0400 Update fetching preference value for default protocol --- chrome/content/emailwizard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 8218c1b..0223e7a 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -140,7 +140,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { document.getElementById("provisioner_button").hidden = true; // 0 is for POP3 (default), 1 is for IMAP. See emailwizard.xul and prefs.js. - var selectProtocol = prefs.getIntPref("extensions.torbirdy.defaultprotocol") + var selectProtocol = Preferences.get("extensions.torbirdy.defaultprotocol") document.getElementById("torbirdy-protocol").selectedIndex = selectProtocol; };

1 0

[torbirdy/master] Also apply TorBirdy's account tweaks after autoconfiguraion.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit 56c72de801a816a3f0e231a37a2dff5b7cf3bffb Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 18:53:34 2016 +0100 Also apply TorBirdy's account tweaks after autoconfiguraion. This fixes Tails bug #11204: https://labs.riseup.net/code/issues/11204 --- chrome/content/emailwizard.js | 70 +++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index f149446..baf1ef5 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -12,6 +12,36 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { disableWizard = true; } + fixupTorbirdySettingsOnNewAccount = function(account) { + var idkey = account.defaultIdentity.key; + var serverkey = account.incomingServer.key; + var protocol = account.incomingServer.type; + + // Make sure that drafts are saved to Local Folders if it is an IMAP account. + if (protocol === "imap") { + var draftFolder = 'mail.identity.%idkey%.draft_folder'; + var draftFolderPref = draftFolder.replace("%idkey%", idkey); + prefs.setCharPref(draftFolderPref, "mailbox://nobody@Local%20Folders/Drafts"); + } + + // Set check_new_mail to false. We can't do this through the account setup, so let's do it here. + var checkNewMail = 'mail.server.%serverkey%.check_new_mail'; + var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey); + prefs.setBoolPref(checkNewMailPref, false); + + // Do not check for new messages at startup. + var loginAtStartup = 'mail.server.%serverkey%.login_at_startup'; + var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey); + prefs.setBoolPref(loginAtStartupPref, false); + + // Do not automatically download new messages. + if (protocol === "pop3") { + var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff'; + var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey); + prefs.setBoolPref(downloadOnBiffPref, false); + } + } + pub.adjustAutoWizard = function() { if (!disableWizard) { var realname = document.getElementById("realname").value; @@ -66,31 +96,8 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { replaceVariables(config, realname, email, password); config.rememberPassword = rememberPassword && !!password; - var newAccount = createAccountInBackend(config); - - // Set check_new_mail to false. We can't do this through the account setup, so let's do it here. - var checkNewMail = 'mail.server.%serverkey%.check_new_mail'; - var serverkey = newAccount.incomingServer.key; - var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey); - prefs.setBoolPref(checkNewMailPref, false); - - // Make sure that drafts are saved to Local Folders if it is an IMAP account. - if (protocol === "imap") { - var identity = newAccount.defaultIdentity; - identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts"; - } - - // Do not check for new messages at startup. - var loginAtStartup = 'mail.server.%serverkey%.login_at_startup'; - var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey); - prefs.setBoolPref(loginAtStartupPref, false); - - // Do not automatically download new messages. - if (protocol === "pop3") { - var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff'; - var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey); - prefs.setBoolPref(downloadOnBiffPref, false); - } + var new_account = createAccountInBackend(config); + fixupTorbirdySettingsOnNewAccount(new_account); // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : onAdvancedSetup(). var windowManager = Cc["@mozilla.org/appshell/window-mediator;1"] @@ -102,12 +109,23 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { } else { window.openDialog("chrome://messenger/content/AccountManager.xul", "AccountManager", "chrome,centerscreen,modal,titlebar", - { server: newAccount.incomingServer, + { server: new_account.incomingServer, selectPage: "am-server.xul" }); } window.close(); } else { + // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : finish(). + // We need somewhere to hook in, so we can access the new + // account object created through the autoconfig wizard, and + // apply Torbirdy's settings on it. + gEmailConfigWizard.finish = function() { + gEmailWizardLogger.info("creating account in backend"); + var account = createAccountInBackend(this.getConcreteConfig()); + fixupTorbirdySettingsOnNewAccount(account); + window.close(); + } + gEmailConfigWizard.onNext(); } };

1 0

[torbirdy/master] Let us always disable remote account creation.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit f15169e876225ac28aa3bea10d233c2035a16066 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 18:47:20 2016 +0100 Let us always disable remote account creation. When the automatic configuration wizard is enabled we probably want to use *it*, and not the remote account creation feature. If that is something TorBirdys want to make enabled as an option, it should not be baked into this same pref. However, it probably is something TorBirdy should not encourage (at least we in Tails decided to disable it), so always hiding it seems like a good idea. This fixes Tails bug #10464: https://labs.riseup.net/code/issues/10464 --- chrome/content/emailwizard.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index a82a188..f149446 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -124,12 +124,9 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { pub.onLoad = function() { if (disableWizard) { document.getElementById("torbirdy-protocol-box").collapsed = true; - document.getElementById("provisioner_button").disabled = false; - document.getElementById("provisioner_button").hidden = false; - } else { - document.getElementById("provisioner_button").disabled = true; - document.getElementById("provisioner_button").hidden = true; } + document.getElementById("provisioner_button").disabled = true; + document.getElementById("provisioner_button").hidden = true; }; return pub;

1 0

[torbirdy/master] Refactor.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit ead042821ece6420cecdd5efc40e21c4e4a9d03d Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 19:30:39 2016 +0100 Refactor. --- chrome/content/emailwizard.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index baf1ef5..ec73113 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -1,3 +1,5 @@ +Components.utils.import("resource://gre/modules/Preferences.jsm"); + if (!org) var org = {}; if (!org.torbirdy) org.torbirdy = {}; @@ -17,28 +19,26 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var serverkey = account.incomingServer.key; var protocol = account.incomingServer.type; + var pref_spec = [ + ['mail.server.%serverkey%.check_new_mail', false], + ['mail.server.%serverkey%.login_at_startup', false] + ]; + // Make sure that drafts are saved to Local Folders if it is an IMAP account. if (protocol === "imap") { - var draftFolder = 'mail.identity.%idkey%.draft_folder'; - var draftFolderPref = draftFolder.replace("%idkey%", idkey); - prefs.setCharPref(draftFolderPref, "mailbox://nobody@Local%20Folders/Drafts"); + pref_spec.push(['mail.identity.%idkey%.draft_folder', + 'mailbox://nobody@Local%20Folders/Drafts']); } - // Set check_new_mail to false. We can't do this through the account setup, so let's do it here. - var checkNewMail = 'mail.server.%serverkey%.check_new_mail'; - var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey); - prefs.setBoolPref(checkNewMailPref, false); - - // Do not check for new messages at startup. - var loginAtStartup = 'mail.server.%serverkey%.login_at_startup'; - var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey); - prefs.setBoolPref(loginAtStartupPref, false); - - // Do not automatically download new messages. + // Do not automatically download new messages in POP accounts. if (protocol === "pop3") { - var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff'; - var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey); - prefs.setBoolPref(downloadOnBiffPref, false); + pref_spec.push(['mail.server.%serverkey%.download_on_biff', false]); + } + + for each (var [pref_template, value] in pref_spec) { + var pref = pref_template.replace("%idkey%", idkey); + pref = pref.replace("%serverkey%", serverkey); + Preferences.set(pref, value); } }

1 0

[torbirdy/master] Improve variable name.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit a229be9aef54736b38ff224b6d7283e5fade3a42 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 20:18:35 2016 +0100 Improve variable name. --- chrome/content/emailwizard.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index d5adc85..fc2d48e 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -6,7 +6,10 @@ if (!org.torbirdy) org.torbirdy = {}; if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var pub = {}; - var disableWizard = !Preferences.get("extensions.torbirdy.emailwizard", false); + var disableAutoConfiguration = false; + if (Preferences.get("extensions.torbirdy.emailwizard", false)) { + disableAutoConfiguration = true; + } fixupTorbirdySettingsOnNewAccount = function(account) { var idkey = account.defaultIdentity.key; @@ -37,7 +40,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { } pub.adjustAutoWizard = function() { - if (!disableWizard) { + if (!disableAutoConfiguration) { var realname = document.getElementById("realname").value; var email = document.getElementById("email").value; var password = document.getElementById("password").value; @@ -134,7 +137,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { }; pub.onLoad = function() { - if (disableWizard) { + if (disableAutoConfiguration) { document.getElementById("torbirdy-protocol-box").collapsed = true; } document.getElementById("provisioner_button").disabled = true;

1 0

[torbirdy/master] Merge branch 'master' into post-secure-autoconfig
by sukhbir＠torproject.org 04 May '16

04 May '16

commit 188fbd679a85dc8909bf0eff46b840112a2bd54b Merge: 89bf536 caaf2b5 Author: Ulrike Uhlig <u(a)451f.org> Date: Wed May 4 13:00:23 2016 +0200 Merge branch 'master' into post-secure-autoconfig Makefile | 6 ++++++ chrome/content/emailwizard.js | 4 ++++ components/torbirdy.js | 22 +++++++++++++++++++++- defaults/preferences/prefs.js | 1 + 4 files changed, 32 insertions(+), 1 deletion(-) diff --cc chrome/content/emailwizard.js index 30024ac,123753b..8218c1b --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@@ -133,11 -136,17 +133,15 @@@ if(!org.torbirdy.emailwizard) org.torbi }; pub.onLoad = function() { - if (disableWizard) { + if (disableAutoConfiguration) { document.getElementById("torbirdy-protocol-box").collapsed = true; - document.getElementById("provisioner_button").disabled = false; - document.getElementById("provisioner_button").hidden = false; - } else { - document.getElementById("provisioner_button").disabled = true; - document.getElementById("provisioner_button").hidden = true; } + document.getElementById("provisioner_button").disabled = true; + document.getElementById("provisioner_button").hidden = true; ++ + // 0 is for POP3 (default), 1 is for IMAP. See emailwizard.xul and prefs.js. + var selectProtocol = prefs.getIntPref("extensions.torbirdy.defaultprotocol") + document.getElementById("torbirdy-protocol").selectedIndex = selectProtocol; }; return pub;

1 0

[torbirdy/master] Simplify.
by sukhbir＠torproject.org 04 May '16

04 May '16

commit 9b75deeba42e6e7e94cc5acf6e74651d04f63c10 Author: anonym <anonym(a)riseup.net> Date: Wed Mar 9 20:16:59 2016 +0100 Simplify. --- chrome/content/emailwizard.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 3352fb9..d5adc85 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -6,10 +6,7 @@ if (!org.torbirdy) org.torbirdy = {}; if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var pub = {}; - var disableWizard = false; - if (Preferences.get("extensions.torbirdy.emailwizard", false)) { - disableWizard = true; - } + var disableWizard = !Preferences.get("extensions.torbirdy.emailwizard", false); fixupTorbirdySettingsOnNewAccount = function(account) { var idkey = account.defaultIdentity.key;

1 0