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

[nyx/master] Added Ok and Cancel for selecting events
by atagar＠torproject.org 15 May '16

15 May '16

commit aa0dfe24e0a60832940a02f0084f7eb340fd8ede Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun May 8 01:32:54 2016 +0400 Added Ok and Cancel for selecting events --- nyx/popups.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/nyx/popups.py b/nyx/popups.py index a146d47..f4be35d 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -430,13 +430,19 @@ def new_select_event_types(): if events: events = events.split() - events = [events[i:i + 3] for i in xrange(0, len(events), 3)] + tor_events = [events[i:i + 3] for i in xrange(0, len(events), 3)] - for i, line in enumerate(events): + for i, line in enumerate(tor_events): for j, in_line in enumerate(line): x = subwindow.addstr(j * 30 + 1, i + 1, '[X]' if (i * 3 + j) in selected_events else '[]') x = subwindow.addstr(x, i + 1, in_line, HIGHLIGHT if selection == (i * 3 + j) else NORMAL) + x = 30 + for i, line in enumerate(['Ok', 'Cancel']): + x = subwindow.addstr(x, len(tor_events) + 2, '[') + x = subwindow.addstr(x, len(tor_events) + 2, line, HIGHLIGHT if selection == (len(events) + i) else NORMAL) + x = subwindow.addstr(x, len(tor_events) + 2, ']') + with nyx.curses.CURSES_LOCK: events = nyx.tor_controller().get_info('events/names', None) if events: @@ -448,14 +454,18 @@ def new_select_event_types(): if key.match('up'): selection = max(0, selection - 3) elif key.match('down'): - selection = min(len(events) - 1, selection + 3) + selection = min(len(events) + 1, selection + 3) elif key.match('left'): selection = max(0, selection - 1) elif key.match('right'): - selection = min(len(events) - 1, selection + 1) + selection = min(len(events) + 1, selection + 1) elif key.is_selection(): if selection in selected_events: selected_events.remove(selection) + elif selection == len(events): + return set([events[i] for i in selected_events]) + elif selection == (len(events) + 1): + return None else: selected_events.append(selection) elif key.match('esc'):

1 0

[nyx/master] Event selection dialog loads events dynamically
by atagar＠torproject.org 15 May '16

15 May '16

commit 6510514f5c3b15d663d71570c06e032eba28dea0 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Fri May 6 21:51:46 2016 +0400 Event selection dialog loads events dynamically --- nyx/panel/log.py | 4 ++++ nyx/popups.py | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 278c633..f6c8d11 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -142,6 +142,9 @@ class LogPanel(nyx.panel.DaemonPanel): self._event_types = nyx.log.listen_for_events(self._register_tor_event, event_types) self.redraw(True) + def new_show_event_selection_prompt(self): + event_types = nyx.popups.new_select_event_types() + def show_snapshot_prompt(self): """ Lets user enter a path to take a snapshot, canceling if left blank. @@ -233,6 +236,7 @@ class LogPanel(nyx.panel.DaemonPanel): nyx.panel.KeyHandler('arrows', 'scroll up and down', _scroll, key_func = lambda key: key.is_scroll()), nyx.panel.KeyHandler('a', 'save snapshot of the log', self.show_snapshot_prompt), nyx.panel.KeyHandler('e', 'change logged events', self.show_event_selection_prompt), + nyx.panel.KeyHandler('w', 'new change logged events', self.new_show_event_selection_prompt), nyx.panel.KeyHandler('f', 'log regex filter', _pick_filter, 'enabled' if self._filter.selection() else 'disabled'), nyx.panel.KeyHandler('u', 'duplicate log entries', _toggle_deduplication, 'visible' if self._show_duplicates else 'hidden'), nyx.panel.KeyHandler('c', 'clear event log', _clear_log), diff --git a/nyx/popups.py b/nyx/popups.py index 01a5215..f0d4050 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -417,6 +417,19 @@ def select_event_types(): return None +def new_select_event_types(): + def _render(subwindow): + subwindow.box() + subwindow.addstr(0, 0, 'Event Types:', HIGHLIGHT) + + events = nyx.tor_controller().get_info('events/names', None) + for i, line in enumerate(events.split()): + subwindow.addstr(1, i + 1, line) + + with nyx.curses.CURSES_LOCK: + nyx.curses.draw(_render, top = _top(), width = 80, height = 16) + return None + def confirm_save_torrc(torrc): """ Provides a confirmation dialog for saving tor's current configuration.

1 0

[nyx/master] Update the selected events
by atagar＠torproject.org 15 May '16

15 May '16

commit 46811b375dbfbac9c2f4d50f31c275646bbf25d9 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun May 8 01:49:28 2016 +0400 Update the selected events --- nyx/panel/log.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index f6c8d11..b78314e 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -145,6 +145,10 @@ class LogPanel(nyx.panel.DaemonPanel): def new_show_event_selection_prompt(self): event_types = nyx.popups.new_select_event_types() + if event_types and event_types != self._event_types: + self._event_types = nyx.log.listen_for_events(self._register_tor_event, event_types) + self.redraw(True) + def show_snapshot_prompt(self): """ Lets user enter a path to take a snapshot, canceling if left blank.

1 0

[nyx/master] Event selection dialog takes care of previous selected event types
by atagar＠torproject.org 15 May '16

15 May '16

commit 7d14b821ccabf017dbe023aa25edccdf1d0323e4 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Mon May 9 01:06:19 2016 +0400 Event selection dialog takes care of previous selected event types Tor runlevels are followed by the rest of the events in the event selection dialog --- nyx/panel/log.py | 2 +- nyx/popups.py | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index f2183a7..b0789c3 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -147,7 +147,7 @@ class LogPanel(nyx.panel.DaemonPanel): Prompts the user to select the events being listened for. TODO: Replace show_event_selection_prompt() with this method. """ - event_types = nyx.popups.new_select_event_types() + event_types = nyx.popups.new_select_event_types(self._event_types) if event_types and event_types != self._event_types: self._event_types = nyx.log.listen_for_events(self._register_tor_event, event_types) diff --git a/nyx/popups.py b/nyx/popups.py index 559f006..87e65e3 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -25,6 +25,7 @@ import nyx import nyx.arguments import nyx.controller import nyx.curses +import nyx.log import nyx.panel from nyx.curses import RED, GREEN, YELLOW, CYAN, WHITE, NORMAL, BOLD, HIGHLIGHT @@ -417,7 +418,7 @@ def select_event_types(): return None -def new_select_event_types(): +def new_select_event_types(initial_selection): """ Presents a chart of event types Tor supports. The user can select a set of events. @@ -433,8 +434,9 @@ def new_select_event_types(): return events = events.split() + events = nyx.log.TOR_RUNLEVELS + [event for event in events if event not in nyx.log.TOR_RUNLEVELS] selection = 0 - selected_events = [] + selected_events = initial_selection def _render(subwindow): subwindow.box() @@ -444,7 +446,7 @@ def new_select_event_types(): for i, line in enumerate(tor_events): for j, in_line in enumerate(line): - x = subwindow.addstr(j * 30 + 1, i + 1, '[X]' if (i * 3 + j) in selected_events else '[ ]') + x = subwindow.addstr(j * 30 + 1, i + 1, '[X]' if in_line in selected_events else '[ ]') x = subwindow.addstr(x, i + 1, in_line, HIGHLIGHT if selection == (i * 3 + j) else NORMAL) x = 30 @@ -467,14 +469,14 @@ def new_select_event_types(): elif key.match('right'): selection = min(len(events) + 1, selection + 1) elif key.is_selection(): - if selection in selected_events: - selected_events.remove(selection) - elif selection == len(events): - return set([events[i] for i in selected_events]) + if selection == len(events): + return set(selected_events) elif selection == (len(events) + 1): return None + elif events[selection] in selected_events: + selected_events.remove(events[selection]) else: - selected_events.append(selection) + selected_events.append(events[selection]) elif key.match('esc'): return None

1 0

[nyx/master] Added Tor runlevels and nyx runlevels
by atagar＠torproject.org 15 May '16

15 May '16

commit e1457a7397885a3a61157bcc131df1cec42f73c1 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Mon May 9 02:18:36 2016 +0400 Added Tor runlevels and nyx runlevels --- nyx/popups.py | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/nyx/popups.py b/nyx/popups.py index 87e65e3..54c141a 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -434,7 +434,8 @@ def new_select_event_types(initial_selection): return events = events.split() - events = nyx.log.TOR_RUNLEVELS + [event for event in events if event not in nyx.log.TOR_RUNLEVELS] + events = nyx.log.TOR_RUNLEVELS + nyx.log.NYX_RUNLEVELS + [event for event in events if event not in nyx.log.TOR_RUNLEVELS] + tor_events = [events[i+10:i + 13] for i in xrange(0, len(events) - 10, 3)] selection = 0 selected_events = initial_selection @@ -442,18 +443,28 @@ def new_select_event_types(initial_selection): subwindow.box() subwindow.addstr(0, 0, 'Event Types:', HIGHLIGHT) - tor_events = [events[i:i + 3] for i in xrange(0, len(events), 3)] + x = subwindow.addstr(1, 1, "Tor Runlevel:") + for i, line in enumerate(events[:5]): + x = subwindow.addstr(x + 3, 1, '[X]' if line in selected_events else '[ ]') + x = subwindow.addstr(x, 1, line, HIGHLIGHT if selection == i else NORMAL) + + x = subwindow.addstr(1, 2, "Nyx Runlevel:") + for i, line in enumerate(events[5:10]): + x = subwindow.addstr(x + 3, 2, '[X]' if line in selected_events else '[ ]') + x = subwindow.addstr(x, 2, line[4:], HIGHLIGHT if selection == (i + 5) else NORMAL) + + subwindow.hline(1, 3, 78) for i, line in enumerate(tor_events): for j, in_line in enumerate(line): - x = subwindow.addstr(j * 30 + 1, i + 1, '[X]' if in_line in selected_events else '[ ]') - x = subwindow.addstr(x, i + 1, in_line, HIGHLIGHT if selection == (i * 3 + j) else NORMAL) + x = subwindow.addstr(j * 25 + 1, i + 4, '[X]' if in_line in selected_events else '[ ]') + x = subwindow.addstr(x, i + 4, in_line, HIGHLIGHT if selection == (i * 3 + j + 10) else NORMAL) x = 30 for i, line in enumerate(['Ok', 'Cancel']): - x = subwindow.addstr(x, len(tor_events) + 2, '[') - x = subwindow.addstr(x, len(tor_events) + 2, line, HIGHLIGHT if selection == (len(events) + i) else NORMAL) - x = subwindow.addstr(x, len(tor_events) + 2, ']') + x = subwindow.addstr(x, len(tor_events) + 5, '[') + x = subwindow.addstr(x, len(tor_events) + 5, line, HIGHLIGHT if selection == (len(events) + i) else NORMAL) + x = subwindow.addstr(x, len(tor_events) + 5, ']') with nyx.curses.CURSES_LOCK: while True: @@ -461,9 +472,23 @@ def new_select_event_types(initial_selection): key = nyx.curses.key_input() if key.match('up'): - selection = max(0, selection - 3) + if selection >= 5 and selection <= 9: + selection -= 5 + elif selection >= 10 and selection <= 12: + selection = 5 + elif selection == len(events) or selection == (len(events) + 1): + selection = len(events) - 1 + else: + selection = max(0, selection - 3) elif key.match('down'): - selection = min(len(events) + 1, selection + 3) + if selection >= 0 and selection <=4: + selection += 5 + elif selection >= 5 and selection <=9: + selection = 10 + elif selection >= (((len(tor_events) -1) * 3) + 10) and selection < len(events): + selection = len(events) + else: + selection = min(len(events) + 1, selection + 3) elif key.match('left'): selection = max(0, selection - 1) elif key.match('right'):

1 0

[nyx/master] Tidy up new event dialog
by atagar＠torproject.org 15 May '16

15 May '16

commit ba96677c845de35a562a9c2b857aa96a5261dc30 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 14 12:15:27 2016 -0700 Tidy up new event dialog Dialog was functional but had a few rough edges... * Canceling the dialog didn't work. It still applied any selections we had made due to in-place modifications of our 'initial_selection'. * Simplified our conditionals and dropped the tor_events two dimensional array (unnecessary, and made my head hurt). * Showing the same runlevel names for tor and nyx. Users don't care about our naming differences, and this both looks better and makes them line up. * Moved our 'Ok' and 'Cancel' options to the lower right for consistency. * Use 'T' connectors for the horizontal line. I need to figure out a better option than _addch() but meh. Good enough for now. --- nyx/panel/log.py | 1 + nyx/popups.py | 110 +++++++++++++++++++++++++++++-------------------------- 2 files changed, 60 insertions(+), 51 deletions(-) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index b0789c3..d7b4ede 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -147,6 +147,7 @@ class LogPanel(nyx.panel.DaemonPanel): Prompts the user to select the events being listened for. TODO: Replace show_event_selection_prompt() with this method. """ + event_types = nyx.popups.new_select_event_types(self._event_types) if event_types and event_types != self._event_types: diff --git a/nyx/popups.py b/nyx/popups.py index 54c141a..905b734 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -18,6 +18,9 @@ Popup dialogs provided by our interface. confirm_save_torrc - confirmation dialog for saving the torrc """ +from __future__ import absolute_import + +import curses import math import operator @@ -393,7 +396,7 @@ def select_event_types(): Presents a chart of event types we support, with a prompt for the user to select a set. - :returns: **list** of event types the user has selected or **None** if dialog + :returns: **set** of event types the user has selected or **None** if dialog is canceled """ @@ -420,51 +423,53 @@ def select_event_types(): def new_select_event_types(initial_selection): """ - Presents a chart of event types Tor supports. The user can select a set of - events. + Presents chart of events for the user to select from. - TODO: Replace select_event_types() method with this method. + :param list initial_selection: initial events to be checked - :returns: **list** of event types the user has selected or **None** if dialog + :returns: **set** of event types the user has selected or **None** if dialog is canceled """ - events = nyx.tor_controller().get_info('events/names', None) - if not events: + event_names = nyx.tor_controller().get_info('events/names', None) + + if not event_names: return - events = events.split() - events = nyx.log.TOR_RUNLEVELS + nyx.log.NYX_RUNLEVELS + [event for event in events if event not in nyx.log.TOR_RUNLEVELS] - tor_events = [events[i+10:i + 13] for i in xrange(0, len(events) - 10, 3)] selection = 0 - selected_events = initial_selection + selected_events = list(initial_selection) + events = [event for event in event_names.split() if event not in nyx.log.TOR_RUNLEVELS] def _render(subwindow): subwindow.box() subwindow.addstr(0, 0, 'Event Types:', HIGHLIGHT) - x = subwindow.addstr(1, 1, "Tor Runlevel:") - for i, line in enumerate(events[:5]): - x = subwindow.addstr(x + 3, 1, '[X]' if line in selected_events else '[ ]') - x = subwindow.addstr(x, 1, line, HIGHLIGHT if selection == i else NORMAL) + x = subwindow.addstr(1, 1, 'Tor Runlevel:') + + for i, event in enumerate(nyx.log.TOR_RUNLEVELS): + x = subwindow.addstr(x + 4, 1, '[X]' if event in selected_events else '[ ]') + x = subwindow.addstr(x + 1, 1, event, HIGHLIGHT if selection == i else NORMAL) - x = subwindow.addstr(1, 2, "Nyx Runlevel:") - for i, line in enumerate(events[5:10]): - x = subwindow.addstr(x + 3, 2, '[X]' if line in selected_events else '[ ]') - x = subwindow.addstr(x, 2, line[4:], HIGHLIGHT if selection == (i + 5) else NORMAL) + x = subwindow.addstr(1, 2, 'Nyx Runlevel:') + + for i, event in enumerate(nyx.log.NYX_RUNLEVELS): + x = subwindow.addstr(x + 4, 2, '[X]' if event in selected_events else '[ ]') + x = subwindow.addstr(x + 1, 2, nyx.log.TOR_RUNLEVELS[i], HIGHLIGHT if selection == (i + 5) else NORMAL) subwindow.hline(1, 3, 78) + subwindow._addch(0, 3, curses.ACS_LTEE) + subwindow._addch(79, 3, curses.ACS_RTEE) + + for i, event in enumerate(events): + x = subwindow.addstr((i % 3) * 25 + 1, i / 3 + 4, '[X]' if event in selected_events else '[ ]') + x = subwindow.addstr(x + 1, i / 3 + 4, event, HIGHLIGHT if selection == (i + 10) else NORMAL) - for i, line in enumerate(tor_events): - for j, in_line in enumerate(line): - x = subwindow.addstr(j * 25 + 1, i + 4, '[X]' if in_line in selected_events else '[ ]') - x = subwindow.addstr(x, i + 4, in_line, HIGHLIGHT if selection == (i * 3 + j + 10) else NORMAL) + x = subwindow.width - 14 - x = 30 - for i, line in enumerate(['Ok', 'Cancel']): - x = subwindow.addstr(x, len(tor_events) + 5, '[') - x = subwindow.addstr(x, len(tor_events) + 5, line, HIGHLIGHT if selection == (len(events) + i) else NORMAL) - x = subwindow.addstr(x, len(tor_events) + 5, ']') + for i, option in enumerate(['Ok', 'Cancel']): + x = subwindow.addstr(x, subwindow.height - 2, '[') + x = subwindow.addstr(x, subwindow.height - 2, option, BOLD, HIGHLIGHT if selection == len(events) + 10 + i else NORMAL) + x = subwindow.addstr(x, subwindow.height - 2, ']') + 1 with nyx.curses.CURSES_LOCK: while True: @@ -472,36 +477,39 @@ def new_select_event_types(initial_selection): key = nyx.curses.key_input() if key.match('up'): - if selection >= 5 and selection <= 9: - selection -= 5 - elif selection >= 10 and selection <= 12: + if selection < 10: + selection = max(selection - 5, 0) + elif selection < 13: selection = 5 - elif selection == len(events) or selection == (len(events) + 1): - selection = len(events) - 1 + elif selection < len(events) + 10: + selection -= 3 else: - selection = max(0, selection - 3) + selection = len(events) + 9 elif key.match('down'): - if selection >= 0 and selection <=4: - selection += 5 - elif selection >= 5 and selection <=9: - selection = 10 - elif selection >= (((len(tor_events) -1) * 3) + 10) and selection < len(events): - selection = len(events) - else: - selection = min(len(events) + 1, selection + 3) + if selection < 10: + selection = min(selection + 5, 10) + elif selection < len(events) + 10: + selection = min(selection + 3, len(events) + 10) elif key.match('left'): - selection = max(0, selection - 1) + selection = max(selection - 1, 0) elif key.match('right'): - selection = min(len(events) + 1, selection + 1) + selection = min(selection + 1, len(events) + 11) elif key.is_selection(): - if selection == len(events): - return set(selected_events) - elif selection == (len(events) + 1): - return None - elif events[selection] in selected_events: - selected_events.remove(events[selection]) + if selection < 5: + selected_event = nyx.log.TOR_RUNLEVELS[selection] + elif selection < 10: + selected_event = nyx.log.NYX_RUNLEVELS[selection - 5] + elif selection == len(events) + 10: + return set(selected_events) # selected 'Ok' + elif selection == len(events) + 11: + return None # selected 'Cancel' + else: + selected_event = events[selection - 10] + + if selected_event in selected_events: + selected_events.remove(selected_event) else: - selected_events.append(events[selection]) + selected_events.append(selected_event) elif key.match('esc'): return None

1 0

[nyx/master] Replacement event selection dialog
by atagar＠torproject.org 15 May '16

15 May '16

commit 6400dd5003062fb94ceb27fe6d1d839cbaece5c1 Merge: c8b4852 ba96677 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 14 22:34:01 2016 -0700 Replacement event selection dialog Alternate that'll soon be replacing the dialog for selecting events... https://trac.torproject.org/projects/tor/ticket/18499 nyx/panel/log.py | 13 ++++++++ nyx/popups.py | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 111 insertions(+), 1 deletion(-)

1 0

[torbirdy/master] Configure Riseup accounts automatically
by sukhbir＠torproject.org 14 May '16

14 May '16

commit d9f74a8f71c80eb70ad37a68f8ba743b1779414c Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu May 12 17:51:44 2016 -0400 Configure Riseup accounts automatically --- chrome/content/emailwizard.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index d38828e..9d88d70 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -90,18 +90,24 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { config.incoming.auth = 3; config.outgoing.auth = 3; - // We will deal with Gmail later because it makes it easier to handle - // OAuth2 with the manual configuration. - let emailDomain = email.split("@")[1]; - if (emailDomain === "gmail.com") { - pub.isGmail = true; - } - // Default the outgoing SMTP port. config.outgoing.port = 465; config.outgoing.hostname = "smtp.%EMAILDOMAIN%"; + let emailDomain = email.split("@")[1]; + // Gmail and Riseup settings. + switch (emailDomain) { + case "gmail.com": + // Gmail uses OAuth2, which we deal with later. + pub.isGmail = true; + break; + case "riseup.net": + config.incoming.hostname = "mail.%EMAILDOMAIN%"; + config.outgoing.hostname = "mail.%EMAILDOMAIN%"; + break; + } + replaceVariables(config, realname, email, password); config.rememberPassword = rememberPassword && !!password;

1 0

[torbirdy/master] Set calender timezone to UTC
by sukhbir＠torproject.org 14 May '16

14 May '16

commit ff0bf3cad0d223342760c3d0275073f6c3bc527b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu May 12 17:52:40 2016 -0400 Set calender timezone to UTC --- components/torbirdy.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 2740c64..238c089 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -227,7 +227,6 @@ const TorBirdyPrefs = { // The default key server should be a hidden service and this is the only known one (it's part of the normal SKS network) "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion", - // Force GnuPG to use SHA512. "extensions.enigmail.mimeHashAlgorithm": 5, @@ -301,7 +300,9 @@ const TorBirdyPrefs = { // Mozilla Lightning. "calendar.useragent.extra": "", - "calendar.timezone.local": "", + // We have to set a timezone otherwise the system time is used. "UTC" or + // "GMT" is not an option so we set it to Europe/London. + "calendar.timezone.local": "Europe/London", // All preferences have been set: now enable TorBirdy. "extensions.torbirdy.protected": true,

1 0

[torbirdy/master] Secure NNTP settings on account creation (#7847)
by sukhbir＠torproject.org 14 May '16

14 May '16

commit 0f1d01af3ab0572f4ffc25bb67c1b03afc9591f5 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri May 13 18:26:10 2016 -0400 Secure NNTP settings on account creation (#7847) --- chrome.manifest | 1 + chrome/content/nntpwizard.js | 90 +++++++++++++++++++++++++++++++++++++++++++ chrome/content/nntpwizard.xul | 10 +++++ 3 files changed, 101 insertions(+) diff --git a/chrome.manifest b/chrome.manifest index 431b4c9..33b0a10 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -4,6 +4,7 @@ overlay chrome://messenger/content/messenger.xul chrome://castironthunderbirdclu overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://castironthunderbirdclub/content/composeoverlay.xul overlay chrome://messenger/content/accountcreation/emailWizard.xul chrome://castironthunderbirdclub/content/emailwizard.xul overlay chrome://messenger-newsblog/content/feedAccountWizard.xul chrome://castironthunderbirdclub/content/feedwizard.xul +overlay chrome://messenger/content/AccountWizard.xul chrome://castironthunderbirdclub/content/nntpwizard.xul component {ebd85413-18c8-4265-a708-a8890ec8d1ed} components/torbirdy.js contract @torproject.org/torbirdy;1 {ebd85413-18c8-4265-a708-a8890ec8d1ed} diff --git a/chrome/content/nntpwizard.js b/chrome/content/nntpwizard.js new file mode 100644 index 0000000..90051bb --- /dev/null +++ b/chrome/content/nntpwizard.js @@ -0,0 +1,90 @@ +Components.utils.import("resource://gre/modules/Preferences.jsm"); + +if (!org) var org = {}; +if (!org.torbirdy) org.torbirdy = {}; + +if (!org.torbirdy.nntpwizard) org.torbirdy.nntpwizard = new function() { + var pub = {}; + + pub.fixNntpPort = function(account) { + let key = account.incomingServer.key; + + let pref_spec = [ + // Set the port to 563 and connection security to SSL/TLS (NNTPS). + ['mail.server.%serverkey%.port', 563], + ['mail.server.%serverkey%.socketType', 3] + ]; + + for each (var [pref_template, value] in pref_spec) { + let pref = pref_template.replace("%serverkey%", key); + Preferences.set(pref, value); + } + }; + + // This is from mailnews/base/prefs/content/AccountWizard.xul : FinishAccount(). + FinishAccount = function() { + try { + var pageData = GetPageData(); + + var accountData= gCurrentAccountData; + + if (!accountData) + { + accountData = new Object; + // Time to set the smtpRequiresUsername attribute + if (!serverIsNntp(pageData)) + accountData.smtpRequiresUsername = true; + } + + // we may need local folders before account is "Finished" + // if it's a pop3 account which defers to Local Folders. + verifyLocalFoldersAccount(); + + PageDataToAccountData(pageData, accountData); + + FixupAccountDataForIsp(accountData); + + // we might be simply finishing another account + if (!gCurrentAccount) + gCurrentAccount = createAccount(accountData); + + // transfer all attributes from the accountdata + finishAccount(gCurrentAccount, accountData); + + setupCopiesAndFoldersServer(gCurrentAccount, getCurrentServerIsDeferred(pageData), accountData); + + if (gCurrentAccount.incomingServer.canBeDefaultServer) + EnableCheckMailAtStartUpIfNeeded(gCurrentAccount); + + if (!document.getElementById("downloadMsgs").hidden) { + // skip the default biff, we will load messages manually if needed + window.opener.gLoadStartFolder = false; + if (document.getElementById("downloadMsgs").checked) { + window.opener.gNewAccountToLoad = gCurrentAccount; // load messages for new POP account + } + } + + pub.fixNntpPort(gCurrentAccount); + + // in case we crash, force us a save of the prefs file NOW + try { + MailServices.accounts.saveAccountInfo(); + } + catch (ex) { + dump("Error saving account info: " + ex + "\n"); + } + window.close(); + if(top.okCallback) + { + var state = true; + //dump("finish callback"); + top.okCallback(state); + } + } + catch(ex) { + dump("FinishAccount failed, " + ex +"\n"); + } + }; + + return pub; +}; diff --git a/chrome/content/nntpwizard.xul b/chrome/content/nntpwizard.xul new file mode 100644 index 0000000..c9ccea1 --- /dev/null +++ b/chrome/content/nntpwizard.xul @@ -0,0 +1,10 @@ +<?xml version="1.0"?> + +<?xml-stylesheet href="chrome://messenger/skin/accountWizard.css" type="text/css"?> + +<wizard id="castironthunderbirdclub-nntpwizard-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + + <script type="application/javascript" src="chrome://castironthunderbirdclub/content/nntpwizard.js" /> + +</wizard>

1 0