Skip to content

[SPARK-18061][ThriftServer] Add spnego auth support for ThriftServer thrift/http protocol #18628

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
jerryshao wants to merge 4 commits into from
Closed

[SPARK-18061][ThriftServer] Add spnego auth support for ThriftServer thrift/http protocol #18628

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02a041a
Add spnego auth support for ThriftServer thrift/http protocol
jerryshao Jul 13, 2017
787e72c
Avoid using reflection Log object
jerryshao Jul 14, 2017
4765398
Address the comments
jerryshao Jul 17, 2017
12565cd
Address the comments
jerryshao Aug 3, 2017
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
15 changes: 15 additions & 0 deletions ...riftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import scala.collection.JavaConverters._

import org.apache.commons.logging.Log
import org.apache.hadoop.hive.conf.HiveConf
import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.apache.hadoop.hive.shims.Utils
import org.apache.hadoop.security.UserGroupInformation
import org.apache.hive.service.{AbstractService, Service, ServiceException}
Expand All @@ -47,6 +48,7 @@ private[hive] class SparkSQLCLIService(hiveServer: HiveServer2, sqlContext: SQLC
setSuperField(this, "sessionManager", sparkSqlSessionManager)
addService(sparkSqlSessionManager)
var sparkServiceUGI: UserGroupInformation = null
var httpUGI: UserGroupInformation = null

if (UserGroupInformation.isSecurityEnabled) {
try {
Expand All @@ -57,6 +59,19 @@ private[hive] class SparkSQLCLIService(hiveServer: HiveServer2, sqlContext: SQLC
case e @ (_: IOException | _: LoginException) =>
throw new ServiceException("Unable to login to kerberos with given principal/keytab", e)
}

// Try creating spnego UGI if it is configured.
val principal = hiveConf.getVar(ConfVars.HIVE_SERVER2_SPNEGO_PRINCIPAL)
val keyTabFile = hiveConf.getVar(ConfVars.HIVE_SERVER2_SPNEGO_KEYTAB)
Copy link
Contributor

@steveloughran steveloughran Aug 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HiveConf.getVar() doesn't trim thhe results of leading/trailing via {{Configuration.getTrimmed()}}. Check for other uses of the confvar to see if there is any trimming of whitespace before and after their use: if so, you need to copy that.

Copy link
Contributor Author

@jerryshao jerryshao Aug 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I searched the code, looks like there's no other place where using HiveConf.getVar trims the result.

if (principal.nonEmpty && keyTabFile.nonEmpty) {
Copy link
Contributor

@jiangxb1987 jiangxb1987 Jul 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we log warning if principal or keyTablFile is empty?

Copy link
Contributor Author

@jerryshao jerryshao Jul 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying to avoid calling log APIs using reflection as mentioned in #15594

try {
httpUGI = HiveAuthFactory.loginFromSpnegoKeytabAndReturnUGI(hiveConf)
setSuperField(this, "httpUGI", httpUGI)
} catch {
case e: IOException =>
throw new ServiceException("Unable to login to spnego with given principal/keytab", e)
}
Copy link
Contributor

@steveloughran steveloughran Aug 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd recommend including as much diagnostics in the exception string, including principal & keytab, and the value of e.toString in the message

throw new ServiceException(s"Unable to login to spnego with principal `$principal and keytab `$keytab`: $e", e)

The scenario to plan for is "nothing works and all you have to go on is that string from the raised exception".

}
}

initCompositeService(hiveConf)
Expand Down