Gatekeeper: use same authentication for reading status as for writing.

scripts/slave/gatekeeper_ng.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Closes tree if configured masters have failed tree-closing steps.
 
 Given a list of masters, gatekeeper_ng will get a list of the latest builds from
 the specified masters. It then checks if any tree-closing steps have failed, and
 if so closes the tree and emails appropriate parties. Configuration for which
@@ skipping 69 matching lines @@
       'password': password
   })
 
   # Standard urllib doesn't raise an exception on 403, urllib2 does.
   status_url = status_url_root + "/status"
   f = logging_urlopen(status_url, params)
   f.close()
   logging.info('success')
 
 
-def get_tree_status(status_url_root):
+def get_tree_status(status_url_root, username, password):
   status_url = status_url_root + "/current?format=json"
-  return json.load(logging_urlopen(status_url))
+  data = logging_urlopen(status_url).read()
+  try:
+    return json.loads(data)
+  except ValueError:
+    if 'Login Required' not in data:
+      raise
+  # try using bot password to authenticate
+  params = urllib.urlencode({
+      'username': username,
+      'password': password
+  })
+  try:
+    data = logging_urlopen(status_url, params).read()
+  except urllib2.HTTPError, e:
+    if e.code == 405:
+      logging.warn("update your chromium_status app.")
+    raise
+  return json.loads(data)
 
 
 def get_builder_section(gatekeeper_section, builder):
   """Returns the applicable gatekeeper config for the builder.
 
   If the builder isn't present or is excluded, return None.
   """
   if builder in gatekeeper_section:
     builder_section = gatekeeper_section[builder]
   elif '*' in gatekeeper_section:
@@ skipping 399 matching lines @@
                   ','.join(still_failing_steps), builder, master_url,
                   urllib.quote(builder), buildnum))
 
   if previously_failed_builds:
     logging.debug(
         'Not opening tree because previous builds weren\'t successful:')
     for build in previously_failed_builds:
       logging.debug('  %s' % build)
     return
 
-  status = get_tree_status(status_url_root)
+  status = get_tree_status(status_url_root, username, password)
   # Don't change the status unless the tree is currently closed.
   if status['general_state'] != 'closed':
     return
 
   # Don't override human closures.
   # FIXME: We could check that we closed the tree instead?
   if not re.search(r"automatic", status['message'], re.IGNORECASE):
     return
 
   logging.info('All builders are green, opening the tree...')
@@ skipping 34 matching lines @@
 
 def close_tree_if_necessary(failed_builds, username, password, status_url_root,
                             set_status, revision_properties):
   """Given a list of failed builds, close the tree if necessary."""
 
   closing_builds = [b for b in failed_builds if b['close_tree']]
   if not closing_builds:
     logging.info('no tree-closing failures!')
     return
 
-  status = get_tree_status(status_url_root)
+  status = get_tree_status(status_url_root, username, password)
   # Don't change the status unless the tree is currently open.
   if status['general_state'] != 'open':
     return
 
   logging.info('%d failed builds found, closing the tree...' %
                len(closing_builds))
 
   template_build = closing_builds[0]
   template_vars = {
       'blamelist': ','.join(template_build['build']['blame']),
@@ skipping 303 matching lines @@
 
   if not options.skip_build_db_update:
     build_scan_db.save_build_db(build_db, gatekeeper_config,
                              options.build_db)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())