diff --git a/src/backend/InvenTree/scim/views.py b/src/backend/InvenTree/scim/views.py index 4804da460c..72d11292f1 100644 --- a/src/backend/InvenTree/scim/views.py +++ b/src/backend/InvenTree/scim/views.py @@ -18,6 +18,7 @@ from rest_framework.exceptions import ( APIException, AuthenticationFailed, NotAuthenticated, + ParseError, ) from rest_framework.parsers import JSONParser from rest_framework.renderers import JSONRenderer @@ -27,6 +28,7 @@ from scim2_models import ( AuthenticationScheme, Bulk, ChangePassword, + Context, Error, ETag, Filter, @@ -133,6 +135,9 @@ class ScimAPIView(APIView): None, ) + if isinstance(exc, ParseError): + return scim_error(exc.status_code, str(exc.detail), 'invalidSyntax') + if isinstance(exc, APIException): # pragma: no cover detail = exc.detail if isinstance(detail, (list, dict)): @@ -317,7 +322,9 @@ class UsersView(BaseResourceView): def post(self, request, *args, **kwargs): """Provision a new user.""" - scim_user = User.model_validate(request.data) + scim_user = User.model_validate( + request.data, scim_ctx=Context.RESOURCE_CREATION_REQUEST + ) if DjangoUser.objects.filter(username__iexact=scim_user.user_name).exists(): return scim_error( @@ -351,7 +358,9 @@ class UserDetailView(ScimAPIView): def put(self, request, pk, *args, **kwargs): """Replace a user's attributes.""" user = self.get_object(pk) - scim_user = User.model_validate(request.data) + scim_user = User.model_validate( + request.data, scim_ctx=Context.RESOURCE_REPLACEMENT_REQUEST + ) apply_scim_to_user(scim_user, user) user.save() return ScimResponse(user) @@ -398,7 +407,9 @@ class GroupsView(BaseResourceView): def post(self, request, *args, **kwargs): """Provision a new group.""" - scim_group = Group.model_validate(request.data) + scim_group = Group.model_validate( + request.data, scim_ctx=Context.RESOURCE_CREATION_REQUEST + ) if DjangoGroup.objects.filter(name__iexact=scim_group.display_name).exists(): return scim_error( @@ -431,7 +442,9 @@ class GroupDetailView(ScimAPIView): def put(self, request, pk, *args, **kwargs): """Replace a group's attributes and membership.""" group = self.get_object(pk) - scim_group = Group.model_validate(request.data) + scim_group = Group.model_validate( + request.data, scim_ctx=Context.RESOURCE_REPLACEMENT_REQUEST + ) apply_scim_to_group(scim_group, group) group.save() set_group_members(group, scim_group.members) diff --git a/src/backend/requirements-3.14.txt b/src/backend/requirements-3.14.txt index b98e540e33..5bc5176881 100644 --- a/src/backend/requirements-3.14.txt +++ b/src/backend/requirements-3.14.txt @@ -2591,9 +2591,9 @@ s3transfer==0.19.3 \ # via # -c src/backend/requirements.txt # boto3 -scim2-models==0.12.2 \ - --hash=sha256:721b627f9ae50d24956103ba9fc2e852a1badbada8d25c0939bc8656881af62a \ - --hash=sha256:c8b1f7ae25af4874dba53edd2855ce126f7594d0dbe694a6e9bb32c369082234 +scim2-models==0.12.4 \ + --hash=sha256:d219558358557a674e0a5b85f6d11cb2cd8cdf3182c4942df0956891be052e8e \ + --hash=sha256:d3cfaafbe49d6daa61b63afe0f0536774e7543218eaa222164ccb95ecb8871aa # via # -c src/backend/requirements.txt # -r src/backend/requirements.in diff --git a/src/backend/requirements-dev-3.14.txt b/src/backend/requirements-dev-3.14.txt index 3e990945f3..62cb288819 100644 --- a/src/backend/requirements-dev-3.14.txt +++ b/src/backend/requirements-dev-3.14.txt @@ -956,24 +956,24 @@ rich==15.0.0 \ # via # -c src/backend/requirements-dev.txt # pytest-codspeed -scim2-client==0.13.2 \ - --hash=sha256:1397962f294f95c8982c543d422e2fa7fcf9295d5eb1af73067ab142090608e0 \ - --hash=sha256:9fafa5d903e1fae513a0d946ce7cd5fad2d697d47b55ae0b3204c0848c6d4b48 +scim2-client==0.14.1 \ + --hash=sha256:6f60caa7f3df6657a28885bd7b3dbbe5773ffb747bdc3cee0eaf35cb02452bc7 \ + --hash=sha256:bf7c3f3cf9da7cb8e813eaf560cfeab8037f6c1b5ab81b56cf137d8f94d3b7cd # via # -c src/backend/requirements-dev.txt # scim2-tester -scim2-models==0.12.2 \ - --hash=sha256:721b627f9ae50d24956103ba9fc2e852a1badbada8d25c0939bc8656881af62a \ - --hash=sha256:c8b1f7ae25af4874dba53edd2855ce126f7594d0dbe694a6e9bb32c369082234 +scim2-models==0.12.4 \ + --hash=sha256:d219558358557a674e0a5b85f6d11cb2cd8cdf3182c4942df0956891be052e8e \ + --hash=sha256:d3cfaafbe49d6daa61b63afe0f0536774e7543218eaa222164ccb95ecb8871aa # via # -c src/backend/requirements-3.14.txt # -c src/backend/requirements-dev.txt # -c src/backend/requirements.txt # scim2-client # scim2-tester -scim2-tester==0.6.1 \ - --hash=sha256:9ab6d38f3b264be84a5fa7bb53f4040acc9762028399acba4b93294aaf02250a \ - --hash=sha256:f915b261a49dba47e486a16f71d8c74c287a3d0257d645b2a08c24463ccf06f0 +scim2-tester==0.6.4 \ + --hash=sha256:a4d5e522f228d2d2afaa147d66c641bc5659dcdde5967411fb4b830b08198a8a \ + --hash=sha256:df8c582d391511ae7f0d35e0d7bfe4916c79571af22768ab96cc43599765b144 # via # -c src/backend/requirements-dev.txt # -r src/backend/requirements-dev.in diff --git a/src/backend/requirements-dev.txt b/src/backend/requirements-dev.txt index 412c855418..0987483f95 100644 --- a/src/backend/requirements-dev.txt +++ b/src/backend/requirements-dev.txt @@ -871,20 +871,20 @@ rich==15.0.0 \ --hash=sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb \ --hash=sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36 # via pytest-codspeed -scim2-client==0.13.2 \ - --hash=sha256:1397962f294f95c8982c543d422e2fa7fcf9295d5eb1af73067ab142090608e0 \ - --hash=sha256:9fafa5d903e1fae513a0d946ce7cd5fad2d697d47b55ae0b3204c0848c6d4b48 +scim2-client==0.14.1 \ + --hash=sha256:6f60caa7f3df6657a28885bd7b3dbbe5773ffb747bdc3cee0eaf35cb02452bc7 \ + --hash=sha256:bf7c3f3cf9da7cb8e813eaf560cfeab8037f6c1b5ab81b56cf137d8f94d3b7cd # via scim2-tester -scim2-models==0.12.2 \ - --hash=sha256:721b627f9ae50d24956103ba9fc2e852a1badbada8d25c0939bc8656881af62a \ - --hash=sha256:c8b1f7ae25af4874dba53edd2855ce126f7594d0dbe694a6e9bb32c369082234 +scim2-models==0.12.4 \ + --hash=sha256:d219558358557a674e0a5b85f6d11cb2cd8cdf3182c4942df0956891be052e8e \ + --hash=sha256:d3cfaafbe49d6daa61b63afe0f0536774e7543218eaa222164ccb95ecb8871aa # via # -c src/backend/requirements.txt # scim2-client # scim2-tester -scim2-tester==0.6.1 \ - --hash=sha256:9ab6d38f3b264be84a5fa7bb53f4040acc9762028399acba4b93294aaf02250a \ - --hash=sha256:f915b261a49dba47e486a16f71d8c74c287a3d0257d645b2a08c24463ccf06f0 +scim2-tester==0.6.4 \ + --hash=sha256:a4d5e522f228d2d2afaa147d66c641bc5659dcdde5967411fb4b830b08198a8a \ + --hash=sha256:df8c582d391511ae7f0d35e0d7bfe4916c79571af22768ab96cc43599765b144 # via -r src/backend/requirements-dev.in setuptools==84.2.1 \ --hash=sha256:3ff8b3b5492a0aa66960f4419365a86b84e013070d4313e4d4a6894f5d64d6bc \ diff --git a/src/backend/requirements.txt b/src/backend/requirements.txt index fc4e320859..7860b57b6d 100644 --- a/src/backend/requirements.txt +++ b/src/backend/requirements.txt @@ -2341,9 +2341,9 @@ s3transfer==0.19.3 \ --hash=sha256:24eb7535804306355e31c952a90022bf5b2f9d760f9a11062c7493a217c08553 \ --hash=sha256:8326acc3d056d7f7b8a37110c7d2aea41f67e83f6ae79cd3b5fbcca34c726406 # via boto3 -scim2-models==0.12.2 \ - --hash=sha256:721b627f9ae50d24956103ba9fc2e852a1badbada8d25c0939bc8656881af62a \ - --hash=sha256:c8b1f7ae25af4874dba53edd2855ce126f7594d0dbe694a6e9bb32c369082234 +scim2-models==0.12.4 \ + --hash=sha256:d219558358557a674e0a5b85f6d11cb2cd8cdf3182c4942df0956891be052e8e \ + --hash=sha256:d3cfaafbe49d6daa61b63afe0f0536774e7543218eaa222164ccb95ecb8871aa # via -r src/backend/requirements.in sentry-sdk==2.74.0 \ --hash=sha256:40b205af015649df3ec9986e057ce24ce85956bee3fb75efa72c93aa7036bdff \