Skip to content
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.

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

feat: improved user creation validation #524

Merged
merged 1 commit into from
Oct 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Add compute task category unknown value
- Improved validation at user creation.

### Fixed

Expand Down
29 changes: 29 additions & 0 deletions backend/users/tests/test_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ def test_user_create_unauthorized(self):

assert response.status_code == status.HTTP_401_UNAUTHORIZED

@pytest.mark.django_db
def test_user_create_duplicate(self):
data = {"username": "substra", "password": "pas$w0rdtestofdrea6S43"}

response = AuthenticatedClient(role=UserChannel.Role.ADMIN, channel=self.channel).post(self.url, data=data)

assert response.status_code == status.HTTP_400_BAD_REQUEST
assert response.data.get("message") == "Username already exists"

@pytest.mark.django_db
def test_user_create_short_password(self):
data = {"username": "toto", "password": "password"}
Expand All @@ -52,6 +61,14 @@ def test_user_create_short_password(self):

assert response.status_code == status.HTTP_400_BAD_REQUEST

@pytest.mark.django_db
def test_user_create_empty_password(self):
data = {"username": "toto", "password": ""}

response = AuthenticatedClient(role=UserChannel.Role.ADMIN, channel=self.channel).post(self.url, data=data)

assert response.status_code == status.HTTP_400_BAD_REQUEST

@pytest.mark.django_db
def test_user_create_role_admin(self):
data = {"username": "toto", "password": "pas$w0rdtestofdrea6S43", "role": "ADMIN"}
Expand Down Expand Up @@ -114,6 +131,18 @@ def test_update_password_unauthorized(self):

assert response.status_code == status.HTTP_403_FORBIDDEN

@pytest.mark.django_db
def test_update_password_empty(self):
data = {"username": "toto", "password": "pas$w0rdtestofdrea6S43"}
response = AuthenticatedClient(role=UserChannel.Role.ADMIN, channel=self.channel).post(self.url, data=data)
assert response.status_code == status.HTTP_201_CREATED

url = reverse("user:users-password", args=["toto"])
data = {"password": ""}
response = AuthenticatedClient(role=UserChannel.Role.ADMIN, channel=self.channel).put(url, data=data)

assert response.status_code == status.HTTP_403_FORBIDDEN

@pytest.mark.django_db
def test_request_reset_token(self):
url = reverse("user:users-reset-password", args=["substra"])
Expand Down
15 changes: 13 additions & 2 deletions backend/users/views/user.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import datetime
from urllib.parse import unquote

import jwt
from django.conf import settings
Expand All @@ -21,6 +22,7 @@
from rest_framework.mixins import CreateModelMixin
from rest_framework.viewsets import GenericViewSet

from api.errors import BadRequestError
from api.views.filters_utils import MatchFilter
from api.views.utils import ApiResponse
from api.views.utils import get_channel_name
Expand All @@ -40,12 +42,20 @@ def _validate_channel(name):


def _validate_password(password, user):
if not password:
raise ValidationError("Missing password")
try:
validate_password(password, user)
except djangoValidationError as err:
raise ValidationError(err.error_list)


def _validate_username(username):
user_model = get_user_model()
if user_model.objects.filter(username=username).exists():
raise BadRequestError("Username already exists")


def _validate_role(role):
try:
role = UserChannel.Role[role]
Expand Down Expand Up @@ -124,6 +134,7 @@ def create(self, request, *args, **kwargs):
role = request.data.get("role")

_validate_channel(channel)
_validate_username(username)
sergebouchut2 marked this conversation as resolved.
Show resolved Hide resolved
_validate_password(password, self.user_model(username=username))

channel_data = {"channel_name": channel}
Expand Down Expand Up @@ -173,7 +184,7 @@ def set_password(self, request, *args, **kwargs):
token = request.data.get("token")
new_password = request.data.get("password")

username = kwargs.get("username")
username = unquote(kwargs.get("username"))
instance = self.user_model.objects.get(username=username)

secret = _xor_secrets(instance.password, force_str(settings.SECRET_KEY))
Expand All @@ -193,7 +204,7 @@ def verify_token(self, request, *args, **kwargs):
"""Return 200 if reset token is valid 401 otherwise. Accepts unauthenticated request"""
token = request.query_params.get("token", None)

username = kwargs.get("username")
username = unquote(kwargs.get("username"))
instance = self.user_model.objects.get(username=username)

secret = _xor_secrets(instance.password, force_str(settings.SECRET_KEY))
Expand Down