Extract authentication options handling into a separate function.

rietveld.py

 # coding: utf-8
 # 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.
 """Defines class Rietveld to easily access a rietveld instance.
 
 Security implications:
 
 The following hypothesis are made:
 - Rietveld enforces:
@@ skipping 19 matching lines @@
 import third_party.oauth2client.client as oa2client
 from third_party import httplib2
 
 # Appengine replies with 302 when authentication fails (sigh.)
 oa2client.REFRESH_STATUS_CODES.append(302)
 upload.LOGGER.setLevel(logging.WARNING)  # pylint: disable=E1103
 
 
 class Rietveld(object):
   """Accesses rietveld."""
-  def __init__(self, url, email, password, extra_headers=None, maxtries=None):
+  def __init__(
+      self, url, auth_config, email=None, extra_headers=None, maxtries=None):
     self.url = url.rstrip('/')
-
-    # TODO(maruel): It's not awesome but maybe necessary to retrieve the value.
-    # It happens when the presubmit check is ran out of process, the cookie
-    # needed to be recreated from the credentials. Instead, it should pass the
-    # email and the cookie.
-    if email and password:
-      get_creds = lambda: (email, password)
-      self.rpc_server = upload.HttpRpcServer(

[Vadim Sh., 2015/04/09 01:04:39]

this branch is removed, since password can't be passed from command line now

-            self.url,
-            get_creds,
-            extra_headers=extra_headers or {})
-    else:
-      if email == '':
-        # If email is given as an empty string, then assume we want to make
-        # requests that do not need authentication.  Bypass authentication by
-        # setting the auth_function to None.
-        self.rpc_server = upload.HttpRpcServer(url, None)
-      else:
-        self.rpc_server = upload.GetRpcServer(url, email)
+    self.rpc_server = upload.GetRpcServer(self.url, auth_config, email)
 
     self._xsrf_token = None
     self._xsrf_token_time = None
 
     self._maxtries = maxtries or 40
 
   def xsrf_token(self):
     if (not self._xsrf_token_time or
         (time.time() - self._xsrf_token_time) > 30*60):
       self._xsrf_token_time = time.time()
@@ skipping 371 matching lines @@
             raise
         # If reaching this line, loop again. Uses a small backoff.
         time.sleep(min(10, 1+retry*2))
     finally:
       upload.ErrorExit = old_error_exit
 
   # DEPRECATED.
   Send = get
 
 
 class OAuthRpcServer(object):

[Vadim Sh., 2015/04/09 01:04:39]

This will be eventually removed (or rather merged into something else).

   def __init__(self,
                host,
                client_email,
                client_private_key,
                private_key_password='notasecret',
                user_agent=None,
                timeout=None,
                extra_headers=None):
     """Wrapper around httplib2.Http() that handles authentication.
 
@@ skipping 91 matching lines @@
           self.creds.access_token = None
           continue
         break
 
       return ret[1]
 
     finally:
       self._http.timeout = prev_timeout
 
 
 class JwtOAuth2Rietveld(Rietveld):

[Vadim Sh., 2015/04/09 01:04:39]

This will be eventually removed. JWT stuff will be passed via auth_config to
regular Rietveld class.

   """Access to Rietveld using OAuth authentication.
 
   This class is supposed to be used only by bots, since this kind of
   access is restricted to service accounts.
   """
   # The parent__init__ is not called on purpose.
   # pylint: disable=W0231
   def __init__(self,
                url,
                client_email,
@@ skipping 140 matching lines @@
       self, issue, patchset, reason, clobber, revision, builders_and_tests,
       master=None, category='cq'):
     logging.info('ReadOnlyRietveld: triggering try jobs %r for issue %d' %
         (builders_and_tests, issue))
 
   def trigger_distributed_try_jobs(  # pylint:disable=R0201
       self, issue, patchset, reason, clobber, revision, masters,
       category='cq'):
     logging.info('ReadOnlyRietveld: triggering try jobs %r for issue %d' %
         (masters, issue))