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

Merge branch 'subsonic-throttling' into 'develop' 

Use a dedicated scope for throttling subsonic to avoid intrusive rate-limiting

See merge request funkwhale/funkwhale!987
This commit is contained in:
Eliot Berriot 2020-01-06 10:00:39 +01:00
parent 82692f1170 9d73a77f7e
commit 80f67754fb
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/config/settings/common.py
View File

@ -759,6 +759,10 @@ THROTTLING_RATES = {
"rate": THROTTLING_USER_RATES.get("anonymous-update", "1000/day"), "rate": THROTTLING_USER_RATES.get("anonymous-update", "1000/day"),
"description": "Anonymous PATCH and PUT requests on resource detail", "description": "Anonymous PATCH and PUT requests on resource detail",
}, },
"subsonic": {
"rate": THROTTLING_USER_RATES.get("subsonic", "1000/hour"),
"description": "All subsonic API requests",
},
# potentially spammy / dangerous endpoints # potentially spammy / dangerous endpoints
"authenticated-reports": { "authenticated-reports": {
"rate": THROTTLING_USER_RATES.get("authenticated-reports", "100/day"), "rate": THROTTLING_USER_RATES.get("authenticated-reports", "100/day"),

1
api/funkwhale_api/subsonic/views.py
View File

@ -104,6 +104,7 @@ class SubsonicViewSet(viewsets.GenericViewSet):
content_negotiation_class = negotiation.SubsonicContentNegociation content_negotiation_class = negotiation.SubsonicContentNegociation
authentication_classes = [authentication.SubsonicAuthentication] authentication_classes = [authentication.SubsonicAuthentication]
permission_classes = [rest_permissions.IsAuthenticated] permission_classes = [rest_permissions.IsAuthenticated]
throttling_scopes = {"*": {"authenticated": "subsonic", "anonymous": "subsonic"}}
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
if not preferences.get("subsonic__enabled"): if not preferences.get("subsonic__enabled"):

1
changes/changelog.d/subsonic-throttling.enhancement Normal file
View File

@ -0,0 +1 @@
Use a dedicated scope for throttling subsonic to avoid intrusive rate-limiting