MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #787: federation issue due to missing error handling

This commit is contained in:
Eliot Berriot 2019-04-05 16:22:32 +02:00
parent 9bf1c0cde0
commit f5a6a40d7f
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/federation/activity.py
View File

@ -388,7 +388,7 @@ def recursive_getattr(obj, key, permissive=False):
def match_route(route, payload): def match_route(route, payload):
for key, value in route.items(): for key, value in route.items():
payload_value = recursive_getattr(payload, key) payload_value = recursive_getattr(payload, key, permissive=True)
if payload_value != value: if payload_value != value:
return False return False

5
api/tests/federation/test_activity.py
View File

@ -91,6 +91,11 @@ def test_receive_skips_if_no_matching_route(factories, now, mocker):
assert models.Activity.objects.count() == 0 assert models.Activity.objects.count() == 0
def test_match_route_ignore_payload_issues():
payload = {"object": "http://hello"}
assert activity.match_route({"object.type": "Test"}, payload) is False
@pytest.mark.parametrize( @pytest.mark.parametrize(
"params, policy_kwargs, expected", "params, policy_kwargs, expected",
[ [