Skip to content

Don't pass unsanitized inputs into regex. #3054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjester merged 1 commit into from
Apr 12, 2021
Merged

Don't pass unsanitized inputs into regex. #3054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions contentcuration/contentcuration/viewsets/channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import logging
from functools import reduce
from operator import or_

from django.conf import settings
from django.db.models import Exists
Expand Down Expand Up @@ -566,16 +568,19 @@ def complete_annotations(self, queryset):

class AdminChannelFilter(BaseChannelFilter):
def filter_keywords(self, queryset, name, value):
regex = r"^(" + "|".join(value.split(" ")) + ")$"
keywords = value.split(" ")
editors_first_name = reduce(or_, (Q(editors__first_name__icontains=k) for k in keywords))
editors_last_name = reduce(or_, (Q(editors__last_name__icontains=k) for k in keywords))
editors_email = reduce(or_, (Q(editors__email__icontains=k) for k in keywords))
return queryset.annotate(primary_token=primary_token_subquery,).filter(
Q(name__icontains=value)
| Q(pk__istartswith=value)
| Q(primary_token=value.replace("-", ""))
| (
Q(editors__first_name__iregex=regex)
& Q(editors__last_name__iregex=regex)
editors_first_name
& editors_last_name
)
| Q(editors__email__iregex=regex)
| editors_email
)


Expand Down