Adds SSO auth to gsutil

download_from_google_storage.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.
 
 """Download files from Google Storage based on SHA1 sums."""
 
 
 import hashlib
 import optparse
@@ skipping 18 matching lines @@
 
 
 class InvalidFileError(IOError):
   pass
 
 
 # Common utilities
 class Gsutil(object):
   """Call gsutil with some predefined settings.  This is a convenience object,
   and is also immutable."""
-  def __init__(self, path, boto_path, timeout=None):
+  def __init__(self, path, boto_path, timeout=None, bypass_prodaccess=False):
     if not os.path.exists(path):
       raise FileNotFoundError('GSUtil not found in %s' % path)
     self.path = path
     self.timeout = timeout
     self.boto_path = boto_path
+    self.bypass_prodaccess = False

[Vadim Sh., 2013/12/03 01:33:41]

Did you mean self.bypass_prodaccess = bypass_prodaccess?

[Ryan Tseng, 2013/12/03 22:57:11]

Oops, yes

 
   def get_sub_env(self):
     env = os.environ.copy()
     if self.boto_path == os.devnull:
       env['AWS_CREDENTIAL_FILE'] = ''
       env['BOTO_CONFIG'] = ''
     elif self.boto_path:
       env['AWS_CREDENTIAL_FILE'] = self.boto_path
       env['BOTO_CONFIG'] = self.boto_path
     else:
       custompath = env.get('AWS_CREDENTIAL_FILE', '~/.boto') + '.depot_tools'
       custompath = os.path.expanduser(custompath)
       if os.path.exists(custompath):
         env['AWS_CREDENTIAL_FILE'] = custompath
 
     return env
 
   def call(self, *args):
+    if self.bypass_prodaccess:
+      args.insert(0, '--bypass_prodaccess')

[Vadim Sh., 2013/12/03 01:33:41]

|args| is a tuple here. You can't insert stuff into tuples... Same below.

[Ryan Tseng, 2013/12/03 22:57:11]

fixed

     return subprocess2.call((sys.executable, self.path) + args,
                             env=self.get_sub_env(),
                             timeout=self.timeout)
 
   def check_call(self, *args):
+    if self.bypass_prodaccess:
+      args.insert(0, '--bypass_prodaccess')
     ((out, err), code) = subprocess2.communicate(
         (sys.executable, self.path) + args,
         stdout=subprocess2.PIPE,
         stderr=subprocess2.PIPE,
         env=self.get_sub_env(),
         timeout=self.timeout)
 
     # Parse output.
     status_code_match = re.search('status=([0-9]+)', err)
     if status_code_match:
@@ skipping 244 matching lines @@
         print('The current platform doesn\'t match "%s", skipping.' %
               options.platform)
       return 0
 
   # Set the boto file to /dev/null if we don't need auth.
   if options.no_auth:
     options.boto = os.devnull
 
   # Make sure we can find a working instance of gsutil.
   if os.path.exists(GSUTIL_DEFAULT_PATH):
-    gsutil = Gsutil(GSUTIL_DEFAULT_PATH, boto_path=options.boto)
+    gsutil = Gsutil(GSUTIL_DEFAULT_PATH,
+                    boto_path=options.boto,
+                    bypass_prodaccess=options.no_auth)
   else:
     gsutil = None
     for path in os.environ["PATH"].split(os.pathsep):
       if os.path.exists(path) and 'gsutil' in os.listdir(path):
-        gsutil = Gsutil(os.path.join(path, 'gsutil'), boto_path=options.boto)
+        gsutil = Gsutil(os.path.join(path, 'gsutil'),
+                        boto_path=options.boto,
+                        bypass_prodaccess=False)

[Vadim Sh., 2013/12/03 01:33:41]

Why not use options.no_auth here as well? Is it because it may be non-modified
gsutil that doesn't understand '--bypass_prodaccess'? Can you please add comment
about that.

[Ryan Tseng, 2013/12/03 22:57:11]

Actually this business with finding an existing version of gsutil is silly, I'll
remove that.

     if not gsutil:
       parser.error('gsutil not found in %s, bad depot_tools checkout?' %
                   GSUTIL_DEFAULT_PATH)
 
   # Passing in -g/--config will run our copy of GSUtil, then quit.
   if options.config:
     return gsutil.call('config')
 
   if not args:
     parser.error('Missing target.')
@@ skipping 38 matching lines @@
     return code
 
   return download_from_google_storage(
       input_filename, base_url, gsutil, options.num_threads, options.directory,
       options.recursive, options.force, options.output, options.ignore_errors,
       options.sha1_file, options.verbose)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))