Skip to content

Fix kyuubi sessions to return 404 for non-existent sessions #7319

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

Closed
Yutong-1424 wants to merge 6 commits into from
Closed

Fix kyuubi sessions to return 404 for non-existent sessions #7319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a4d81e9
Fix kyuubi sessions API to return 404 for non-existent sessions and a…
yutong-27 Jan 30, 2026
79f6406
- Replace try/catch with getSessionOption() for cleaner 404 handling
yutong-27 Mar 7, 2026
14c03d9
Replace try/catch exception handling with direct session existence check
yutong-27 Mar 8, 2026
aade31c
fix: compare session identifier as string in SessionsResourceSuite
yutong-27 Mar 19, 2026
0b0d0e7
Replace admin with clientPrincipalUser so openSession’s user matches …
yutong-27 Mar 27, 2026
e2e3fd8
revert security improvement changes
yutong-27 Mar 27, 2026
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
10 changes: 8 additions & 2 deletions kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/AdminResource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,14 @@ private[v1] class AdminResource extends ApiRequestContext with Logging {
throw new ForbiddenException(
s"$userName is not allowed to close the session $sessionHandleStr")
}
fe.be.closeSession(SessionHandle.fromUUID(sessionHandleStr))
Response.ok(s"Session $sessionHandleStr is closed successfully.").build()
val sessionHandle = SessionHandle.fromUUID(sessionHandleStr)
fe.be.sessionManager.getSessionOption(sessionHandle) match {
case Some(_) =>
fe.be.closeSession(sessionHandle)
Response.ok(s"Session $sessionHandleStr is closed successfully.").build()
case None =>
throw new NotFoundException(s"Invalid session handle: $sessionHandleStr")
}
}

@ApiResponse(
Expand Down
10 changes: 8 additions & 2 deletions kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/SessionsResource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,14 @@ private[v1] class SessionsResource extends ApiRequestContext with Logging {
@Path("{sessionHandle}")
def closeSession(@PathParam("sessionHandle") sessionHandleStr: String): Response = {
info(s"Received request of closing $sessionHandleStr")
fe.be.closeSession(sessionHandleStr)
Response.ok().build()
val sessionHandle = SessionHandle.fromUUID(sessionHandleStr)
fe.be.sessionManager.getSessionOption(sessionHandle) match {
case Some(_) =>
fe.be.closeSession(sessionHandle)
Response.ok().build()
case None =>
throw new NotFoundException(s"Invalid session handle: $sessionHandleStr")
}
}

@ApiResponse(
Expand Down
9 changes: 9 additions & 0 deletions kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,15 @@ class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
assert(sessions2.isEmpty)
}

test("delete non-existent admin session returns 404") {
val nonExistentSessionId = java.util.UUID.randomUUID().toString
val response = webTarget.path(s"api/v1/admin/sessions/$nonExistentSessionId").request()
.header(AUTHORIZATION_HEADER, HttpAuthUtils.basicAuthorizationHeader(Utils.currentUser))
.delete()
assert(response.getStatus === 404)
assert(response.readEntity(classOf[String]).contains("Invalid"))
}

test("list sessions/operations with filter") {
fe.be.openSession(
HIVE_CLI_SERVICE_PROTOCOL_V2,
Expand Down
Loading