Replace --explicit-config option in me2me_virtual_host.py with --silent.

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 365 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),
-            "--host_config=%s" % (host.config_file),
-            "--auth_config=%s" % (host.auth.config_file)]
+            "--host_config=%s" % (host.config_file)]
+    if host.auth.config_file != host.config_file:
+      args.append("--auth_config=%s" % (host.auth.config_file))
     self.host_proc = subprocess.Popen(args, env=self.child_env)
+    logging.info(args)
     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 217 matching lines @@
                     help="don't run as a background daemon")
   parser.add_option("-k", "--stop", dest="stop", default=False,
                     action="store_true",
                     help="stop the daemon currently running")
   parser.add_option("-p", "--new-pin", dest="new_pin", default=False,
                     action="store_true",
                     help="set new PIN before starting the host")
   parser.add_option("", "--check-running", dest="check_running", default=False,
                     action="store_true",
                     help="return 0 if the daemon is running, or 1 otherwise")
-  parser.add_option("", "--explicit-config", dest="explicit_config",
-                    help="explicitly specify content of the config")
+  parser.add_option("", "--silent", dest="silent", default=False,
+                    action="store_true",
+                    help="Start the host without trying to configure it.")
   (options, args) = parser.parse_args()
 
   host_hash = hashlib.md5(socket.gethostname()).hexdigest()
   pid_filename = os.path.join(CONFIG_DIR, "host#%s.pid" % host_hash)
 
   if options.check_running:
     running, pid = PidFile(pid_filename).check()
     return 0 if (running and pid != 0) else 1
 
   if options.stop:
@@ skipping 41 matching lines @@
 
   atexit.register(cleanup)
 
   for s in [signal.SIGHUP, signal.SIGINT, signal.SIGTERM, signal.SIGUSR1]:
     signal.signal(s, signal_handler)
 
   # 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()
+  host_config_file = os.path.join(CONFIG_DIR, "host#%s.json" % host_hash)
 
-  # 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()
+  # --silent option is specified when we are started from WebApp UI. Don't use
+  # separate auth file in that case.
+  # TODO(sergeyu): Always use host config for auth parameters.
+  if options.silent:
+    auth_config_file = host_config_file
+  else:
+    auth_config_file = os.path.join(CONFIG_DIR, "auth.json")
 

[Lambros, 2012/08/01 18:30:57]

Good TODO.  As it is now, the script will use a different file for auth,
depending on whether --silent is specified, which is not ideal.

[Sergey Ulanov, 2012/08/01 20:20:54]

I'll do it in my next CL for this code. Problem is that it would require some
refactoring of that code - there are many places where we assume that this info
is stored in different files. Also will need to handle upgrade for the case when
a host is already configured.

-  host = Host(os.path.join(CONFIG_DIR, "host#%s.json" % host_hash), auth)
-  register_host = not host.load_config()
+  auth = Authentication(auth_config_file)
+  auth_config_loaded = auth.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:
-      os.kill(pid, signal.SIGUSR1)
-      print "The running instance has been updated with the new PIN."
-      return 0
+  host = Host(host_config_file, auth)
+  host_config_loaded = host.load_config()
 
-  if not options.explicit_config:
+  if options.silent:
+    if not host_config_loaded or not auth_config_loaded:
+      logging.error("Failed to load host configuration.")
+      return 1
+  else:
+    need_auth_tokens = not auth_config_loaded
+    need_register_host = not host_config_loaded
+    # Outside the loop so user doesn't get asked twice.
+    if need_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:
+        os.kill(pid, signal.SIGUSR1)
+        print "The running instance has been updated with the new PIN."
+        return 0
+
     # The loop is to deal with the case of registering a new Host with
     # previously-saved auth tokens (from a previous run of this script), which
     # may require re-prompting for username & password.
     while True:
       try:
         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:
+        if need_register_host:
           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))
@@ skipping 94 matching lines @@
       logging.info("Host process terminated")
       desktop.host_proc = None
 
       # These exit-codes must match the ones used by the host.
       # See remoting/host/constants.h.
       # Delete the host or auth configuration depending on the returned error
       # code, so the next time this script is run, a new configuration
       # will be created and registered.
       if os.WEXITSTATUS(status) == 2:
         logging.info("Host configuration is invalid - exiting.")
-        os.remove(auth.config_file)
-        os.remove(host.config_file)
+        try:
+          os.remove(host.config_file)
+          os.remove(auth.config_file)
+        except:
+          pass
         return 0
       elif os.WEXITSTATUS(status) == 3:
         logging.info("Host ID has been deleted - exiting.")
-        os.remove(host.config_file)
+        try:
+          os.remove(host.config_file)
+        except:
+          pass
         return 0
       elif os.WEXITSTATUS(status) == 4:
         logging.info("OAuth credentials are invalid - exiting.")
-        os.remove(auth.config_file)
+        try:
+          os.remove(auth.config_file)
+        except:
+          pass
         return 0
 
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG)
   sys.exit(main())