[tor-commits] [nyx/master] Drop tor.password nyxrc option

[atagar at torproject.org]

commit d3a0279eddd15559739846d723e54b3b16aa2fd0
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Mar 7 16:49:34 2016 -0800

    Drop tor.password nyxrc option
    
    Tor offers two authentication options: cookie and password. The former is
    access to a file on disk while the later is something the user knows. By
    allowing users to specify a nyxrc line with the password it's no better than
    cookie auth, so we should encourage that.
---
 nyx/starter.py | 12 ------------
 nyxrc.sample   |  1 -
 2 files changed, 13 deletions(-)

diff --git a/nyx/starter.py b/nyx/starter.py
index 6a88912..81a892f 100644
--- a/nyx/starter.py
+++ b/nyx/starter.py
@@ -68,7 +68,6 @@ def main(config):
   controller = init_controller(
     control_port = control_port,
     control_socket = control_socket,
-    password = config.get('tor.password', None),
     password_prompt = True,
     chroot_path = config.get('tor.chroot', ''),
   )
@@ -80,7 +79,6 @@ def main(config):
   _warn_if_unable_to_get_pid(controller)
   _setup_freebsd_chroot(controller)
   _notify_of_unknown_events()
-  _clear_password()
   _use_english_subcommands()
   _use_unicode()
   _set_process_name()
@@ -215,16 +213,6 @@ def _notify_of_unknown_events():
     log.info('setup.unknown_event_types', event_types = ', '.join(missing_events))
 
 
- at uses_settings
-def _clear_password(config):
-  """
-  Removing the reference to our controller password so the memory can be freed.
-  Without direct memory access this is about the best we can do to clear it.
-  """
-
-  config.set('tor.password', None)
-
-
 def _use_english_subcommands():
   """
   Make subcommands we run (ps, netstat, etc) provide us with English results.
diff --git a/nyxrc.sample b/nyxrc.sample
index 160ce68..612af6b 100644
--- a/nyxrc.sample
+++ b/nyxrc.sample
@@ -1,5 +1,4 @@
 # Startup options
-tor.password
 startup.events N3
 startup.dataDirectory ~/.nyx