Remove the need to have separate config for authentication.

remoting/tools/me2me_virtual_host.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Virtual Me2Me implementation.  This script runs and manages the processes
 # required for a Virtual Me2Me desktop, which are: X server, X desktop
 # session, and Host process.
 # This script is intended to run continuously as a background daemon
 # process, running under an ordinary (non-root) user account.
@@ skipping 26 matching lines @@
 # By default this script will try to determine the most appropriate X session
 # command for the system.  To use a specific session instead, set this variable
 # to the executable filename, or a list containing the executable and any
 # arguments, for example:
 # XSESSION_COMMAND = "/usr/bin/gnome-session-fallback"
 # XSESSION_COMMAND = ["/usr/bin/gnome-session", "--session=ubuntu-2d"]
 XSESSION_COMMAND = None
 
 REMOTING_COMMAND = "remoting_me2me_host"
 
-# Command-line switch for passing the config path to remoting_me2me_host.
-HOST_CONFIG_SWITCH_NAME = "host-config"
-
 # Needs to be an absolute path, since the current working directory is changed
 # when this process self-daemonizes.
 SCRIPT_PATH = os.path.dirname(sys.argv[0])
 if SCRIPT_PATH:
   SCRIPT_PATH = os.path.abspath(SCRIPT_PATH)
 else:
   SCRIPT_PATH = os.getcwd()
 
 # These are relative to SCRIPT_PATH.
 EXE_PATHS_TO_TRY = [
@@ skipping 81 matching lines @@
   * load_config(): Load a config from disk, with details of an existing Host
   registration.
 
   After calling register() (or making any config changes) the method
   save_config() should be called to save the details to disk.
   """
 
   server = 'www.googleapis.com'
   url = 'https://' + server + '/chromoting/v1/@me/hosts'
 
-  def __init__(self, config_file):
+  def __init__(self, config_file, auth):
+    """
+    Args:
+      config_file: Host configuration file path
+      auth: Authentication object with credentials for authenticating with the
+        Directory service.
+    """
     self.config_file = config_file
+    self.auth = auth
     self.host_id = str(uuid.uuid1())
     self.host_name = socket.gethostname()
     self.host_secret_hash = None
     self.private_key = None
 
-  def register(self, auth):
+  def register(self):
     """Generates a private key for the stored |host_id|, and registers it with
     the Directory service.
 
-    Args:
-      auth: Authentication object with credentials for authenticating with the
-        Directory service.
-
     Raises:
       urllib2.HTTPError: An error occurred talking to the Directory server
         (for example, if the |auth| credentials were rejected).
     """
 
     logging.info("HostId: " + self.host_id)
     logging.info("HostName: " + self.host_name)
 
     logging.info("Generating RSA key pair...")
     (self.private_key, public_key) = keygen.generateRSAKeyPair()
     logging.info("Done")
 
     json_data = {
         "data": {
             "hostId": self.host_id,
             "hostName": self.host_name,
             "publicKey": public_key,
         }
     }
     params = json.dumps(json_data)
     headers = {
-        "Authorization": "GoogleLogin auth=" + auth.chromoting_auth_token,
+        "Authorization": "GoogleLogin auth=" + self.auth.chromoting_auth_token,
         "Content-Type": "application/json",
     }
 
     request = urllib2.Request(self.url, params, headers)
     opener = urllib2.OpenerDirector()
     opener.add_handler(urllib2.HTTPDefaultErrorHandler())
 
     logging.info("Registering host with directory service...")
 
     res = urllib2.urlopen(request)
@@ skipping 178 matching lines @@
     self.session_proc = subprocess.Popen(XSESSION_COMMAND,
                                          stdin=open(os.devnull, "r"),
                                          cwd=HOME_DIR,
                                          env=self.child_env)
     if not self.session_proc.pid:
       raise Exception("Could not start X session")
 
   def launch_host(self, host):
     # Start remoting host
     args = [locate_executable(REMOTING_COMMAND),
-            "--%s=%s" % (HOST_CONFIG_SWITCH_NAME, host.config_file)]
+            "--host_config=%s" % (host.config_file),
+            "--auth_config=%s" % (host.auth.config_file)]
     self.host_proc = subprocess.Popen(args, env=self.child_env)
     if not self.host_proc.pid:
       raise Exception("Could not start remoting host")
 
 
 class PidFile:
   """Class to allow creating and deleting a file which holds the PID of the
   running process.  This is used to detect if a process is already running, and
   inform the user of the PID.  On process termination, the PID file is
   deleted.
@@ skipping 288 matching lines @@
   # Ensure full path to config directory exists.
   if not os.path.exists(CONFIG_DIR):
     os.makedirs(CONFIG_DIR, mode=0700)
 
   if options.explicit_config:
     for file_name in ["auth.json", "host#%s.json" % host_hash]:
       settings_file = open(os.path.join(CONFIG_DIR, file_name), 'w')
       settings_file.write(options.explicit_config)
       settings_file.close()
 
+  # TODO(sergeyu): Move auth parameters to the host config.
   auth = Authentication(os.path.join(CONFIG_DIR, "auth.json"))
   need_auth_tokens = not auth.load_config()
 
-  host = Host(os.path.join(CONFIG_DIR, "host#%s.json" % host_hash))
+  host = Host(os.path.join(CONFIG_DIR, "host#%s.json" % host_hash), auth)
   register_host = not host.load_config()
 
   # Outside the loop so user doesn't get asked twice.
   if register_host:
     host.ask_pin()
   elif options.new_pin or not host.is_pin_set():
     host.ask_pin()
     host.save_config()
     running, pid = PidFile(pid_filename).check()
     if running and pid != 0:
@@ skipping 10 matching lines @@
         if need_auth_tokens:
           auth.generate_tokens()
           auth.save_config()
           need_auth_tokens = False
       except Exception:
         logging.error("Authentication failed")
         return 1
 
       try:
         if register_host:
-          host.register(auth)
+          host.register()
           host.save_config()
       except urllib2.HTTPError, err:
         if err.getcode() == 401:
           # Authentication failed - re-prompt for username & password.
           need_auth_tokens = True
           continue
         else:
           # Not an authentication error.
           logging.error("Directory returned error: " + str(err))
           logging.error(err.read())
@@ skipping 108 matching lines @@
         os.remove(host.config_file)
         return 0
       elif os.WEXITSTATUS(status) == 4:
         logging.info("OAuth credentials are invalid - exiting.")
         os.remove(auth.config_file)
         return 0
 
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG)
   sys.exit(main())