1
0
mirror of https://github.com/quay/quay.git synced 2026-01-26 06:21:37 +03:00

[redhat-3.12] api: adding token to global readonly user list robots (PROJQUAY-7177) (#3083)

Adding token to list robots api when calling as global readonly superuser.

Co-authored-by: bcaton <bcaton@redhat.com>
This commit is contained in:
OpenShift Cherrypick Robot
2024-07-25 16:50:38 +02:00
committed by GitHub
parent 4df87fbe09
commit cd29306bf4
2 changed files with 10 additions and 3 deletions

View File

@@ -188,9 +188,10 @@ class OrgRobotList(ApiResource):
"""
permission = OrganizationMemberPermission(orgname)
if permission.can() or allow_if_superuser() or allow_if_global_readonly_superuser():
include_token = AdministerOrganizationPermission(orgname).can() and parsed_args.get(
"token", True
)
include_token = (
AdministerOrganizationPermission(orgname).can()
or allow_if_global_readonly_superuser()
) and parsed_args.get("token", True)
include_permissions = AdministerOrganizationPermission(
orgname
).can() and parsed_args.get("permissions", False)

View File

@@ -3919,6 +3919,12 @@ class TestOrgRobots(ApiTestCase):
self.assertEqual(json["token"], json2["token"])
def test_get_robots_as_globalreadonlysuperuser(self):
self.login("globalreadonlysuperuser")
params = dict(orgname=ORGANIZATION)
for r in self.getJsonResponse(OrgRobotList, params=params)["robots"]:
assert "token" in r
class TestLogs(ApiTestCase):
def test_repo_logs(self):