From 7b4e32de569f21f512527a077654d40177f0b4ff Mon Sep 17 00:00:00 2001 From: Matthew Ball Date: Fri, 20 Nov 2026 11:37:56 -0800 Subject: [PATCH] fix(resource): return 400 not 500 when revoking access for an unknown email ResourceAccess.revoke resolved the grantee with ctx.select(USER.UID)...fetchOne().value1(), which returns null for an email that is not a registered user, so value1() threw a NullPointerException and the endpoint answered 500. revoke now resolves the uid through OwnerAccess.registeredUid and throws BadRequestException for an unregistered email, mirroring grant, so an unknown email yields a 400. ResourceAccessSpec adds a revoke case asserting an unregistered email gives a 400 BadRequestException rather than crashing. --- .../apache/texera/service/resource/ResourceAccess.scala | 4 +++- .../texera/service/resource/ResourceAccessSpec.scala | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/resource/src/main/scala/org/apache/texera/service/resource/ResourceAccess.scala b/common/resource/src/main/scala/org/apache/texera/service/resource/ResourceAccess.scala index 55cf4a55a8d..45589d51d83 100644 --- a/common/resource/src/main/scala/org/apache/texera/service/resource/ResourceAccess.scala +++ b/common/resource/src/main/scala/org/apache/texera/service/resource/ResourceAccess.scala @@ -311,7 +311,9 @@ object ResourceAccess { requesterUid: Integer ): Response = { requireWriteAccess(ctx, resource, id, requesterUid) - val granteeUid = ctx.select(USER.UID).from(USER).where(USER.EMAIL.eq(email)).fetchOne().value1() + val granteeUid = OwnerAccess + .registeredUid(ctx, email) + .getOrElse(throw new BadRequestException(s"No registered user with email $email")) OwnerAccess.requireNotOwner(userOwns(ctx, resource, id, granteeUid)) ctx diff --git a/common/resource/src/test/scala/org/apache/texera/service/resource/ResourceAccessSpec.scala b/common/resource/src/test/scala/org/apache/texera/service/resource/ResourceAccessSpec.scala index 5a2b72a4be9..d019200de09 100644 --- a/common/resource/src/test/scala/org/apache/texera/service/resource/ResourceAccessSpec.scala +++ b/common/resource/src/test/scala/org/apache/texera/service/resource/ResourceAccessSpec.scala @@ -18,7 +18,7 @@ package org.apache.texera.service.resource -import jakarta.ws.rs.ForbiddenException +import jakarta.ws.rs.{BadRequestException, ForbiddenException} import org.apache.texera.dao.MockTexeraDB import org.apache.texera.dao.jooq.generated.enums.{PrivilegeEnum, UserRoleEnum} import org.apache.texera.dao.jooq.generated.tables.DatasetUserAccess.DATASET_USER_ACCESS @@ -263,4 +263,11 @@ class ResourceAccessSpec .getStatus shouldBe 200 rowOf(grantee.getUid) shouldBe None } + + it should "reject an unregistered email with 400, not crash with a 500" in { + val ex = intercept[BadRequestException] { + ResourceAccess.revoke(getDSLContext, resource, did, "nobody@test.com", owner.getUid) + } + ex.getResponse.getStatus shouldBe 400 + } }