chpwd: Factor out option parsing.

diff --git a/chpwd b/chpwd
index b4fc8f547adbc687bebc7e57931b28fc13f47b55..52d3fa3a0d14db98f08d4b66a133f1226dbca9dd 100755 (executable)
--- a/chpwd
+++ b/chpwd
@@ -84,6 +84,18 @@ for short, long, props in [
     'help': "impersonate USER, and default context to `userv'." })]:
   OPTPARSE.add_option(short, long, **props)
 
     'help': "impersonate USER, and default context to `userv'." })]:
   OPTPARSE.add_option(short, long, **props)
 

+def parse_options():
+  """
+  Parse the main command-line options, returning the positional arguments.
+  """
+  global OPTS
+  OPTS, args = OPTPARSE.parse_args()
+  ## It's tempting to load the configuration here.  Don't do that.  Some
+  ## contexts will want to check that the command line was handled properly
+  ## upstream before believing it for anything, such as executing arbitrary
+  ## Python code.
+  return args
+

 ###--------------------------------------------------------------------------
 ### CGI dispatch.
 
 ###--------------------------------------------------------------------------
 ### CGI dispatch.
 


@@ -96,10 +108,9 @@ CGI.SPECIAL['%user'] = None
 ## issuing redirects in the early setup phase fails because we don't know
 ## the script name.  So package the setup here.
 def cgi_setup(ctx = 'cgi-noauth'):
 ## issuing redirects in the early setup phase fails because we don't know
 ## the script name.  So package the setup here.
 def cgi_setup(ctx = 'cgi-noauth'):

-  global OPTS

   if OPTS: return
   OPTPARSE.context = ctx
   if OPTS: return
   OPTPARSE.context = ctx

-  OPTS, args = OPTPARSE.parse_args()
+  args = parse_options()

   if args: raise U.ExpectedError, (500, 'Unexpected arguments to CGI')
   CONF.loadconfig(OPTS.config)
   D.opendb()
   if args: raise U.ExpectedError, (500, 'Unexpected arguments to CGI')
   CONF.loadconfig(OPTS.config)
   D.opendb()


@@ -217,7 +228,7 @@ if __name__ == '__main__':
     ## `USERV_USER' environment variable.
 
     with cli_errors():
     ## `USERV_USER' environment variable.
 
     with cli_errors():

-      OPTS, args = OPTPARSE.parse_args()
+      args = parse_options()

       if not args or args[0] != 'userv':
         raise U.ExpectedError, (500, 'missing userv token')
       CONF.loadconfig(OPTS.config)
       if not args or args[0] != 'userv':
         raise U.ExpectedError, (500, 'missing userv token')
       CONF.loadconfig(OPTS.config)


@@ -233,8 +244,7 @@ if __name__ == '__main__':
 
     def ssh_setup():
       """Extract and parse the client's request from where SSH left it."""
 
     def ssh_setup():
       """Extract and parse the client's request from where SSH left it."""

-      global OPTS
-      OPTS, args = OPTPARSE.parse_args()
+      args = parse_options()

       CONF.loadconfig(OPTS.config)
       cmd = SL.split(ENV['SSH_ORIGINAL_COMMAND'])
       if args: raise U.ExpectedError, (500, 'Unexpected arguments via SSH')
       CONF.loadconfig(OPTS.config)
       cmd = SL.split(ENV['SSH_ORIGINAL_COMMAND'])
       if args: raise U.ExpectedError, (500, 'Unexpected arguments via SSH')


@@ -279,7 +289,7 @@ if __name__ == '__main__':
     ## as we are.
 
     with cli_errors():
     ## as we are.
 
     with cli_errors():

-      OPTS, args = OPTPARSE.parse_args()
+      args = parse_options()

       CONF.loadconfig(OPTS.config)
       CGI.SSLP = OPTS.sslp
       ctx = OPTS.context
       CONF.loadconfig(OPTS.config)
       CGI.SSLP = OPTS.sslp
       ctx = OPTS.context