Merge 1920afc into 4dc5a76

release-engineering · Nov 28, 2023 · fd6c301 · fd6c301
2 parents 4dc5a76 + 1920afc
commit fd6c301
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 15 deletions.
diff --git a/tests/test_api_v10.py b/tests/test_api_v10.py
@@ -886,7 +886,7 @@ def test_permissions_endpoint(client):
                 "maintainers": ["alice@example.com"],
                 "_testcase_regex_pattern": "^kernel-qe",
                 "groups": ["devel", "qa"],
-                "users": ["alice@example.com"],
+                "users": ["alice"],
             },
             {
                 "name": "Greenwave Tests",
@@ -928,6 +928,33 @@ def test_permissions_endpoint(client):
         assert f"<td>{config['PERMISSIONS'][1]['name']}</td>" in r.text
 
 
+def test_permissions_endpoint_include_following(client):
+    config = {
+        'PERMISSIONS': [
+            {
+                "name": "Security",
+                "testcases": ["security.*"],
+                "groups": ["security"],
+            },
+            {
+                "name": "Development",
+                "testcases": ["*"],
+                "groups": ["devel"],
+                "testcases_ignore": ["security.*"],
+            }
+        ]
+    }
+
+    with patch.dict(client.application.config, config):
+        r = client.get('/api/v1.0/permissions?testcase=security.test1')
+        assert r.status_code == 200, r.text
+        assert r.json == config['PERMISSIONS'][0:1]
+
+        r = client.get('/api/v1.0/permissions?testcase=security-not.test1')
+        assert r.status_code == 200, r.text
+        assert r.json == config['PERMISSIONS'][1:]
+
+
 def test_config_endpoint_superusers(client):
     config = {
         'SUPERUSERS': ['alice', 'bob']

diff --git a/waiverdb/api_v1.py b/waiverdb/api_v1.py
@@ -681,6 +681,15 @@ def get(self):
         """
         Returns the waiver permissions.
 
+        Each entry has "testcases" (list of glob patterns for matching test
+        case name) and "users" or "groups".
+
+        The full list of users and groups permitted to waive given test case is
+        constructed by iterating the permissions in order and adding "users"
+        and "groups" from each permission entry with a pattern in "testcases"
+        matching the test case name until the first matching permission entry
+        that has "include_following_permissions" set to false.
+
         **Sample response**:
 
         .. sourcecode:: none
@@ -697,7 +706,8 @@ def get(self):
                   "maintainers": ["alice@example.com"],
                   "testcases": ["kernel-qe.*"],
                   "groups": ["devel", "qa"],
-                  "users": ["alice@example.com"]
+                  "users": ["alice@example.com"],
+                  "include_following_permissions": false
               },
               {
                   "name": "Greenwave Tests",

diff --git a/waiverdb/authorization.py b/waiverdb/authorization.py
@@ -32,13 +32,17 @@ def get_group_membership(ldap, user, con, ldap_search):
         raise Unauthorized('Some error occurred initializing the LDAP connection.')
 
 
+def match_testcase(testcase: str, patterns: dict[str, Any]):
+    return any(fnmatch(testcase, pattern) for pattern in patterns)
+
+
 def match_testcase_permissions(testcase: str, permissions: list[dict[str, Any]]):
     for permission in permissions:
+        if match_testcase(testcase, permission.get("testcases_ignore", [])):
+            continue
+
         if "testcases" in permission:
-            testcase_match = any(
-                fnmatch(testcase, testcase_pattern)
-                for testcase_pattern in permission["testcases"]
-            )
+            testcase_match = match_testcase(testcase, permission["testcases"])
         elif "_testcase_regex_pattern" in permission:
             testcase_match = re.search(
                 permission["_testcase_regex_pattern"], testcase)

diff --git a/waiverdb/templates/layout.html b/waiverdb/templates/layout.html
@@ -19,6 +19,10 @@
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-OERcA2EqjJCMA+/3y+gxIOqMEjwtxJY7qPCqsdltbNJuaOe923+mo//f6V8Qbsw3" crossorigin="anonymous"></script>
         {% block scripts %}
         {% endblock %}
+
+        <style>
+        tr ul { padding-left: 1rem; }
+        </style>
     </head>
 
     <body>

diff --git a/waiverdb/templates/permissions.html b/waiverdb/templates/permissions.html
@@ -21,19 +21,23 @@
                     {% for p in permissions -%}
                     <tr>
                         <td>{{ p["name"] }}</td>
-                        <td>{{ p["maintainers"] | map("urlize") | join(" ") | safe }}</td>
-                        <td>{{ p["testcases"] | join("<br />") | replace('-', '&#8209;') | safe }}</td>
+                        <td><ul>
+                          {%- for maintainer in p["maintainers"] %}<li>{{ maintainer | urlize }}</li>{% endfor -%}
+                        </ul></td>
+                        <td><ul>
+                          {%- if p["_testcase_regex_pattern"] -%}<li><code>{{ p["_testcase_regex_pattern"] }}</code></li>{%- endif -%}
+                          {%- for testcase in p["testcases_ignore"] %}<li><b>NOT</b> <code>{{ testcase }}</code></li>{% endfor -%}
+                          {%- for testcase in p["testcases"] %}<li><code>{{ testcase }}</code></li>{% endfor -%}
+                        </ul></td>
                         <td>
                             {% if p["groups"] | length > 0 -%}
-                            <span class="font-weight-bold">Groups:</span><br />
-                            {{ p["groups"] | join("<br />") | replace('-', '&#8209;') | safe }}
-                                {% if p["users"] | length > 0 -%}
-                                <br />
-                                {%- endif %}
+                            <b>Groups:</b>
+                            <ul>{%- for group in p["groups"] %}<li>{{ group }}</li>{% endfor -%}</ul>
                             {%- endif %}
+
                             {% if p["users"] | length > 0 -%}
-                            <span class="font-weight-bold">Users:</span><br />
-                            {{ p["users"] | join("<br />") | replace('-', '&#8209;') | safe }}
+                            <b>Users:</b>
+                            <ul>{%- for group in p["users"] %}<li>{{ group }}</li>{% endfor -%}</ul>
                             {%- endif %}
                         </td>
                     </tr>