diff --git a/kyuubi-common/pom.xml b/kyuubi-common/pom.xml index 29a98ab7ff9..f20d0bc67e2 100644 --- a/kyuubi-common/pom.xml +++ b/kyuubi-common/pom.xml @@ -123,6 +123,11 @@ jackson-databind + + javax.servlet + javax.servlet-api + + com.zaxxer HikariCP diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthSchemes.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthSchemes.scala similarity index 94% rename from kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthSchemes.scala rename to kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthSchemes.scala index f78fe042545..34a5ba9b7b1 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthSchemes.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthSchemes.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.kyuubi.server.http.authentication +package org.apache.kyuubi.service.authentication object AuthSchemes extends Enumeration { type AuthScheme = Value diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthenticationAuditLogger.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthenticationAuditLogger.scala similarity index 87% rename from kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthenticationAuditLogger.scala rename to kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthenticationAuditLogger.scala index 43301dfab26..64d53ba1a9c 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthenticationAuditLogger.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthenticationAuditLogger.scala @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.kyuubi.server.http.authentication +package org.apache.kyuubi.service.authentication import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import org.apache.kyuubi.Logging -import org.apache.kyuubi.server.http.authentication.AuthenticationFilter._ +import org.apache.kyuubi.service.authentication.AuthenticationFilter.{getForwardedAddresses, HTTP_AUTH_TYPE, HTTP_CLIENT_IP_ADDRESS, HTTP_CLIENT_PROXY_USER_NAME, HTTP_CLIENT_USER_NAME, HTTP_FORWARDED_ADDRESSES, HTTP_PROXY_HEADER_CLIENT_IP_ADDRESS} object AuthenticationAuditLogger extends Logging { final private val AUDIT_BUFFER = new ThreadLocal[StringBuilder]() { diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthenticationFilter.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthenticationFilter.scala similarity index 95% rename from kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthenticationFilter.scala rename to kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthenticationFilter.scala index 1b4df7e3fa2..4a8e65c227e 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthenticationFilter.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthenticationFilter.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.kyuubi.server.http.authentication +package org.apache.kyuubi.service.authentication import java.io.IOException import javax.security.sasl.AuthenticationException @@ -27,18 +27,17 @@ import scala.collection.mutable import org.apache.kyuubi.Logging import org.apache.kyuubi.config.KyuubiConf import org.apache.kyuubi.config.KyuubiConf.{AUTHENTICATION_METHOD, FRONTEND_PROXY_HTTP_CLIENT_IP_HEADER} -import org.apache.kyuubi.server.http.util.HttpAuthUtils.AUTHORIZATION_HEADER -import org.apache.kyuubi.service.authentication.{AuthTypes, InternalSecurityAccessor} import org.apache.kyuubi.service.authentication.AuthTypes.{CUSTOM, KERBEROS, NOSASL} +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.AUTHORIZATION_HEADER class AuthenticationFilter(conf: KyuubiConf) extends Filter with Logging { import AuthenticationFilter._ import AuthSchemes._ - private[authentication] val authSchemeHandlers = + private[kyuubi] val authSchemeHandlers = new mutable.HashMap[AuthScheme, AuthenticationHandler]() - private[authentication] def addAuthHandler(authHandler: AuthenticationHandler): Unit = { + private[kyuubi] def addAuthHandler(authHandler: AuthenticationHandler): Unit = { authHandler.init(conf) if (authHandler.authenticationSupported) { if (authSchemeHandlers.contains(authHandler.authScheme)) { diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthenticationHandler.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthenticationHandler.scala similarity index 95% rename from kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthenticationHandler.scala rename to kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthenticationHandler.scala index a0b3fb4ab37..7bcc3239eda 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/AuthenticationHandler.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/AuthenticationHandler.scala @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.kyuubi.server.http.authentication +package org.apache.kyuubi.service.authentication import javax.security.sasl.AuthenticationException import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import org.apache.kyuubi.config.KyuubiConf -import org.apache.kyuubi.server.http.authentication.AuthSchemes.AuthScheme -import org.apache.kyuubi.server.http.util.HttpAuthUtils.AUTHORIZATION_HEADER +import org.apache.kyuubi.service.authentication.AuthSchemes.AuthScheme +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.AUTHORIZATION_HEADER trait AuthenticationHandler { diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/BasicAuthenticationHandler.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/BasicAuthenticationHandler.scala similarity index 90% rename from kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/BasicAuthenticationHandler.scala rename to kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/BasicAuthenticationHandler.scala index 9d6d0445c8c..199665f26fc 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/BasicAuthenticationHandler.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/BasicAuthenticationHandler.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.kyuubi.server.http.authentication +package org.apache.kyuubi.service.authentication import java.nio.charset.Charset import java.util.Base64 @@ -23,10 +23,9 @@ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import org.apache.kyuubi.Logging import org.apache.kyuubi.config.KyuubiConf -import org.apache.kyuubi.server.http.authentication.AuthSchemes.AuthScheme -import org.apache.kyuubi.server.http.util.HttpAuthUtils.{AUTHORIZATION_HEADER, WWW_AUTHENTICATE_HEADER} -import org.apache.kyuubi.service.authentication.{AuthenticationProviderFactory, AuthMethods} +import org.apache.kyuubi.service.authentication.AuthSchemes.AuthScheme import org.apache.kyuubi.service.authentication.AuthTypes._ +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.{AUTHORIZATION_HEADER, WWW_AUTHENTICATE_HEADER} class BasicAuthenticationHandler(basicAuthType: AuthType) extends AuthenticationHandler with Logging { diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/BearerAuthenticationHandler.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/BearerAuthenticationHandler.scala similarity index 86% rename from kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/BearerAuthenticationHandler.scala rename to kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/BearerAuthenticationHandler.scala index 7d22df86845..7c3baa9c624 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/BearerAuthenticationHandler.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/BearerAuthenticationHandler.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.kyuubi.server.http.authentication +package org.apache.kyuubi.service.authentication import javax.servlet.http.{HttpServletRequest, HttpServletResponse} @@ -23,10 +23,9 @@ import org.apache.commons.lang3.StringUtils import org.apache.kyuubi.Logging import org.apache.kyuubi.config.KyuubiConf -import org.apache.kyuubi.server.http.authentication.AuthSchemes.AuthScheme -import org.apache.kyuubi.server.http.util.HttpAuthUtils -import org.apache.kyuubi.server.http.util.HttpAuthUtils.{AUTHORIZATION_HEADER, WWW_AUTHENTICATE_HEADER} -import org.apache.kyuubi.service.authentication.{AnonymousAuthenticationProviderImpl, AuthenticationProviderFactory, DefaultTokenCredential, TokenAuthenticationProvider} +import org.apache.kyuubi.service.authentication.AuthSchemes.AuthScheme +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.{AUTHORIZATION_HEADER, WWW_AUTHENTICATE_HEADER} class BearerAuthenticationHandler(providerClass: String) extends AuthenticationHandler with Logging { diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/KerberosAuthenticationHandler.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/KerberosAuthenticationHandler.scala similarity index 96% rename from kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/KerberosAuthenticationHandler.scala rename to kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/KerberosAuthenticationHandler.scala index 7220e3906eb..1f8d3d4f922 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/KerberosAuthenticationHandler.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/KerberosAuthenticationHandler.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.kyuubi.server.http.authentication +package org.apache.kyuubi.service.authentication import java.io.{File, IOException} import java.security.{PrivilegedActionException, PrivilegedExceptionAction} @@ -32,8 +32,8 @@ import org.ietf.jgss.{GSSContext, GSSCredential, GSSManager, Oid} import org.apache.kyuubi.Logging import org.apache.kyuubi.config.KyuubiConf -import org.apache.kyuubi.server.http.authentication.AuthSchemes.AuthScheme -import org.apache.kyuubi.server.http.util.HttpAuthUtils.{NEGOTIATE, WWW_AUTHENTICATE_HEADER} +import org.apache.kyuubi.service.authentication.AuthSchemes.AuthScheme +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.{NEGOTIATE, WWW_AUTHENTICATE_HEADER} class KerberosAuthenticationHandler extends AuthenticationHandler with Logging { diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/KyuubiInternalAuthenticationHandler.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/KyuubiInternalAuthenticationHandler.scala similarity index 89% rename from kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/KyuubiInternalAuthenticationHandler.scala rename to kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/KyuubiInternalAuthenticationHandler.scala index d910f4a8396..f64aaaa87fd 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/KyuubiInternalAuthenticationHandler.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/KyuubiInternalAuthenticationHandler.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.kyuubi.server.http.authentication +package org.apache.kyuubi.service.authentication import java.nio.charset.StandardCharsets import java.util.Base64 @@ -23,9 +23,8 @@ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import org.apache.kyuubi.Logging import org.apache.kyuubi.config.KyuubiConf -import org.apache.kyuubi.server.http.authentication.AuthSchemes.AuthScheme -import org.apache.kyuubi.server.http.util.HttpAuthUtils.WWW_AUTHENTICATE_HEADER -import org.apache.kyuubi.service.authentication.InternalSecurityAccessor +import org.apache.kyuubi.service.authentication.AuthSchemes.AuthScheme +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.WWW_AUTHENTICATE_HEADER class KyuubiInternalAuthenticationHandler extends AuthenticationHandler with Logging { diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/util/HttpAuthUtils.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/utils/HttpAuthUtils.scala similarity index 95% rename from kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/util/HttpAuthUtils.scala rename to kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/utils/HttpAuthUtils.scala index 60e5143d75a..69804ab1625 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/util/HttpAuthUtils.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/service/authentication/utils/HttpAuthUtils.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.kyuubi.server.http.util +package org.apache.kyuubi.service.authentication.utils import java.nio.charset.StandardCharsets import java.security.SecureRandom @@ -25,8 +25,7 @@ import java.util.{Base64, StringTokenizer} import scala.collection.mutable import org.apache.kyuubi.Logging -import org.apache.kyuubi.server.http.authentication.{AuthenticationFilter, AuthSchemes} -import org.apache.kyuubi.service.authentication.Credential +import org.apache.kyuubi.service.authentication.{AuthenticationFilter, AuthSchemes, Credential} object HttpAuthUtils extends Logging { // HTTP header used by the server endpoint during an authentication sequence. diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiRestFrontendService.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiRestFrontendService.scala index 8f9be59a54a..af179515fbf 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiRestFrontendService.scala +++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiRestFrontendService.scala @@ -36,10 +36,10 @@ import org.apache.kyuubi.metrics.{MetricsConstants, MetricsSystem} import org.apache.kyuubi.metrics.MetricsConstants.OPERATION_BATCH_PENDING_MAX_ELAPSE import org.apache.kyuubi.operation.OperationState import org.apache.kyuubi.server.api.v1.ApiRootResource -import org.apache.kyuubi.server.http.authentication.{AuthenticationFilter, KyuubiHttpAuthenticationFactory} +import org.apache.kyuubi.server.http.authentication.KyuubiHttpAuthenticationFactory import org.apache.kyuubi.server.ui.{JettyServer, JettyUtils} import org.apache.kyuubi.service.{AbstractFrontendService, Serverable, Service, ServiceUtils} -import org.apache.kyuubi.service.authentication.{AuthTypes, AuthUtils} +import org.apache.kyuubi.service.authentication.{AuthenticationFilter, AuthTypes, AuthUtils} import org.apache.kyuubi.session.{KyuubiBatchSession, KyuubiSessionManager, SessionHandle} import org.apache.kyuubi.util.{JavaUtils, ThreadUtils} import org.apache.kyuubi.util.ThreadUtils.scheduleTolerableRunnableWithFixedDelay diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiTHttpFrontendService.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiTHttpFrontendService.scala index c19743e4a21..c08db503c0b 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiTHttpFrontendService.scala +++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiTHttpFrontendService.scala @@ -44,9 +44,9 @@ import org.apache.kyuubi.config.KyuubiReservedKeys.{KYUUBI_SESSION_ENGINE_LAUNCH import org.apache.kyuubi.metrics.MetricsConstants.{THRIFT_HTTP_CONN_FAIL, THRIFT_HTTP_CONN_OPEN, THRIFT_HTTP_CONN_TOTAL} import org.apache.kyuubi.metrics.MetricsSystem import org.apache.kyuubi.server.http.ThriftHttpServlet -import org.apache.kyuubi.server.http.authentication.AuthenticationFilter import org.apache.kyuubi.service.{Serverable, Service, ServiceUtils, TFrontendService} import org.apache.kyuubi.service.TFrontendService.{CURRENT_SERVER_CONTEXT, OK_STATUS} +import org.apache.kyuubi.service.authentication.AuthenticationFilter import org.apache.kyuubi.session.KyuubiSessionImpl import org.apache.kyuubi.shaded.hive.service.rpc.thrift.{TCLIService, TOpenSessionReq, TOpenSessionResp} import org.apache.kyuubi.shaded.thrift.protocol.TBinaryProtocol diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/InternalRestClient.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/InternalRestClient.scala index 823c9db50ca..c2f6e86ff8c 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/InternalRestClient.scala +++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/InternalRestClient.scala @@ -26,7 +26,7 @@ import org.apache.kyuubi.Logging import org.apache.kyuubi.client.{BaseRestApi, BatchRestApi, KyuubiRestClient} import org.apache.kyuubi.client.api.v1.dto.{Batch, CloseBatchResponse, OperationLog} import org.apache.kyuubi.client.auth.AuthHeaderGenerator -import org.apache.kyuubi.server.http.authentication.AuthSchemes +import org.apache.kyuubi.service.authentication.AuthSchemes import org.apache.kyuubi.service.authentication.InternalSecurityAccessor /** diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/ThriftHttpServlet.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/ThriftHttpServlet.scala index 29c50d0a9bd..99cbf595510 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/ThriftHttpServlet.scala +++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/ThriftHttpServlet.scala @@ -29,10 +29,10 @@ import scala.collection.mutable import org.apache.kyuubi.Logging import org.apache.kyuubi.config.KyuubiConf import org.apache.kyuubi.config.KyuubiConf.FRONTEND_PROXY_HTTP_CLIENT_IP_HEADER -import org.apache.kyuubi.server.http.authentication.{AuthenticationAuditLogger, AuthenticationFilter} -import org.apache.kyuubi.server.http.util.{CookieSigner, HttpAuthUtils} -import org.apache.kyuubi.server.http.util.HttpAuthUtils.AUTHORIZATION_HEADER -import org.apache.kyuubi.service.authentication.KyuubiAuthenticationFactory +import org.apache.kyuubi.server.http.util.CookieSigner +import org.apache.kyuubi.service.authentication.{AuthenticationAuditLogger, AuthenticationFilter, KyuubiAuthenticationFactory} +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.AUTHORIZATION_HEADER import org.apache.kyuubi.shaded.thrift.TProcessor import org.apache.kyuubi.shaded.thrift.protocol.TProtocolFactory import org.apache.kyuubi.shaded.thrift.server.TServlet diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/KyuubiHttpAuthenticationFactory.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/KyuubiHttpAuthenticationFactory.scala index 24fa52b01ef..5323accbbed 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/KyuubiHttpAuthenticationFactory.scala +++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/http/authentication/KyuubiHttpAuthenticationFactory.scala @@ -29,7 +29,7 @@ import org.apache.kyuubi.config.KyuubiConf import org.apache.kyuubi.config.KyuubiConf.{AUTHENTICATION_METHOD, ENGINE_SECURITY_ENABLED} import org.apache.kyuubi.metrics.MetricsConstants.{REST_CONN_FAIL, REST_CONN_OPEN, REST_CONN_TOTAL} import org.apache.kyuubi.metrics.MetricsSystem -import org.apache.kyuubi.service.authentication.{AuthTypes, InternalSecurityAccessor} +import org.apache.kyuubi.service.authentication.{AuthenticationFilter, AuthTypes, InternalSecurityAccessor} import org.apache.kyuubi.service.authentication.AuthTypes.KERBEROS class KyuubiHttpAuthenticationFactory(conf: KyuubiConf) { diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiRestAuthenticationSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiRestAuthenticationSuite.scala index f25d893af42..f1e39adbcad 100644 --- a/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiRestAuthenticationSuite.scala +++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiRestAuthenticationSuite.scala @@ -29,9 +29,9 @@ import org.apache.hadoop.security.UserGroupInformation import org.apache.kyuubi.RestClientTestHelper import org.apache.kyuubi.client.api.v1.dto.{SessionHandle, SessionOpenCount, SessionOpenRequest} import org.apache.kyuubi.config.KyuubiConf -import org.apache.kyuubi.server.http.authentication.AuthSchemes -import org.apache.kyuubi.server.http.util.HttpAuthUtils._ import org.apache.kyuubi.service.authentication.{AuthTypes, InternalSecurityAccessor, UserDefineAuthenticationProviderImpl, UserDefineTokenAuthenticationProviderImpl} +import org.apache.kyuubi.service.authentication.AuthSchemes +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.{basicAuthorizationHeader, bearerAuthorizationHeader, AUTHORIZATION_HEADER} import org.apache.kyuubi.session.KyuubiSession class KyuubiRestAuthenticationSuite extends RestClientTestHelper { diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala index 669a0af0f80..d2560f55e5a 100644 --- a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala +++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala @@ -41,9 +41,9 @@ import org.apache.kyuubi.ha.client.{DiscoveryPaths, ServiceDiscovery} import org.apache.kyuubi.ha.client.DiscoveryClientProvider.withDiscoveryClient import org.apache.kyuubi.plugin.PluginLoader import org.apache.kyuubi.server.KyuubiRestFrontendService -import org.apache.kyuubi.server.http.util.HttpAuthUtils -import org.apache.kyuubi.server.http.util.HttpAuthUtils.AUTHORIZATION_HEADER import org.apache.kyuubi.service.authentication.AnonymousAuthenticationProviderImpl +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.AUTHORIZATION_HEADER import org.apache.kyuubi.session.SessionType import org.apache.kyuubi.shaded.hive.service.rpc.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V2 diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/BatchesResourceSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/BatchesResourceSuite.scala index f836f6f1572..2d5e641df5b 100644 --- a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/BatchesResourceSuite.scala +++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/BatchesResourceSuite.scala @@ -43,9 +43,9 @@ import org.apache.kyuubi.metrics.{MetricsConstants, MetricsSystem} import org.apache.kyuubi.operation.{BatchJobSubmission, OperationState} import org.apache.kyuubi.operation.OperationState.OperationState import org.apache.kyuubi.server.KyuubiRestFrontendService -import org.apache.kyuubi.server.http.util.HttpAuthUtils.{basicAuthorizationHeader, AUTHORIZATION_HEADER} import org.apache.kyuubi.server.metadata.api.{Metadata, MetadataFilter} import org.apache.kyuubi.service.authentication.{AnonymousAuthenticationProviderImpl, AuthUtils} +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.{basicAuthorizationHeader, AUTHORIZATION_HEADER} import org.apache.kyuubi.session.{KyuubiBatchSession, KyuubiSessionManager, SessionHandle, SessionType} import org.apache.kyuubi.shaded.hive.service.rpc.thrift.TProtocolVersion diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala index af49598fe82..620932ff943 100644 --- a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala +++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala @@ -29,13 +29,13 @@ import org.scalatest.time.SpanSugar.convertIntToGrainOfTime import org.apache.kyuubi.{KyuubiFunSuite, RestFrontendTestHelper} import org.apache.kyuubi.client.api.v1.dto -import org.apache.kyuubi.client.api.v1.dto.{SessionData, _} +import org.apache.kyuubi.client.api.v1.dto._ import org.apache.kyuubi.config.KyuubiConf import org.apache.kyuubi.config.KyuubiReservedKeys.KYUUBI_SESSION_CONNECTION_URL_KEY import org.apache.kyuubi.engine.ShareLevel import org.apache.kyuubi.metrics.{MetricsConstants, MetricsSystem} import org.apache.kyuubi.operation.OperationHandle -import org.apache.kyuubi.server.http.util.HttpAuthUtils.{basicAuthorizationHeader, AUTHORIZATION_HEADER} +import org.apache.kyuubi.service.authentication.utils.HttpAuthUtils.{basicAuthorizationHeader, AUTHORIZATION_HEADER} import org.apache.kyuubi.session.SessionType class SessionsResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper { diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/http/authentication/AuthenticationFilterSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/http/authentication/AuthenticationFilterSuite.scala index de4b056ff46..ffa4042ada7 100644 --- a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/http/authentication/AuthenticationFilterSuite.scala +++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/http/authentication/AuthenticationFilterSuite.scala @@ -19,7 +19,7 @@ package org.apache.kyuubi.server.http.authentication import org.apache.kyuubi.KyuubiFunSuite import org.apache.kyuubi.config.KyuubiConf -import org.apache.kyuubi.service.authentication.AuthTypes +import org.apache.kyuubi.service.authentication.{AuthenticationFilter, AuthTypes, BasicAuthenticationHandler, KerberosAuthenticationHandler} class AuthenticationFilterSuite extends KyuubiFunSuite { test("add auth handler and destroy") {