wangchunlin
/
cvat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix webhooks (#5611)

Browse Source
main
Kirill Sizov 3 years ago committed by GitHub
parent 58b05536f5
commit 4e3d81ccae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File

3
cvat/apps/webhooks/serializers.py
Unescape Escape View File

@ -60,6 +60,7 @@ class WebhookReadSerializer(serializers.ModelSerializer):
events = EventTypesSerializer(read_only=True) events = EventTypesSerializer(read_only=True)
project_id = serializers.IntegerField(required=False, allow_null=True)
type = serializers.ChoiceField(choices=WebhookTypeChoice.choices()) type = serializers.ChoiceField(choices=WebhookTypeChoice.choices())
content_type = serializers.ChoiceField(choices=WebhookContentTypeChoice.choices()) content_type = serializers.ChoiceField(choices=WebhookContentTypeChoice.choices())
@ -85,7 +86,7 @@ class WebhookReadSerializer(serializers.ModelSerializer):
"created_date", "created_date",
"updated_date", "updated_date",
"owner", "owner",
"project", "project_id",
"organization", "organization",
"events", "events",
"last_status", "last_status",

55
tests/python/rest_api/test_webhooks.py
Unescape Escape View File

@ -381,7 +381,7 @@ class TestGetWebhooks:
for webhook in proj_webhooks for webhook in proj_webhooks
if "admin" in user["groups"] if "admin" in user["groups"]
and webhook["owner"]["id"] != user["id"] and webhook["owner"]["id"] != user["id"]
and projects[webhook["project"]]["owner"]["id"] != user["id"] and projects[webhook["project_id"]]["owner"]["id"] != user["id"]
) )
) )
@ -400,7 +400,7 @@ class TestGetWebhooks:
for user in users for user in users
for webhook in proj_webhooks for webhook in proj_webhooks
if privilege not in user["groups"] if privilege not in user["groups"]
and projects[webhook["project"]]["owner"]["id"] == user["id"] and projects[webhook["project_id"]]["owner"]["id"] == user["id"]
) )
) )
@ -437,7 +437,7 @@ class TestGetWebhooks:
for user in users for user in users
for webhook in proj_webhooks for webhook in proj_webhooks
if privilege in user["groups"] if privilege in user["groups"]
and projects[webhook["project"]]["owner"]["id"] != user["id"] and projects[webhook["project_id"]]["owner"]["id"] != user["id"]
and webhook["owner"]["id"] != user["id"] and webhook["owner"]["id"] != user["id"]
) )
) )
@ -467,7 +467,7 @@ class TestGetWebhooks:
(user["username"], webhook) (user["username"], webhook)
for webhook in proj_webhooks for webhook in proj_webhooks
for user in find_users(role=role, org=webhook["organization"]) for user in find_users(role=role, org=webhook["organization"])
if projects[webhook["project"]]["owner"]["id"] != user["id"] if projects[webhook["project_id"]]["owner"]["id"] != user["id"]
and webhook["owner"]["id"] != user["id"] and webhook["owner"]["id"] != user["id"]
) )
) )
@ -497,7 +497,7 @@ class TestGetWebhooks:
(user["username"], webhook) (user["username"], webhook)
for webhook in proj_webhooks for webhook in proj_webhooks
for user in find_users(role=role, org=webhook["organization"]) for user in find_users(role=role, org=webhook["organization"])
if projects[webhook["project"]]["owner"]["id"] != user["id"] if projects[webhook["project_id"]]["owner"]["id"] != user["id"]
and webhook["owner"]["id"] != user["id"] and webhook["owner"]["id"] != user["id"]
) )
) )
@ -516,7 +516,7 @@ class TestGetWebhooks:
(user["username"], webhook) (user["username"], webhook)
for webhook in proj_webhooks for webhook in proj_webhooks
for user in find_users(role=role, org=webhook["organization"]) for user in find_users(role=role, org=webhook["organization"])
if projects[webhook["project"]]["owner"]["id"] == user["id"] if projects[webhook["project_id"]]["owner"]["id"] == user["id"]
or webhook["owner"]["id"] == user["id"] or webhook["owner"]["id"] == user["id"]
) )
) )
@ -540,7 +540,7 @@ class TestGetListWebhooks:
def test_admin_can_get_webhooks_for_project(self, webhooks): def test_admin_can_get_webhooks_for_project(self, webhooks):
pid = next( pid = next(
( (
webhook["project"] webhook["project_id"]
for webhook in webhooks for webhook in webhooks
if webhook["type"] == "project" and webhook["organization"] is None if webhook["type"] == "project" and webhook["organization"] is None
) )
@ -549,7 +549,7 @@ class TestGetListWebhooks:
expected_response = [ expected_response = [
webhook webhook
for webhook in webhooks for webhook in webhooks
if webhook["type"] == "project" and webhook["project"] == pid if webhook["type"] == "project" and webhook["project_id"] == pid
] ]
filter_val = '{"and":[{"==":[{"var":"project_id"},%s]}]}' % pid filter_val = '{"and":[{"==":[{"var":"project_id"},%s]}]}' % pid
@ -573,7 +573,7 @@ class TestGetListWebhooks:
def test_admin_can_get_webhooks_for_project_in_org(self, webhooks): def test_admin_can_get_webhooks_for_project_in_org(self, webhooks):
pid, oid = next( pid, oid = next(
( (
(webhook["project"], webhook["organization"]) (webhook["project_id"], webhook["organization"])
for webhook in webhooks for webhook in webhooks
if webhook["type"] == "project" and webhook["organization"] is not None if webhook["type"] == "project" and webhook["organization"] is not None
) )
@ -582,7 +582,7 @@ class TestGetListWebhooks:
expected_response = [ expected_response = [
webhook webhook
for webhook in webhooks for webhook in webhooks
if webhook["project"] == pid and webhook["organization"] == oid if webhook["project_id"] == pid and webhook["organization"] == oid
] ]
filter_val = '{"and":[{"==":[{"var":"project_id"},%s]}]}' % pid filter_val = '{"and":[{"==":[{"var":"project_id"},%s]}]}' % pid
@ -597,13 +597,13 @@ class TestGetListWebhooks:
): ):
username, pid = next( username, pid = next(
( (
(user["username"], webhook["project"]) (user["username"], webhook["project_id"])
for user in find_users(privilege=privilege) for user in find_users(privilege=privilege)
for webhook in webhooks for webhook in webhooks
if webhook["type"] == "project" if webhook["type"] == "project"
and webhook["organization"] is None and webhook["organization"] is None
and webhook["owner"]["id"] != user["id"] and webhook["owner"]["id"] != user["id"]
and projects[webhook["project"]]["owner"]["id"] != user["id"] and projects[webhook["project_id"]]["owner"]["id"] != user["id"]
) )
) )
@ -618,16 +618,18 @@ class TestGetListWebhooks:
def test_user_can_get_webhook_list_for_project(self, privilege, find_users, webhooks, projects): def test_user_can_get_webhook_list_for_project(self, privilege, find_users, webhooks, projects):
username, pid = next( username, pid = next(
( (
(user["username"], webhook["project"]) (user["username"], webhook["project_id"])
for user in find_users(privilege=privilege) for user in find_users(privilege=privilege)
for webhook in webhooks for webhook in webhooks
if webhook["type"] == "project" if webhook["type"] == "project"
and webhook["organization"] is None and webhook["organization"] is None
and projects[webhook["project"]]["owner"]["id"] == user["id"] and projects[webhook["project_id"]]["owner"]["id"] == user["id"]
) )
) )
expected_response = [w for w in webhooks if w["type"] == "project" and w["project"] == pid] expected_response = [
w for w in webhooks if w["type"] == "project" and w["project_id"] == pid
]
filter_val = '{"and":[{"==":[{"var":"project_id"},%s]}]}' % pid filter_val = '{"and":[{"==":[{"var":"project_id"},%s]}]}' % pid
response = get_method(username, "webhooks", filter=filter_val) response = get_method(username, "webhooks", filter=filter_val)
@ -691,8 +693,8 @@ class TestGetListWebhooks:
and ( and (
webhook["owner"]["username"] == username webhook["owner"]["username"] == username
or ( or (
webhook["project"] webhook["project_id"]
and projects[webhook["project"]]["owner"]["username"] == username and projects[webhook["project_id"]]["owner"]["username"] == username
) )
) )
] ]
@ -714,7 +716,7 @@ class TestGetListWebhooks:
for user in find_users(role=role, org=org["id"]) for user in find_users(role=role, org=org["id"])
if webhook["organization"] == org["id"] if webhook["organization"] == org["id"]
and webhook["type"] == "project" and webhook["type"] == "project"
and projects[webhook["project"]]["owner"]["id"] == user["id"] and projects[webhook["project_id"]]["owner"]["id"] == user["id"]
) )
) )
@ -723,7 +725,7 @@ class TestGetListWebhooks:
for webhook in webhooks for webhook in webhooks
if webhook["organization"] == org_id if webhook["organization"] == org_id
and webhook["type"] == "project" and webhook["type"] == "project"
and projects[webhook["project"]]["owner"]["username"] == username and projects[webhook["project_id"]]["owner"]["username"] == username
] ]
response = get_method(username, "webhooks", org_id=org_id) response = get_method(username, "webhooks", org_id=org_id)
@ -914,7 +916,7 @@ class TestPatchWebhooks:
for u in find_users(role=role, org=o["id"]) for u in find_users(role=role, org=o["id"])
for w in proj_webhooks for w in proj_webhooks
for p in projects_by_org.get(o["id"], []) for p in projects_by_org.get(o["id"], [])
if w["project"] == p["id"] if w["project_id"] == p["id"]
and w["organization"] == o["id"] and w["organization"] == o["id"]
and not is_project_staff(u["id"], p["id"]) and not is_project_staff(u["id"], p["id"])
and w["owner"]["id"] != u["id"] and w["owner"]["id"] != u["id"]
@ -953,7 +955,7 @@ class TestPatchWebhooks:
for u in find_users(role=role, org=o["id"]) for u in find_users(role=role, org=o["id"])
for w in proj_webhooks for w in proj_webhooks
for p in projects_by_org.get(o["id"], []) for p in projects_by_org.get(o["id"], [])
if w["project"] == p["id"] if w["project_id"] == p["id"]
and w["organization"] == o["id"] and w["organization"] == o["id"]
and u["id"] == p["owner"]["id"] and u["id"] == p["owner"]["id"]
) )
@ -994,7 +996,7 @@ class TestDeleteWebhooks:
if webhook["type"] == "project" if webhook["type"] == "project"
and webhook["organization"] is None and webhook["organization"] is None
and webhook["owner"]["id"] != user["id"] and webhook["owner"]["id"] != user["id"]
and projects[webhook["project"]]["owner"]["id"] != user["id"] and projects[webhook["project_id"]]["owner"]["id"] != user["id"]
) )
) )
@ -1020,7 +1022,7 @@ class TestDeleteWebhooks:
if webhook["type"] == "project" if webhook["type"] == "project"
and webhook["organization"] is not None and webhook["organization"] is not None
and webhook["owner"]["id"] != user["id"] and webhook["owner"]["id"] != user["id"]
and projects[webhook["project"]]["owner"]["id"] != user["id"] and projects[webhook["project_id"]]["owner"]["id"] != user["id"]
and not is_org_member(user["id"], webhook["organization"]) and not is_org_member(user["id"], webhook["organization"])
) )
) )
@ -1063,7 +1065,7 @@ class TestDeleteWebhooks:
for webhook in webhooks for webhook in webhooks
if webhook["type"] == "project" if webhook["type"] == "project"
and webhook["organization"] is None and webhook["organization"] is None
and projects[webhook["project"]]["owner"]["id"] == user["id"] and projects[webhook["project_id"]]["owner"]["id"] == user["id"]
) )
) )
@ -1101,7 +1103,6 @@ class TestDeleteWebhooks:
) )
def test_member_can_delete_org_webhook(self, role, allow, find_users, organizations, webhooks): def test_member_can_delete_org_webhook(self, role, allow, find_users, organizations, webhooks):
org_webhooks = [w for w in webhooks if w["type"] == "organization"] org_webhooks = [w for w in webhooks if w["type"] == "organization"]
print(org_webhooks)
username, org_id, webhook_id = next( username, org_id, webhook_id = next(
( (
(user["username"], org["id"], webhook["id"]) (user["username"], org["id"], webhook["id"])
@ -1138,7 +1139,7 @@ class TestDeleteWebhooks:
for webhook in proj_webhooks for webhook in proj_webhooks
if webhook["organization"] if webhook["organization"]
and webhook["organization"] == org["id"] and webhook["organization"] == org["id"]
and projects[webhook["project"]]["owner"]["id"] != user["id"] and projects[webhook["project_id"]]["owner"]["id"] != user["id"]
and webhook["owner"]["id"] != user["id"] and webhook["owner"]["id"] != user["id"]
) )
) )
@ -1167,7 +1168,7 @@ class TestDeleteWebhooks:
if webhook["organization"] if webhook["organization"]
and webhook["organization"] == org["id"] and webhook["organization"] == org["id"]
and ( and (
projects[webhook["project"]]["owner"]["id"] == user["id"] projects[webhook["project_id"]]["owner"]["id"] == user["id"]
or webhook["owner"]["id"] == user["id"] or webhook["owner"]["id"] == user["id"]
) )
) )

8
tests/python/shared/assets/webhooks.json
Unescape Escape View File

@ -38,7 +38,7 @@
"url": "http://localhost:8080/api/users/1", "url": "http://localhost:8080/api/users/1",
"username": "admin1" "username": "admin1"
}, },
"project": null, "project_id": null,
"target_url": "http://example.com/", "target_url": "http://example.com/",
"type": "organization", "type": "organization",
"updated_date": "2022-09-29T08:00:48.441000Z", "updated_date": "2022-09-29T08:00:48.441000Z",
@ -65,7 +65,7 @@
"url": "http://localhost:8080/api/users/3", "url": "http://localhost:8080/api/users/3",
"username": "user2" "username": "user2"
}, },
"project": 3, "project_id": 3,
"target_url": "http://example.com", "target_url": "http://example.com",
"type": "project", "type": "project",
"updated_date": "2022-09-28T12:19:49.744000Z", "updated_date": "2022-09-28T12:19:49.744000Z",
@ -101,7 +101,7 @@
"url": "http://localhost:8080/api/users/10", "url": "http://localhost:8080/api/users/10",
"username": "business1" "username": "business1"
}, },
"project": 1, "project_id": 1,
"target_url": "http://example.com/", "target_url": "http://example.com/",
"type": "project", "type": "project",
"updated_date": "2022-09-28T12:18:12.412000Z", "updated_date": "2022-09-28T12:18:12.412000Z",
@ -128,7 +128,7 @@
"url": "http://localhost:8080/api/users/2", "url": "http://localhost:8080/api/users/2",
"username": "user1" "username": "user1"
}, },
"project": 6, "project_id": 6,
"target_url": "http://example.com/", "target_url": "http://example.com/",
"type": "project", "type": "project",
"updated_date": "2022-09-28T12:16:28.311000Z", "updated_date": "2022-09-28T12:16:28.311000Z",

Write Preview
Loading…
Cancel
Save