Changeset 246082 in webkit

Timestamp:

Jun 4, 2019, 2:40:00 PM (7 years ago)

Author:

aakash_jain@apple.com

Message:

[ews-app] Add authentication while fetching bugs
​https://bugs.webkit.org/show_bug.cgi?id=198415
<rdar://problem/51298710>

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-app/ews/common/bugzilla.py:

(Bugzilla._fetch_attachment_json): Use api_key if configured in environment variable.
(BugzillaBeautifulSoup.authenticate): Method to authenticate, logic copied from webkitpy/common/net/bugzilla/bugzilla.py
(BugzillaBeautifulSoup._load_query):

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-app/ews/common/bugzilla.py (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py

@@ -26 +26 @@
 import re
 import socket
+import time
 
 from datetime import datetime, timedelta
@@ -62 +63 @@
 
         attachment_url = '{}rest/bug/attachment/{}'.format(config.BUG_SERVER_URL, attachment_id)
+        api_key = os.getenv('BUGZILLA_API_KEY', None)
+        if api_key:
+            attachment_url += '?api_key={}'.format(api_key)
         attachment = util.fetch_data_from_url(attachment_url)
         if not attachment:
@@ -102 +106 @@
     browser = property(_get_browser, _set_browser)
 
+    def authenticate(self):
+        username = os.getenv('BUGZILLA_USERNAME', None)
+        password = os.getenv('BUGZILLA_PASSWORD', None)
+        if not username or not password:
+            _log.warn('Bugzilla username/password not configured in environment variables. Skipping authentication.')
+            return
+
+        authenticated = False
+        attempts = 0
+        while not authenticated:
+            attempts += 1
+            _log.info('Logging in as {}...'.format(username))
+            self.browser.open(config.BUG_SERVER_URL + 'index.cgi?GoAheadAndLogIn=1')
+            self.browser.select_form(name="login")
+            self.browser['Bugzilla_login'] = username
+            self.browser['Bugzilla_password'] = password
+            self.browser.find_control("Bugzilla_restrictlogin").items[0].selected = False
+            response = self.browser.submit()
+
+            match = re.search("<title>(.+?)</title>", response.read())
+            # If the resulting page has a title, and it contains the word
+            # "invalid" assume it's the login failure page.
+            if match and re.search("Invalid", match.group(1), re.IGNORECASE):
+                errorMessage = 'Bugzilla login failed: {}'.format(match.group(1))
+                if attempts >= 5:
+                    # raise an exception only if this was the last attempt
+                    raise Exception(errorMessage)
+                _log.error(errorMessage)
+                time.sleep(5)
+            else:
+                authenticated = True
+
     def fetch_attachment_ids_from_review_queue(self, since=None, only_security_bugs=False):
         review_queue_url = 'request.cgi?action=queue&type=review&group=type'
@@ -109 +145 @@
 
     def _load_query(self, query):
-        # TODO: check if we need to authenticate.
+        self.authenticate()
         full_url = '{}{}'.format(config.BUG_SERVER_URL, query)
         _log.info('Getting list of patches needing review, URL: {}'.format(full_url))

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-04  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-app] Add authentication while fetching bugs
+        https://bugs.webkit.org/show_bug.cgi?id=198415
+        <rdar://problem/51298710>
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-app/ews/common/bugzilla.py:
+        (Bugzilla._fetch_attachment_json): Use api_key if configured in environment variable.
+        (BugzillaBeautifulSoup.authenticate): Method to authenticate, logic copied from webkitpy/common/net/bugzilla/bugzilla.py
+        (BugzillaBeautifulSoup._load_query):
+
 2019-06-04  Aakash Jain  <aakash_jain@apple.com>