apache/kyuubi
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

[KYUUBI #561] Forbid set env:* in thrift connection configurations

Browse Source 
<!--
Thanks for sending a pull request!

Here are some tips for you:
  1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
  2. If the PR is related to an issue in https://github.com/NetEase/kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
  3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->

### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
  1. If you add a feature, you can talk about the use case of it.
  2. If you fix a bug, you can clarify why it is a bug.
-->
This change only forbid the `set:env:*` from thrift connection configurations, to match hive behavior, forbid `set env:*` in SQL, we need to change it in Spark.
#508
https://issues.apache.org/jira/browse/HIVE-6175

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [x] [Run test](https://kyuubi.readthedocs.io/en/latest/tools/testing.html#running-tests) locally before make a pull request

Closes #561 from pan3793/env.

Closes #561

79b7e69 [Cheng Pan] update
00dfaf0 [Cheng Pan] Forbid set env:* in thrift connection configurations

Authored-by: Cheng Pan <379377944@qq.com>
Signed-off-by: Kent Yao <yao@apache.org>
This commit is contained in:
Cheng Pan 2021-04-21 23:36:51 +08:00 committed by Kent Yao
parent 4edbb60238
commit 5cc4fd83c1
No known key found for this signature in database
GPG Key ID: F7051850A0AF904D
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/operation/SparkOperationSuite.scala vendored
View File

@ -654,6 +654,21 @@ class SparkOperationSuite extends WithSparkSQLEngine with JDBCTests {
}
}
test("env:* variables can not be set") {
withThriftClient { client =>
val req = new TOpenSessionReq()
req.setUsername("chengpan")
req.setPassword("123")
val conf = Map(
"set:env:ABC" -> "xyz")
req.setConfiguration(conf.asJava)
val tOpenSessionResp = client.OpenSession(req)
val status = tOpenSessionResp.getStatus
assert(status.getStatusCode === TStatusCode.ERROR_STATUS)
assert(status.getErrorMessage contains s"env:* variables can not be set")
}
}
test("test variable substitution") {
withThriftClient { client =>
val req = new TOpenSessionReq()

4
kyuubi-common/src/main/scala/org/apache/kyuubi/session/SessionManager.scala
View File

@ -104,7 +104,9 @@ abstract class SessionManager(name: String) extends CompositeService(name) {
def validateKey(key: String, value: String): Option[(String, String)] = {
val normalizedKey = if (key.startsWith(SET_PREFIX)) {
val newKey = key.substring(SET_PREFIX.length)
if (newKey.startsWith(SYSTEM_PREFIX)) {
if (newKey.startsWith(ENV_PREFIX)) {
throw KyuubiSQLException(s"$key is forbidden, env:* variables can not be set.")
} else if (newKey.startsWith(SYSTEM_PREFIX)) {
newKey.substring(SYSTEM_PREFIX.length)
} else if (newKey.startsWith(HIVECONF_PREFIX)) {
newKey.substring(HIVECONF_PREFIX.length)