pan3793 commented on code in PR #3235:
URL: https://github.com/apache/incubator-kyuubi/pull/3235#discussion_r947047951


##########
kyuubi-common/src/test/scala/org/apache/kyuubi/service/authentication/JdbcAuthenticationProviderImplSuite.scala:
##########
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.kyuubi.service.authentication
+
+import java.nio.file.Path
+import java.sql.{Connection, DriverManager}
+import java.util.Properties
+import javax.security.sasl.AuthenticationException
+
+import org.apache.kyuubi.{KyuubiFunSuite, Utils}
+import org.apache.kyuubi.config.KyuubiConf
+import org.apache.kyuubi.config.KyuubiConf._
+
+class JdbcAuthenticationProviderImplSuite extends KyuubiFunSuite {
+  protected val dbUser: String = "bowenliang123"
+  protected val dbPasswd: String = "bowenliang123"
+  protected var jdbcUrl: String = _
+
+  protected val authUser: String = "liangtiancheng"
+  protected val authPasswd: String = "liangtiancheng"
+
+  protected var conf = new KyuubiConf()
+  var conn: Connection = _
+  var authDb: Path = _
+
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+
+    val datasourceProperties = new Properties()
+    datasourceProperties.put("user", dbUser)
+    datasourceProperties.put("password", dbPasswd)
+
+    authDb = Utils.createTempDir(namePrefix = getClass.getSimpleName)
+    authDb.toFile.delete()
+
+    jdbcUrl = s"jdbc:derby:;databaseName=$authDb;create=true"
+    conn = DriverManager.getConnection(
+      jdbcUrl
+        + ";user=" + dbUser
+        + ";password=" + dbPasswd,
+      datasourceProperties)
+
+    conn.prepareStatement("CREATE SCHEMA " + dbUser).execute();
+
+    conn.prepareStatement("CREATE TABLE user_auth (" +
+      "username VARCHAR(64) NOT NULL PRIMARY KEY, " +
+      "passwd VARCHAR(64))").execute();
+
+    val insertStmt = conn.prepareStatement("INSERT INTO user_auth " +
+      "(username, passwd) VALUES (?,?)")
+    insertStmt.setString(1, authUser)
+    insertStmt.setString(2, authPasswd)
+    insertStmt.execute();
+
+    conf = genJdbcAuthConfigs
+  }
+
+  override def afterAll(): Unit = {
+    super.afterAll()
+
+    // shutdown derby database
+    try {
+      
DriverManager.getConnection(s"jdbc:derby:;databaseName=$authDb;shutdown=true")
+    } catch {
+      case e: Throwable =>
+    }
+  }
+
+  test("authenticate tests") {
+    var providerImpl = new JdbcAuthenticationProviderImpl(conf)
+
+    providerImpl.authenticate(authUser, authPasswd)
+
+    val e1 = intercept[AuthenticationException](providerImpl.authenticate("", 
""))
+    assert(e1.getMessage.contains("user is null"))
+
+    val e2 = 
intercept[AuthenticationException](providerImpl.authenticate("kyuubi", ""))
+    assert(e2.getMessage.contains("password is null"))
+
+    val e4 = intercept[AuthenticationException](
+      providerImpl.authenticate(authPasswd, "pass"))
+    assert(e4.isInstanceOf[AuthenticationException])
+
+    conf = genJdbcAuthConfigs
+    conf.unset(AUTHENTICATION_JDBC_URL)
+    val e5 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e5.getMessage.contains("JDBC url is not configured"))
+
+    conf = genJdbcAuthConfigs
+    conf.unset(AUTHENTICATION_JDBC_USERNAME)
+    val e6 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e6.getMessage.contains("JDBC username or password is not 
configured"))
+
+    conf = genJdbcAuthConfigs
+    conf.unset(AUTHENTICATION_JDBC_PASSWORD)
+    val e7 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e7.getMessage.contains("JDBC username or password is not 
configured"))
+
+    conf = genJdbcAuthConfigs
+    conf.unset(AUTHENTICATION_JDBC_QUERY)
+    val e8 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e8.getMessage.contains("Query SQL is not configured"))
+
+    conf.set(
+      AUTHENTICATION_JDBC_QUERY,
+      "INSERT INTO user_auth (username, password) " +
+        " VALUES ('demouser','demopassword'); ")
+    val e9 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e9.getMessage.contains("Query SQL must start with \"SELECT\""))
+
+    conf.unset(AUTHENTICATION_JDBC_URL)
+    val e10 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e10.getMessage.contains("JDBC url is not configured"))
+  }
+
+  private def genJdbcAuthConfigs: KyuubiConf = {

Review Comment:
   let's init the memeber variable `conf` and use `conf.copy()` instead of call 
this method every time



##########
kyuubi-common/src/test/scala/org/apache/kyuubi/service/authentication/JdbcAuthenticationProviderImplSuite.scala:
##########
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.kyuubi.service.authentication
+
+import java.nio.file.Path
+import java.sql.{Connection, DriverManager}
+import java.util.Properties
+import javax.security.sasl.AuthenticationException
+
+import org.apache.kyuubi.{KyuubiFunSuite, Utils}
+import org.apache.kyuubi.config.KyuubiConf
+import org.apache.kyuubi.config.KyuubiConf._
+
+class JdbcAuthenticationProviderImplSuite extends KyuubiFunSuite {
+  protected val dbUser: String = "bowenliang123"
+  protected val dbPasswd: String = "bowenliang123"
+  protected var jdbcUrl: String = _
+
+  protected val authUser: String = "liangtiancheng"
+  protected val authPasswd: String = "liangtiancheng"
+
+  protected var conf = new KyuubiConf()
+  var conn: Connection = _
+  var authDb: Path = _
+
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+
+    val datasourceProperties = new Properties()
+    datasourceProperties.put("user", dbUser)
+    datasourceProperties.put("password", dbPasswd)
+
+    authDb = Utils.createTempDir(namePrefix = getClass.getSimpleName)
+    authDb.toFile.delete()
+
+    jdbcUrl = s"jdbc:derby:;databaseName=$authDb;create=true"
+    conn = DriverManager.getConnection(
+      jdbcUrl
+        + ";user=" + dbUser
+        + ";password=" + dbPasswd,
+      datasourceProperties)
+
+    conn.prepareStatement("CREATE SCHEMA " + dbUser).execute();
+
+    conn.prepareStatement("CREATE TABLE user_auth (" +
+      "username VARCHAR(64) NOT NULL PRIMARY KEY, " +
+      "passwd VARCHAR(64))").execute();
+
+    val insertStmt = conn.prepareStatement("INSERT INTO user_auth " +
+      "(username, passwd) VALUES (?,?)")
+    insertStmt.setString(1, authUser)
+    insertStmt.setString(2, authPasswd)
+    insertStmt.execute();
+
+    conf = genJdbcAuthConfigs
+  }
+
+  override def afterAll(): Unit = {
+    super.afterAll()
+
+    // shutdown derby database
+    try {
+      
DriverManager.getConnection(s"jdbc:derby:;databaseName=$authDb;shutdown=true")
+    } catch {
+      case e: Throwable =>
+    }
+  }
+
+  test("authenticate tests") {
+    var providerImpl = new JdbcAuthenticationProviderImpl(conf)
+
+    providerImpl.authenticate(authUser, authPasswd)
+
+    val e1 = intercept[AuthenticationException](providerImpl.authenticate("", 
""))
+    assert(e1.getMessage.contains("user is null"))
+
+    val e2 = 
intercept[AuthenticationException](providerImpl.authenticate("kyuubi", ""))
+    assert(e2.getMessage.contains("password is null"))
+
+    val e4 = intercept[AuthenticationException](
+      providerImpl.authenticate(authPasswd, "pass"))
+    assert(e4.isInstanceOf[AuthenticationException])
+
+    conf = genJdbcAuthConfigs
+    conf.unset(AUTHENTICATION_JDBC_URL)
+    val e5 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e5.getMessage.contains("JDBC url is not configured"))
+
+    conf = genJdbcAuthConfigs
+    conf.unset(AUTHENTICATION_JDBC_USERNAME)
+    val e6 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e6.getMessage.contains("JDBC username or password is not 
configured"))
+
+    conf = genJdbcAuthConfigs
+    conf.unset(AUTHENTICATION_JDBC_PASSWORD)
+    val e7 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e7.getMessage.contains("JDBC username or password is not 
configured"))
+
+    conf = genJdbcAuthConfigs
+    conf.unset(AUTHENTICATION_JDBC_QUERY)
+    val e8 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e8.getMessage.contains("Query SQL is not configured"))
+
+    conf.set(
+      AUTHENTICATION_JDBC_QUERY,
+      "INSERT INTO user_auth (username, password) " +
+        " VALUES ('demouser','demopassword'); ")
+    val e9 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e9.getMessage.contains("Query SQL must start with \"SELECT\""))
+
+    conf.unset(AUTHENTICATION_JDBC_URL)
+    val e10 = intercept[IllegalArgumentException](new 
JdbcAuthenticationProviderImpl(conf))
+    assert(e10.getMessage.contains("JDBC url is not configured"))
+  }
+
+  private def genJdbcAuthConfigs: KyuubiConf = {

Review Comment:
   let's init the member variable `conf` and use `conf.copy()` instead of call 
this method every time



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to