my_activity.py: update to use oauth for projecthosting

my_activity.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.
 
 """Get stats about your activity.
 
 Example:
   - my_activity.py  for stats for the current week (last week on mondays).
   - my_activity.py -Q  for stats for last quarter.
@@ skipping 24 matching lines @@
 import sys
 import urllib
 import urllib2
 
 import auth
 import fix_encoding
 import gerrit_util
 import rietveld
 from third_party import upload
 
+import auth
+from third_party import httplib2
+
 try:
   from dateutil.relativedelta import relativedelta # pylint: disable=F0401
 except ImportError:
   print 'python-dateutil package required'
   exit(1)
 
 # python-keyring provides easy access to the system keyring.
 try:
   import keyring  # pylint: disable=W0611,F0401
 except ImportError:
@@ skipping 38 matching lines @@
 gerrit_instances = [
   {
     'url': 'chromium-review.googlesource.com',
     'shorturl': 'crosreview.com',
   },
   {
     'url': 'chrome-internal-review.googlesource.com',
     'shorturl': 'crosreview.com/i',
   },
   {
     'host': 'gerrit.chromium.org',

[Vadim Sh., 2015/06/11 01:37:31]

this host has been turn off today, can be removed from this list

[seanmccullough, 2015/06/11 02:05:22]

Done.

     'port': 29418,
   },
 ]
 
 google_code_projects = [
   {
     'name': 'brillo',
     'shorturl': 'brbug.com',
   },
   {
@@ skipping 12 matching lines @@
   },
   {
     'name': 'gyp',
   },
   {
     'name': 'skia',
   },
 ]
 
 # Uses ClientLogin to authenticate the user for Google Code issue trackers.
 def get_auth_token(email):

[Vadim Sh., 2015/06/11 01:37:31]

this should be eventually deleted, it's broken

[seanmccullough, 2015/06/11 02:05:22]

Done.

   # KeyringCreds will use the system keyring on the first try, and prompt for
   # a password on the next ones.
   creds = upload.KeyringCreds('code.google.com', 'code.google.com', email)
   for _ in xrange(3):
     email, password = creds.GetUserCredentials()
     url = 'https://www.google.com/accounts/ClientLogin'
     data = urllib.urlencode({
         'Email': email,
         'Passwd': password,
         'service': 'code',
@@ skipping 76 matching lines @@
     self.user = options.user
     self.changes = []
     self.reviews = []
     self.issues = []
     self.check_cookies()
     self.google_code_auth_token = None
 
   # Check the codereview cookie jar to determine which Rietveld instances to
   # authenticate to.
   def check_cookies(self):
     cookie_file = os.path.expanduser('~/.codereview_upload_cookies')

[Vadim Sh., 2015/06/11 01:37:31]

it's not directly related to OAuth code.google.com issue, but this code is
broken too. ~/.codereview_upload_cookies no longer exists.

[seanmccullough, 2015/06/11 02:05:22]

removed it, now it just checks "has_cookie"

     if not os.path.exists(cookie_file):
       print 'No Rietveld cookie file found.'
       cookie_jar = []
     else:
       cookie_jar = cookielib.MozillaCookieJar(cookie_file)
       try:
         cookie_jar.load()
         print 'Found cookie file: %s' % cookie_file
       except (cookielib.LoadError, IOError):
         print 'Error loading Rietveld cookie file: %s' % cookie_file
         cookie_jar = []
 
     filtered_instances = []
 
     def has_cookie(instance):

[Vadim Sh., 2015/06/11 01:37:31]

this can be reformulated as:

a = auth.get_authenticator_for_host(<url>)
return a.has_cached_credentials()

[seanmccullough, 2015/06/11 02:05:22]

Done.

       for cookie in cookie_jar:
         if cookie.name == 'SACSID' and cookie.domain == instance['url']:
           return True
       if self.options.auth:
         return get_yes_or_no('No cookie found for %s. Authorize for this '
                              'instance? (may require application-specific '
                              'password)' % instance['url'])
       filtered_instances.append(instance)
       return False
 
@@ skipping 195 matching lines @@
     replies = filter(lambda r: 'author' in r and 'email' in r['author'],
         replies)
     for reply in replies:
       ret.append({
         'author': reply['author']['email'],
         'created': datetime_from_gerrit(reply['date']),
         'content': reply['message'],
       })
     return ret
 
-  def google_code_issue_search(self, instance):
-    time_format = '%Y-%m-%dT%T'
-    # See http://code.google.com/p/support/wiki/IssueTrackerAPI
-    # q=<owner>@chromium.org does a full text search for <owner>@chromium.org.
-    # This will accept the issue if owner is the owner or in the cc list. Might
-    # have some false positives, though.
+  def project_hosting_issue_search(self, instance):
+    auth_config = auth.extract_auth_config_from_options(self.options)
+    authenticator = auth.get_authenticator_for_host(
+        "https://code.google.com", auth_config)

[Vadim Sh., 2015/06/11 01:37:32]

just "code.google.com" here should work too

[seanmccullough, 2015/06/11 02:05:22]

Done.

+    http = authenticator.authorize(httplib2.Http())
+    url = "https://www.googleapis.com/projecthosting/v2/projects/%s/issues" % (
+       instance["name"])
+    epoch = datetime.utcfromtimestamp(0)
+    user_str = '%s@chromium.org' % self.user
 
-    # Don't filter normally on modified_before because it can filter out things
-    # that were modified in the time period and then modified again after it.
-    gcode_url = ('https://code.google.com/feeds/issues/p/%s/issues/full' %
-                 instance['name'])
-
-    gcode_data = urllib.urlencode({
-        'alt': 'json',
-        'max-results': '100000',
-        'q': '%s' % self.user,
-        'published-max': self.modified_before.strftime(time_format),
-        'updated-min': self.modified_after.strftime(time_format),
+    query_data = urllib.urlencode({
+      'maxResults': 10000,
+      'q': '%s' % user_str,

[Vadim Sh., 2015/06/11 01:37:31]

'q': user_str

[seanmccullough, 2015/06/11 02:05:22]

Done.

+      'publishedMax': '%d' % (self.modified_before - epoch).total_seconds(),
+      'updatedMin': '%d' % (self.modified_after - epoch).total_seconds(),
     })
-
-    opener = urllib2.build_opener()
-    if self.google_code_auth_token:
-      opener.addheaders = [('Authorization', 'GoogleLogin auth=%s' %
-                            self.google_code_auth_token)]
-    gcode_json = None
-    try:
-      gcode_get = opener.open(gcode_url + '?' + gcode_data)
-      gcode_json = json.load(gcode_get)
-      gcode_get.close()
-    except urllib2.HTTPError, _:
-      print 'Unable to access ' + instance['name'] + ' issue tracker.'
-
-    if not gcode_json or 'entry' not in gcode_json['feed']:
+    url = url + '?' + query_data
+    _, body = http.request(url)

[Vadim Sh., 2015/06/11 01:37:31]

this thing will raise auth.AuthenticationError if there's no cached token. Catch
it somewhere in main() and ask user to login. Just printing the exception to
stdout should be enough. It asks to run depot-tools-auth
(https://chromium.googlesource.com/chromium/tools/depot_tools/+/master/auth.py#94).

[seanmccullough, 2015/06/11 02:05:22]

Done.

+    content = json.loads(body)
+    if not content:
+      print "Unable to parse %s response from projecthosting." % (
+          instance["name"])
       return []
 
-    issues = gcode_json['feed']['entry']
-    issues = map(partial(self.process_google_code_issue, instance), issues)
-    issues = filter(self.filter_issue, issues)
-    issues = sorted(issues, key=lambda i: i['modified'], reverse=True)
+    issues = []
+    if 'items' in content:
+      items = content['items']
+      for item in items:
+        issue = {
+          "header": item["title"],
+          "created": item["published"],
+          "modified": item["updated"],
+          "author": item["author"]["name"],
+          "url": "https://code.google.com/p/%s/issues/detail?id=%s" % (
+              instance["name"], item["id"]),
+          "comments": []
+        }
+        if 'owner' in item:
+          issue['owner'] = item['owner']['name']
+        else:
+          issue['owner'] = 'None'
+        if issue['owner'] == user_str or issue['author'] == user_str:
+          issues.append(issue)
+
     return issues
 
-  def process_google_code_issue(self, project, issue):
-    ret = {}
-    ret['created'] = datetime_from_google_code(issue['published']['$t'])
-    ret['modified'] = datetime_from_google_code(issue['updated']['$t'])
-
-    ret['owner'] = ''
-    if 'issues$owner' in issue:
-      ret['owner'] = issue['issues$owner']['issues$username']['$t']
-    ret['author'] = issue['author'][0]['name']['$t']
-
-    if 'shorturl' in project:
-      issue_id = issue['id']['$t']
-      issue_id = issue_id[issue_id.rfind('/') + 1:]
-      ret['url'] = 'http://%s/%d' % (project['shorturl'], int(issue_id))
-    else:
-      issue_url = issue['link'][1]
-      if issue_url['rel'] != 'alternate':
-        raise RuntimeError
-      ret['url'] = issue_url['href']
-    ret['header'] = issue['title']['$t']
-
-    ret['replies'] = self.get_google_code_issue_replies(issue)
-    return ret
-
-  def get_google_code_issue_replies(self, issue):
-    """Get all the comments on the issue."""
-    replies_url = issue['link'][0]
-    if replies_url['rel'] != 'replies':
-      raise RuntimeError
-
-    replies_data = urllib.urlencode({
-        'alt': 'json',
-        'fields': 'entry(published,author,content)',
-    })
-
-    opener = urllib2.build_opener()
-    opener.addheaders = [('Authorization', 'GoogleLogin auth=%s' %
-                          self.google_code_auth_token)]
-    try:
-      replies_get = opener.open(replies_url['href'] + '?' + replies_data)
-    except urllib2.HTTPError, _:
-      return []
-
-    replies_json = json.load(replies_get)
-    replies_get.close()
-    return self.process_google_code_issue_replies(replies_json)
-
-  @staticmethod
-  def process_google_code_issue_replies(replies):
-    if 'entry' not in replies['feed']:
-      return []
-
-    ret = []
-    for entry in replies['feed']['entry']:
-      e = {}
-      e['created'] = datetime_from_google_code(entry['published']['$t'])
-      e['content'] = entry['content']['$t']
-      e['author'] = entry['author'][0]['name']['$t']
-      ret.append(e)
-    return ret
-
   def print_heading(self, heading):
     print
     print self.options.output_format_heading.format(heading=heading)
 
   def print_change(self, change):
     optional_values = {
         'reviewers': ', '.join(change['reviewers'])
     }
     self.print_generic(self.options.output_format,
                        self.options.output_format_changes,
@@ skipping 99 matching lines @@
       self.reviews += reviews
 
   def print_reviews(self):
     if self.reviews:
       self.print_heading('Reviews')
       for review in self.reviews:
         self.print_review(review)
 
   def get_issues(self):
     for project in google_code_projects:
-      self.issues += self.google_code_issue_search(project)
+      self.issues += self.project_hosting_issue_search(project)
 
   def print_issues(self):
     if self.issues:
       self.print_heading('Issues')
       for issue in self.issues:
         self.print_issue(issue)
 
   def print_activity(self):
     self.print_changes()
     self.print_reviews()
@@ skipping 167 matching lines @@
 
 if __name__ == '__main__':
   # Fix encoding to support non-ascii issue titles.
   fix_encoding.fix_encoding()
 
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)