Skip to content

[KYUUBI #7403] Password with colon bug fixes #7404

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
oh0873 wants to merge 1 commit into from
+11 −2
Closed

[KYUUBI #7403] Password with colon bug fixes #7404

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .../main/scala/org/apache/kyuubi/server/http/authentication/BasicAuthenticationHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class BasicAuthenticationHandler(basicAuthType: AuthType)
val authorization = getAuthorization(request)
val inputToken = Option(authorization).map(a => Base64.getDecoder.decode(a.getBytes()))
.getOrElse(Array.empty[Byte])
val creds = new String(inputToken, Charset.forName("UTF-8")).split(":")
val creds = new String(inputToken, Charset.forName("UTF-8")).split(":", 2)

if (allowAnonymous) {
authUser = creds.take(1).headOption.filterNot(_.isEmpty).getOrElse("anonymous")
Expand Down
2 changes: 1 addition & 1 deletion ...la/org/apache/kyuubi/server/http/authentication/KyuubiInternalAuthenticationHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class KyuubiInternalAuthenticationHandler extends AuthenticationHandler with Log
val authorization = getAuthorization(request)
val inputToken = Option(authorization).map(a => Base64.getDecoder.decode(a.getBytes()))
.getOrElse(Array.empty[Byte])
val creds = new String(inputToken, StandardCharsets.UTF_8).split(":")
val creds = new String(inputToken, StandardCharsets.UTF_8).split(":", 2)

if (creds.size < 2 || creds(0).trim.isEmpty || creds(1).trim.isEmpty) {
response.setHeader(WWW_AUTHENTICATE_HEADER, authScheme.toString)
Expand Down
9 changes: 9 additions & 0 deletions kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiRestAuthenticationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,15 @@ class KyuubiRestCustomAuthenticationTest extends KyuubiRestAuthenticationSuite {
assert(HttpServletResponse.SC_OK == response.getStatus)
}

test("test with invalid CUSTOM http basic authorization that contains colon") {
val response = webTarget.path("api/v1/sessions/count")
.request()
.header(AUTHORIZATION_HEADER, basicAuthorizationHeader("user", "password:with:colons"))
.get()

assert(HttpServletResponse.SC_FORBIDDEN == response.getStatus)
}

test("test with invalid CUSTOM http basic authorization") {
val response = webTarget.path("api/v1/sessions/count")
.request()
Expand Down
Loading