- tor-commits - lists.torproject.org

[nyx/master] Move key_input() to nyx.curses
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit a147f342171e70c3b756ad38cb9145ff7e67c2ac Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 15 10:08:25 2016 -0700 Move key_input() to nyx.curses This has always belonged as a function. This allows us to drop direct curses usage from the controller - only spots left are a couple addch() calls in the panels! --- nyx/controller.py | 22 ++--------------- nyx/curses.py | 69 ++++++++++++++++++++++++++++++++++------------------- nyx/menu/menu.py | 2 +- nyx/panel/config.py | 2 +- nyx/panel/graph.py | 2 +- nyx/popups.py | 16 ++++++------- 6 files changed, 57 insertions(+), 56 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 7b96134..602c85e 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -3,10 +3,7 @@ Main interface loop for nyx, periodically redrawing the screen and issuing user input to the proper panels. """ -from __future__ import absolute_import - import time -import curses import threading import nyx.curses @@ -34,8 +31,7 @@ NYX_CONTROLLER = None def conf_handler(key, value): if key == 'features.redrawRate': - # https://docs.python.org/2/library/curses.html?#curses.halfdelay - return min(max(1, value), 25.5) + return max(1, value) elif key == 'features.refreshRate': return max(0, value) @@ -146,20 +142,6 @@ class Controller: return self._screen - def key_input(self, input_timeout = None): - """ - Gets keystroke from the user. - - :param int input_timeout: duration in seconds to wait for user input - """ - - if input_timeout: - curses.halfdelay(input_timeout * 10) - else: - curses.cbreak() # wait indefinitely for key presses (no timeout) - - return nyx.curses.KeyInput(self.get_screen().getch()) - def get_page_count(self): """ Provides the number of pages the interface has. This may be zero if all @@ -436,7 +418,7 @@ def start_nyx(stdscr): if override_key: key, override_key = override_key, None else: - key = control.key_input(CONFIG['features.redrawRate']) + key = nyx.curses.key_input(CONFIG['features.redrawRate']) if key.match('right'): control.next_page() diff --git a/nyx/curses.py b/nyx/curses.py index a2d0dfa..0b6e24a 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -8,8 +8,9 @@ if we want Windows support in the future too. :: - curses_attr - curses encoded text attribute start - initializes curses with the given function + key_input - get keypress by user + curses_attr - curses encoded text attribute is_color_supported - checks if terminal supports color output get_color_override - provides color we override requests with @@ -131,29 +132,6 @@ CONFIG = stem.util.conf.config_dict('nyx', { }, conf_handler) -def curses_attr(*attributes): - """ - Provides encoding for the given curses text attributes. - - :param list attributes: curses text attributes and colors - - :returns: **int** that can be used with curses - """ - - encoded = curses.A_NORMAL - - for attr in attributes: - if attr in Color: - override = get_color_override() - encoded |= _color_attr()[override if override else attr] - elif attr in Attr: - encoded |= CURSES_ATTRIBUTES[attr] - else: - raise ValueError("'%s' isn't a valid curses text attribute" % attr) - - return encoded - - def start(function, transparent_background = False, cursor = True): """ Starts a curses interface, delegating to the given function. The function @@ -186,6 +164,49 @@ def start(function, transparent_background = False, cursor = True): curses.wrapper(_wrapper) +def key_input(input_timeout = None): + """ + Gets a key press from the user. + + :param int input_timeout: duration in seconds to wait for user input + + :returns: :class:`~nyx.curses.KeyInput` that was pressed + """ + + if input_timeout: + # Timeout can't be longer than 25.5 seconds... + # https://docs.python.org/2/library/curses.html?#curses.halfdelay + + curses.halfdelay(min(input_timeout, 25.5) * 10) + else: + curses.cbreak() # wait indefinitely for key presses (no timeout) + + return KeyInput(CURSES_SCREEN.getch()) + + +def curses_attr(*attributes): + """ + Provides encoding for the given curses text attributes. + + :param list attributes: curses text attributes and colors + + :returns: **int** that can be used with curses + """ + + encoded = curses.A_NORMAL + + for attr in attributes: + if attr in Color: + override = get_color_override() + encoded |= _color_attr()[override if override else attr] + elif attr in Attr: + encoded |= CURSES_ATTRIBUTES[attr] + else: + raise ValueError("'%s' isn't a valid curses text attribute" % attr) + + return encoded + + def is_color_supported(): """ Checks if curses currently supports rendering colors. diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py index 7d49b3e..da22362 100644 --- a/nyx/menu/menu.py +++ b/nyx/menu/menu.py @@ -119,7 +119,7 @@ def show_menu(): popup.win.refresh() - cursor.handle_key(control.key_input()) + cursor.handle_key(nyx.curses.key_input()) # redraws the rest of the interface if we're rendering on it again diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 45f82a8..5b8a636 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -213,7 +213,7 @@ class ConfigPanel(nyx.panel.Panel): popup.addstr(0, 0, 'Torrc to save:', HIGHLIGHT) popup.win.refresh() - key = nyx.controller.get_controller().key_input() + key = nyx.curses.key_input() if key.match('left'): selection = max(0, selection - 1) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 2b3714e..257716e 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -480,7 +480,7 @@ class GraphPanel(nyx.panel.Panel): while True: msg = 'press the down/up to resize the graph, and enter when done' control.set_msg(msg, BOLD, True) - key = control.key_input() + key = nyx.curses.key_input() if key.match('down'): # don't grow the graph if it's already consuming the whole display diff --git a/nyx/popups.py b/nyx/popups.py index e6df000..61273f3 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -111,7 +111,7 @@ def show_msg(msg, max_wait = None, attr = HIGHLIGHT): control = nyx.controller.get_controller() control.set_msg(msg, attr, True) - key_press = control.key_input(max_wait) + key_press = nyx.curses.key_input(max_wait) control.set_msg() return key_press @@ -176,7 +176,7 @@ def show_help_popup(): popup.addstr(7, 2, 'Press any key...') popup.win.refresh() - exit_key = control.key_input() + exit_key = nyx.curses.key_input() if not exit_key.is_selection() and not exit_key.is_scroll() and \ not exit_key.match('left', 'right'): @@ -192,8 +192,6 @@ def show_about_popup(): with popup_window(9, 80) as (popup, _, height): if popup: - control = nyx.controller.get_controller() - popup.win.box() popup.addstr(0, 0, 'About:', HIGHLIGHT) popup.addstr(1, 2, 'nyx, version %s (released %s)' % (__version__, __release_date__), BOLD) @@ -203,7 +201,7 @@ def show_about_popup(): popup.addstr(7, 2, 'Press any key...') popup.win.refresh() - control.key_input() + nyx.curses.key_input() def show_count_dialog(title, counts): @@ -250,7 +248,7 @@ def show_count_dialog(title, counts): popup.addstr(0, 0, title, HIGHLIGHT) popup.win.refresh() - nyx.controller.get_controller().key_input() + nyx.curses.key_input() def show_sort_dialog(title, options, old_selection, option_colors): @@ -304,7 +302,7 @@ def show_sort_dialog(title, options, old_selection, option_colors): popup.win.refresh() - key = nyx.controller.get_controller().key_input() + key = nyx.curses.key_input() if key.match('left'): cursor_location = max(0, cursor_location - 1) @@ -405,7 +403,7 @@ def show_menu(title, options, old_selection): popup.win.refresh() - key = control.key_input() + key = nyx.curses.key_input() if key.match('up'): selection = max(0, selection - 1) @@ -457,7 +455,7 @@ def show_descriptor_popup(fingerprint, color, max_width, is_close_key): _draw(popup, title, lines, color, scroller.location(), show_line_numbers) redraw = False - key = nyx.controller.get_controller().key_input() + key = nyx.curses.key_input() if key.is_scroll(): redraw = scroller.handle_key(key, len(lines), height - 2)

1 0

[nyx/master] Replace nyx.curses.setup() with start()
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit 731cfe8745b8dc631497974888c38b8bdadf9ae7 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 15 09:53:07 2016 -0700 Replace nyx.curses.setup() with start() No reason not to have this replace curses.wrapper() too. This way we can drop direct curses usage from our starter as well. --- nyx/controller.py | 2 -- nyx/curses.py | 41 +++++++++++++++++++++++++++-------------- nyx/starter.py | 5 +---- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index e3bb354..7b96134 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -410,8 +410,6 @@ def start_nyx(stdscr): for panel_impl in control.get_daemon_panels(): panel_impl.start() - nyx.curses.setup(transparent_background = True, cursor = False) - # logs the initialization time log.info('nyx started (initialization took %0.3f seconds)' % (time.time() - CONFIG['start_time'])) diff --git a/nyx/curses.py b/nyx/curses.py index fa2a77c..a2d0dfa 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -9,7 +9,7 @@ if we want Windows support in the future too. :: curses_attr - curses encoded text attribute - setup - configures curses settings + start - initializes curses with the given function is_color_supported - checks if terminal supports color output get_color_override - provides color we override requests with @@ -72,6 +72,8 @@ import stem.util.system from nyx import msg, log +CURSES_SCREEN = None + # Text colors and attributes. These are *very* commonly used so including # shorter aliases (so they can be referenced as just GREEN or BOLD). @@ -152,25 +154,36 @@ def curses_attr(*attributes): return encoded -def setup(transparent_background = False, cursor = True): +def start(function, transparent_background = False, cursor = True): """ - One time setup operations for configuring curses. + Starts a curses interface, delegating to the given function. The function + should accept a single argument for the curses screen. + :param funtion: function to invoke when curses starts :param bool transparent_background: allows background transparency :param bool cursor: makes cursor visible """ - if transparent_background: - try: - curses.use_default_colors() - except curses.error: - pass - - if not cursor: - try: - curses.curs_set(0) - except curses.error: - pass + def _wrapper(stdscr): + global CURSES_SCREEN + + CURSES_SCREEN = stdscr + + if transparent_background: + try: + curses.use_default_colors() + except curses.error: + pass + + if not cursor: + try: + curses.curs_set(0) + except curses.error: + pass + + function(stdscr) + + curses.wrapper(_wrapper) def is_color_supported(): diff --git a/nyx/starter.py b/nyx/starter.py index 6697e21..09f5057 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -4,9 +4,6 @@ information. This starts the application, parsing arguments and getting a Tor connection. """ -from __future__ import absolute_import - -import curses import locale import logging import os @@ -86,7 +83,7 @@ def main(config): _set_process_name() try: - curses.wrapper(nyx.controller.start_nyx) + nyx.curses.start(nyx.controller.start_nyx, transparent_background = True, cursor = False) except UnboundLocalError as exc: if os.environ['TERM'] != 'xterm': print(msg('setup.unknown_term', term = os.environ['TERM']))

1 0

[nyx/master] Perform cbreak in key_input()
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit b552c4ef7f8a1a64378652c785cef0d8e04c93b0 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 15 08:58:29 2016 -0700 Perform cbreak in key_input() Our cbreak and halfdelay modes are used to determine if we time out requests for user input... https://www.ibm.com/support/knowledgecenter/ssw_aix_53/com.ibm.aix.genprogc… As such we might as well have this live in the one spot we call the curses getch() method. This was only scattered around due to old copy-pasted code. --- nyx/controller.py | 12 +++++++++--- nyx/menu/menu.py | 5 ----- nyx/panel/graph.py | 2 -- nyx/popups.py | 20 +++----------------- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 54508aa..e3bb354 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -146,11 +146,18 @@ class Controller: return self._screen - def key_input(self): + def key_input(self, input_timeout = None): """ Gets keystroke from the user. + + :param int input_timeout: duration in seconds to wait for user input """ + if input_timeout: + curses.halfdelay(input_timeout * 10) + else: + curses.cbreak() # wait indefinitely for key presses (no timeout) + return nyx.curses.KeyInput(self.get_screen().getch()) def get_page_count(self): @@ -431,8 +438,7 @@ def start_nyx(stdscr): if override_key: key, override_key = override_key, None else: - curses.halfdelay(CONFIG['features.redrawRate'] * 10) - key = nyx.curses.KeyInput(stdscr.getch()) + key = control.key_input(CONFIG['features.redrawRate']) if key.match('right'): control.next_page() diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py index 1deab02..7d49b3e 100644 --- a/nyx/menu/menu.py +++ b/nyx/menu/menu.py @@ -2,10 +2,6 @@ Display logic for presenting the menu. """ -from __future__ import absolute_import - -import curses - import nyx.curses import nyx.popups import nyx.controller @@ -123,7 +119,6 @@ def show_menu(): popup.win.refresh() - curses.cbreak() cursor.handle_key(control.key_input()) # redraws the rest of the interface if we're rendering on it again diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 818769c..2b3714e 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -13,7 +13,6 @@ Downloaded (0.0 B/sec): Uploaded (0.0 B/sec): import collections import copy -import curses import time import nyx.controller @@ -481,7 +480,6 @@ class GraphPanel(nyx.panel.Panel): while True: msg = 'press the down/up to resize the graph, and enter when done' control.set_msg(msg, BOLD, True) - curses.cbreak() # TODO: can we drop this? key = control.key_input() if key.match('down'): diff --git a/nyx/popups.py b/nyx/popups.py index 70db69a..e6df000 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -2,10 +2,7 @@ Functions for displaying popups in the interface. """ -from __future__ import absolute_import - import math -import curses import operator import nyx.controller @@ -99,14 +96,14 @@ def input_prompt(msg, initial_value = ''): return user_input -def show_msg(msg, max_wait = -1, attr = HIGHLIGHT): +def show_msg(msg, max_wait = None, attr = HIGHLIGHT): """ Displays a single line message on the control line for a set time. Pressing any key will end the message. This returns the key pressed. Arguments: msg - message to be displayed to the user - max_wait - time to show the message, indefinite if -1 + max_wait - time to show the message, indefinite if None attr - attributes with which to draw the message """ @@ -114,12 +111,7 @@ def show_msg(msg, max_wait = -1, attr = HIGHLIGHT): control = nyx.controller.get_controller() control.set_msg(msg, attr, True) - if max_wait == -1: - curses.cbreak() - else: - curses.halfdelay(max_wait * 10) - - key_press = control.key_input() + key_press = control.key_input(max_wait) control.set_msg() return key_press @@ -184,7 +176,6 @@ def show_help_popup(): popup.addstr(7, 2, 'Press any key...') popup.win.refresh() - curses.cbreak() exit_key = control.key_input() if not exit_key.is_selection() and not exit_key.is_scroll() and \ @@ -212,7 +203,6 @@ def show_about_popup(): popup.addstr(7, 2, 'Press any key...') popup.win.refresh() - curses.cbreak() control.key_input() @@ -260,7 +250,6 @@ def show_count_dialog(title, counts): popup.addstr(0, 0, title, HIGHLIGHT) popup.win.refresh() - curses.cbreak() nyx.controller.get_controller().key_input() @@ -288,7 +277,6 @@ def show_sort_dialog(title, options, old_selection, option_colors): if popup: new_selections = [] # new ordering cursor_location = 0 # index of highlighted option - curses.cbreak() # wait indefinitely for key presses (no timeout) selection_options = list(options) selection_options.append('Cancel') @@ -403,8 +391,6 @@ def show_menu(title, options, old_selection): top_panel.set_title_visible(False) top_panel.redraw(True) - curses.cbreak() # wait indefinitely for key presses (no timeout) - while True: popup.win.erase() popup.win.box()

1 0

[nyx/master] Curses setup() function
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit 505f4e623097d29fcc7361d375b8e11a411a4971 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 15 08:43:29 2016 -0700 Curses setup() function Moving our one-time curses setup to the nyx.curses module. --- nyx/controller.py | 18 +++--------------- nyx/curses.py | 22 ++++++++++++++++++++++ nyx/menu/menu.py | 2 +- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 9a75f60..54508aa 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -102,7 +102,7 @@ class Controller: top to bottom on the page. Arguments: - stdscr - curses window + stdscr - curses window """ self._screen = stdscr @@ -381,7 +381,7 @@ def start_nyx(stdscr): Main draw loop context. Arguments: - stdscr - curses window + stdscr - curses window """ global NYX_CONTROLLER @@ -403,19 +403,7 @@ def start_nyx(stdscr): for panel_impl in control.get_daemon_panels(): panel_impl.start() - # allows for background transparency - - try: - curses.use_default_colors() - except curses.error: - pass - - # makes the cursor invisible - - try: - curses.curs_set(0) - except curses.error: - pass + nyx.curses.setup(transparent_background = True, cursor = False) # logs the initialization time diff --git a/nyx/curses.py b/nyx/curses.py index 18da7f2..fa2a77c 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -9,6 +9,7 @@ if we want Windows support in the future too. :: curses_attr - curses encoded text attribute + setup - configures curses settings is_color_supported - checks if terminal supports color output get_color_override - provides color we override requests with @@ -151,6 +152,27 @@ def curses_attr(*attributes): return encoded +def setup(transparent_background = False, cursor = True): + """ + One time setup operations for configuring curses. + + :param bool transparent_background: allows background transparency + :param bool cursor: makes cursor visible + """ + + if transparent_background: + try: + curses.use_default_colors() + except curses.error: + pass + + if not cursor: + try: + curses.curs_set(0) + except curses.error: + pass + + def is_color_supported(): """ Checks if curses currently supports rendering colors. diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py index df7d499..1deab02 100644 --- a/nyx/menu/menu.py +++ b/nyx/menu/menu.py @@ -113,7 +113,7 @@ def show_menu(): draw_label = ' %s ' % top_level_item.get_label()[1] popup.addstr(0, draw_left, draw_label, BOLD, attr) - popup.addch(0, draw_left + len(draw_label), curses.ACS_VLINE) + popup.vline(0, draw_left + len(draw_label), 1) draw_left += len(draw_label) + 1

1 0

[webwml/master] Bug 18544: Adding Günes and Nicolas to the mentors list
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit 9a3a84b5d1604e09b8d22db33905e0fbf03a4933 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 14 13:55:55 2016 +0000 Bug 18544: Adding Günes and Nicolas to the mentors list --- getinvolved/en/volunteer.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index be21b59..b243544 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -1115,7 +1115,7 @@ verification issues</a> as part of the application process. <li> Panopticlick - Likely Mentors: Georg (GeKo) + Likely Mentors: Georg (GeKo), Günes Acar, Nicolas (boklm) The <a href="https://panopticlick.eff.org">Panopticlick project by the EFF</a>

1 0

[webwml/master] Add tails project idea
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit 26c390f4f2208c0d886ecb15a582f249a16c8aa5 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 15 09:09:32 2016 -0700 Add tails project idea Resurrecting a project from commit 186b0b6 anonym and asn would like to mentor this year. --- getinvolved/en/volunteer.wml | 108 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 95 insertions(+), 13 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index f0d2c8d..be21b59 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -48,15 +48,15 @@ <a id="Advocacy"></a> <h2><a class="anchor" href="#Advocacy">Advocacy</a></h2> <ol> - <li>Monitor some of our <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo">public mailing - lists</a>, like <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a>, <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays</a>, <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">tor-dev</a>, or <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev">tbb-dev</a>, - and summarize noteworthy exchanges into articles for <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news">Tor + <li>Monitor some of our <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo">public mailing + lists</a>, like <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a>, <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays</a>, <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">tor-dev</a>, or <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev">tbb-dev</a>, + and summarize noteworthy exchanges into articles for <a + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news">Tor Weekly News</a>.</li> <li>Create a presentation that can be used for various user group meetings around the world.</li> @@ -413,8 +413,8 @@ meetings around the world.</li> tracker</a>, <a href="https://www.torproject.org/projects/torbrowser/design/">design doc</a>)</h3> - Tor Browser is an easy-to-use, portable package of Tor, HTTPS-Everywhere, - NoScript, TorLauncher, Torbutton, and a Firefox fork, all preconfigured + Tor Browser is an easy-to-use, portable package of Tor, HTTPS-Everywhere, + NoScript, TorLauncher, Torbutton, and a Firefox fork, all preconfigured to work together out of the box. The modified copy of Firefox aims to resolve the privacy and security issues in mainline version. @@ -463,8 +463,8 @@ meetings around the world.</li> tracker</a>)</h3> - Provides Tor on the Android platform. The project is under active - development, updates to latest Tor releases, and working to stay up to + Provides Tor on the Android platform. The project is under active + development, updates to latest Tor releases, and working to stay up to date with all changes in Android and mobile threats. @@ -1443,6 +1443,88 @@ implementation. well as collect information about the occurrence of these type of attacks. </li> + + <a id="tailsServer"></a> + <li> + Tails server: Self-hosted services behind Tails-powered Tor hidden services + + Likely Mentors: anonym, George (asn) + Let's talk about group collaboration, communication and data sharing + infrastructure, such as chat servers, wikis, or file repositories. + Hosting such data and infrastructure in the cloud generally + implies to trust the service providers not to disclose content, usage or + users location information to third-parties. Hence, there are many threat + models in which cloud hosting is not suitable. + Tor partly answers the users location part; this is great, but + content is left unprotected. + There are two main ways to protect such content: either to encrypt it + client-side (security by design), or to avoid putting it into + untrusted hands in the first place. + Cloud solutions that offer security by design are rare and generally + not mature yet. The Tails server project is about exploring the + other side of the alternative: avoiding to put private data into + untrusted hands in the first place. + This is made possible thanks to Tor hidden services, that allow users + to offer location-hidden services, and make self-hosting possible in + many threat models. Self-hosting has its own lot of problems, however, + particularly in contexts where the physical security of the hosting + place is not assured. Combining Tor hidden services with Tails' + amnesia property and limited support for persistent encrypted data + allows to protect content, to a great degree, even in such contexts. + In short, setting up a new Tails server would be done by: + + <ol style="list-style-type: decimal"> + <li>Alice plugs a USB stick into a running desktop Tails system.</li> + <li>Alice uses a GUI to easily configure the needed services.</li> + <li>Alice unplugs the USB stick, that now contains encrypted services + configuration and data storage space.</li> + <li>Alice plugs that USB stick (and possibly a Tails Live CD) into the + old laptop that was dedicated to run Tails server.</li> + <li>Once booted, Alice enters the encryption passphrase either + directly using the keyboard or through a web interface listening on the + local network.</li> + <li>Then, Bob can use the configured services once he gets a hold on + the hidden service address. (The petname system for Tor hidden + services project would be very complementary to this one, by the + way.)</li> + </ol> + + Tails server should content itself with hardware that is a bit old + (such as a PIII-450 laptop with 256MB of RAM) and/or half broken (e.g. + non-functional hard-disk, screen or keyboard). + The challenges behind this project are: + + <ul> + <li>Design and write the services configuration GUI [keywords: edit + configuration files, upgrade between major Debian versions, + debconf].</li> + <li>How to create the hidden service key? [keywords: Vidalia, control + protocol].</li> + <li>Adapt the Tails boot process to allow switching to "server + mode" when appropriate.</li> + <li>Add support, to the Tails persistence setup process, for asking an + encryption passphrase without X, and possibly with a broken keyboard + and/or screen [keywords: local network, SSL/TLS?, certificate?].</li> + </ul> + + This project can easily grow quite large, so the first task would + probably be to clarify what it would need to get an initial (minimal + but working) implementation ready to be shipped to users. + This project does not require to be an expert in one specific field, + but it requires to be experienced and at ease with a large scope of + software development tools, processes, and operating system knowledge. + Undertaking this project requires in-depth knowledge of Debian-like + systems (self-test: do the "dpkg conffile" and "debconf preseeding" + words sound new to your ear?); the Debian Live persistence system + being written in shell, being at ease with robust shell scripting is + a must; to end with, at least two pieces of software need to be + written from scratch (a GUI and a webapp): the preferred languages for + these tasks would be Python and Perl. Using Behaviour Driven + Development methods to convey expectations and acceptance criteria + would be most welcome. + For more information see https://tails.boum.org/todo/server_edition/ + </li> + <!-- <a id=""></a> <li>

1 0

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

15 Mar '16

commit 6874a7607d167390d2f5c69a6c3917108d9dae6a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 15:15:49 2016 +0000 Update translations for tails-misc --- ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca.po b/ca.po index 8159051..9d5b670 100644 --- a/ca.po +++ b/ca.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-07 18:07+0100\n" -"PO-Revision-Date: 2016-03-15 09:38+0000\n" +"PO-Revision-Date: 2016-03-15 15:12+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 942ece480357cfa3e71e94dd13a522b0140fa84c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 15:15:22 2016 +0000 Update translations for https_everywhere_completed --- ca/https-everywhere.dtd | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/ca/https-everywhere.dtd b/ca/https-everywhere.dtd index 19edd49..bc91115 100644 --- a/ca/https-everywhere.dtd +++ b/ca/https-everywhere.dtd @@ -3,14 +3,18 @@ <!ENTITY https-everywhere.about.ext_description "Xifra la Web! Fes servir automàticament la seguretat HTTPS a molts llocs."> <!ENTITY https-everywhere.about.version "Versió"> <!ENTITY https-everywhere.about.created_by "Creat per"> +<!ENTITY https-everywhere.about.and ", i"> <!ENTITY https-everywhere.about.librarians "Bibliotecaris de normes"> <!ENTITY https-everywhere.about.thanks "Gràcies a"> +<!ENTITY https-everywhere.about.many_contributors "Molts, molts contribuïdors, inclosos: "> +<!ENTITY https-everywhere.about.noscript "A més, parts de HTTPS Everywhere estan basades en codi de NoScript, per Giorgio Maone i altres. Agraïm la seva excel·lent feina!"> <!ENTITY https-everywhere.about.contribute "Si us agrada HTTPS Everywhere, podríeu considerar"> <!ENTITY https-everywhere.about.donate_tor "Fer una donació a Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.or "o"> <!ENTITY https-everywhere.about.donate_eff "Fer una donació a EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Donar a EEF"> <!ENTITY https-everywhere.menu.about "Sobre HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Preferències de SSL Observatory"> <!ENTITY https-everywhere.menu.globalEnable "Activa HTTPS Everywhere"> @@ -34,17 +38,19 @@ <!ENTITY https-everywhere.prefs.reset_default "Tornar a la opció per defecte"> <!ENTITY https-everywhere.prefs.view_xml_source "Veure el codi XML"> -<!ENTITY https-everywhere.source.downloading "Descarregant"> -<!ENTITY https-everywhere.source.filename "Nom d'arxiu"> -<!ENTITY https-everywhere.source.unable_to_download "No es pot descarregar la font."> +<!ENTITY https-everywhere.chrome.stable_rules "Normes estables."> +<!ENTITY https-everywhere.chrome.stable_rules_description "Força connexions encriptades a les següents pàgines web:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Normes experimentals"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Pot causar avisos i problemes. Desactivat per defecte."> +<!ENTITY https-everywhere.chrome.add_rule "Afegir una norma per a aquest lloc"> +<!ENTITY https-everywhere.chrome.add_new_rule "Afegir una nova norma per a aquest lloc"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Utilitza sempre https per a aquest host"> +<!ENTITY https-everywhere.chrome.host "Host:"> +<!ENTITY https-everywhere.chrome.show_advanced "Mostrar avançat"> +<!ENTITY https-everywhere.chrome.hide_advanced "Amagar avançat"> +<!ENTITY https-everywhere.chrome.rule_name "Nom de la norma"> +<!ENTITY https-everywhere.chrome.regex "Trobant regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Re-direccionar a"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel·lar "> -<!ENTITY https-everywhere.popup.title "Notificació de HTTPS Everywhere 4.0development.11"> -<!ENTITY https-everywhere.popup.paragraph1 "Ups, estàveu usant la versió estable de HTTPS Everywhere, però possiblement us hem actualitzat sense voler a la versió de desenvolupadors."> -<!ENTITY https-everywhere.popup.paragraph2 "Voleu tornar a la versió estable?"> -<!ENTITY https-everywhere.popup.paragraph3 "Ens agradaria que continuéssiu usant la versió de desenvolupador per a ajudar-nos a millorar-la. Potser hi trobeu alguns errors, que ens podeu indicar a https-everywhere(a)eff.org. Disculpeu les molèsties, i gràcies per usar HTTPS Everywhere."> -<!ENTITY https-everywhere.popup.keep "Vull continuar amb la versió de desenvolupador."> -<!ENTITY https-everywhere.popup.revert "Descarrega l'última versió estable."> -<!ENTITY https-everywhere.ruleset-tests.status_title "Prova de normes d'HTTPS Everywhere"> -<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel·la"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Inicia">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 844777d0f48dcc528edf7c284f7f6b7c363a33e5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 15:15:16 2016 +0000 Update translations for https_everywhere --- ca/https-everywhere.dtd | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ca/https-everywhere.dtd b/ca/https-everywhere.dtd index 6b012d6..bc91115 100644 --- a/ca/https-everywhere.dtd +++ b/ca/https-everywhere.dtd @@ -6,15 +6,15 @@ <!ENTITY https-everywhere.about.and ", i"> <!ENTITY https-everywhere.about.librarians "Bibliotecaris de normes"> <!ENTITY https-everywhere.about.thanks "Gràcies a"> -<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including"> -<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> +<!ENTITY https-everywhere.about.many_contributors "Molts, molts contribuïdors, inclosos: "> +<!ENTITY https-everywhere.about.noscript "A més, parts de HTTPS Everywhere estan basades en codi de NoScript, per Giorgio Maone i altres. Agraïm la seva excel·lent feina!"> <!ENTITY https-everywhere.about.contribute "Si us agrada HTTPS Everywhere, podríeu considerar"> <!ENTITY https-everywhere.about.donate_tor "Fer una donació a Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.or "o"> <!ENTITY https-everywhere.about.donate_eff "Fer una donació a EFF"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Donar a EEF"> <!ENTITY https-everywhere.menu.about "Sobre HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Preferències de SSL Observatory"> <!ENTITY https-everywhere.menu.globalEnable "Activa HTTPS Everywhere"> @@ -38,19 +38,19 @@ <!ENTITY https-everywhere.prefs.reset_default "Tornar a la opció per defecte"> <!ENTITY https-everywhere.prefs.view_xml_source "Veure el codi XML"> -<!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> +<!ENTITY https-everywhere.chrome.stable_rules "Normes estables."> +<!ENTITY https-everywhere.chrome.stable_rules_description "Força connexions encriptades a les següents pàgines web:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Normes experimentals"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Pot causar avisos i problemes. Desactivat per defecte."> +<!ENTITY https-everywhere.chrome.add_rule "Afegir una norma per a aquest lloc"> +<!ENTITY https-everywhere.chrome.add_new_rule "Afegir una nova norma per a aquest lloc"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Utilitza sempre https per a aquest host"> <!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> -<!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.show_advanced "Mostrar avançat"> +<!ENTITY https-everywhere.chrome.hide_advanced "Amagar avançat"> +<!ENTITY https-everywhere.chrome.rule_name "Nom de la norma"> +<!ENTITY https-everywhere.chrome.regex "Trobant regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Re-direccionar a"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel·lar ">

1 0

[tor/master] Fix whitespace.
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit b48f8a8114575793046a8e9d3544d6b2d0a17f82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 09:21:29 2016 -0400 Fix whitespace. --- src/common/util.c | 6 ++++-- src/or/circuitbuild.c | 4 +++- src/or/config.c | 6 ++++-- src/or/main.c | 3 ++- src/or/rendcommon.c | 1 + src/or/rendcommon.h | 2 +- src/or/routerlist.c | 1 + 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 52b87f8..39d6502 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2074,7 +2074,8 @@ check_private_dir(const char *dirname, cpd_check_t check, * the file between stat() and chmod(), a potential race exists. * * Several suggestions taken from: - * https://developer.apple.com/library/mac/documentation/Security/Conceptual/S… + * https://developer.apple.com/library/mac/documentation/ + * Security/Conceptual/SecureCodingGuide/Articles/RaceConditions.html */ /* Open directory. @@ -2985,7 +2986,8 @@ expand_filename(const char *filename) tor_assert(filename); #ifdef _WIN32 /* Might consider using GetFullPathName() as described here: - * http://etutorials.org/Programming/secure+programming/Chapter+3.+Input+Valid… + * http://etutorials.org/Programming/secure+programming/ + * Chapter+3.+Input+Validation/3.7+Validating+Filenames+and+Paths/ */ return tor_strdup(filename); #else diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index a15f4c2..237b61a 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2420,7 +2420,8 @@ build_state_get_exit_nickname(cpath_build_state_t *state) } /** Return true iff the given address can be used to extend to. */ -int extend_info_addr_is_allowed(const tor_addr_t *addr) +int +extend_info_addr_is_allowed(const tor_addr_t *addr) { tor_assert(addr); @@ -2434,3 +2435,4 @@ int extend_info_addr_is_allowed(const tor_addr_t *addr) disallow: return 0; } + diff --git a/src/or/config.c b/src/or/config.c index 8f3c28c..0e15f9b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6325,7 +6325,8 @@ parse_port_config(smartlist_t *out, ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, cache_ipv4 = 1, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, - prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0, + prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, + relax_dirmode_check = 0, has_used_unix_socket_only_option = 0; smartlist_split_string(elts, ports->value, NULL, @@ -6577,7 +6578,8 @@ parse_port_config(smartlist_t *out, if ( has_used_unix_socket_only_option && ! unix_socket_path) { log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, " - "WorldWritable, or RelaxDirModeCheck, but it is not a unix socket.", portname); + "WorldWritable, or RelaxDirModeCheck, but it is not a " + "unix socket.", portname); goto err; } diff --git a/src/or/main.c b/src/or/main.c index cfd1169..713816d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -572,7 +572,8 @@ connection_check_event(connection_t *conn, struct event *ev) conn_type_to_string(conn->type), conn_state_to_string(conn->type, conn->state), (int)conn->s, (int)conn->linked, - (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request), + (conn->type == CONN_TYPE_AP && + TO_EDGE_CONN(conn)->is_dns_request), conn->marked_for_close_file ? conn->marked_for_close_file : "-", conn->marked_for_close ); diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 79509cb..603e4f0 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1009,3 +1009,4 @@ MOCK_IMPL(int, hid_serv_responsible_for_desc_id, smartlist_free(responsible); return result; } + diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index fe45299..7d81976 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -58,7 +58,7 @@ void rend_get_descriptor_id_bytes(char *descriptor_id_out, const char *service_id, const char *secret_id_part); int hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, - const char *id); + const char *id); int hid_serv_acting_as_directory(void); MOCK_DECL(int, hid_serv_responsible_for_desc_id, (const char *id)); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 7f20aa9..bc5e2e9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5395,3 +5395,4 @@ refresh_all_country_info(void) nodelist_refresh_countries(); } +

1 0