Attachment 371288 Details for Bug 198415 – Patch

[patch] Patch

bug-198415-20190604120456.patch (text/plain), 4.39 KB, created by Aakash Jain on 2019-06-04 09:04:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2019-06-04 09:04:58 PDT

Size: 4.39 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246067)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+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 NOBODY (OOPS!).
>+
>+        * 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  Zan Dobersek  <zdobersek@igalia.com>
> 
>         [misc] Remove JSCOnly ARMv7 Traditional bot
>Index: Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py	(revision 246063)
>+++ Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py	(working copy)
>@@ -25,6 +25,7 @@ import logging
> import os
> import re
> import socket
>+import time
> 
> from datetime import datetime, timedelta
> 
>@@ -61,6 +62,9 @@ class Bugzilla():
>             return None
> 
>         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:
>             return None
>@@ -87,6 +91,7 @@ class BugzillaBeautifulSoup():
>     # FIXME: Deprecate this class when https://bugzilla.mozilla.org/show_bug.cgi?id=1508531 is fixed.
>     def __init__(self):
>         self._browser = None
>+        self.authenticated = False
> 
>     def _get_browser(self):
>         if not self._browser:
>@@ -101,6 +106,42 @@ class BugzillaBeautifulSoup():
> 
>     browser = property(_get_browser, _set_browser)
> 
>+    def authenticate(self):
>+        if self.authenticated:
>+            return
>+        username = os.getenv('BUGZILLA_USERNAME', None)
>+        password = os.getenv('BUGZILLA_PASSWORD', None)
>+        if not username or not password:
>+            _log.warn("Username/password not configured in environment variables. Skipping authentication.")
>+            return
>+
>+        attempts = 0
>+        while not self.authenticated:
>+            attempts += 1
>+            _log.info("Logging in as %s..." % username)
>+            self.browser.open(config.BUG_SERVER_URL + "index.cgi?GoAheadAndLogIn=1")
>+            _log.info("Opening {}".format(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: %s" % match.group(1)
>+                # raise an exception only if this was the last attempt
>+                if attempts < 5:
>+                    _log.error(errorMessage)
>+                else:
>+                    raise Exception(errorMessage)
>+                time.sleep(5)
>+            else:
>+                self.authenticated = True
>+                self.username = username
>+
>     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'
>         if only_security_bugs:
>@@ -108,7 +149,7 @@ class BugzillaBeautifulSoup():
>         return self._parse_attachment_ids_request_query(self._load_query(review_queue_url), since)
> 
>     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))
>         return self.browser.open(full_url)

Actions: View | Formatted Diff | Diff

Attachments on bug 198415: 371052 | 371288 | 371312