yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 19:19:31 +02:00
Code Issues Releases Wiki Activity

See #170: apply proper special chars and username blacklist to channel names

Browse source
This commit is contained in:
Eliot Berriot 2020-02-14 13:59:53 +01:00
parent 581c531fca
commit dfaff270ab
No known key found for this signature in database
GPG key ID: 6B501DFD73514E14
2 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/funkwhale_api/audio/serializers.py
View file

@ -1,3 +1,4 @@
from django.conf import settings
from django.db import transaction
from rest_framework import serializers
@ -13,6 +14,7 @@ from funkwhale_api.music import models as music_models
from funkwhale_api.music import serializers as music_serializers
from funkwhale_api.tags import models as tags_models
from funkwhale_api.tags import serializers as tags_serializers
from funkwhale_api.users import serializers as users_serializers
from . import categories
from . import models
@ -52,7 +54,10 @@ class ChannelMetadataSerializer(serializers.Serializer):
class ChannelCreateSerializer(serializers.Serializer):
name = serializers.CharField(max_length=music_models.MAX_LENGTHS["ARTIST_NAME"])
username = serializers.CharField(max_length=music_models.MAX_LENGTHS["ARTIST_NAME"])
username = serializers.CharField(
max_length=music_models.MAX_LENGTHS["ARTIST_NAME"],
validators=[users_serializers.ASCIIUsernameValidator()],
)
description = common_serializers.ContentSerializer(allow_null=True)
tags = tags_serializers.TagsListField()
content_category = serializers.ChoiceField(
@ -76,6 +81,9 @@ class ChannelCreateSerializer(serializers.Serializer):
return validated_data
def validate_username(self, value):
if value.lower() in [n.lower() for n in settings.ACCOUNT_USERNAME_BLACKLIST]:
raise serializers.ValidationError("This username is already taken")
matching = federation_models.Actor.objects.local().filter(
preferred_username__iexact=value
)