This is an automated email from the ASF dual-hosted git repository.
vanzin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new f1e223b [SPARK-27004][CORE] Remove stale HTTP auth code.
f1e223b is described below
commit f1e223bfa37d7b42666af22c5ced38923807ef0a
Author: Marcelo Vanzin <van...@cloudera.com>
AuthorDate: Mon Mar 11 12:27:25 2019 -0700
[SPARK-27004][CORE] Remove stale HTTP auth code.
This code is from the era when Spark used an HTTP server to distribute
dependencies, which is long gone. Nowadays it only causes problems when
someone is using dependencies from an HTTP server with Spark auth on.
Closes #24033 from vanzin/SPARK-27004.
Authored-by: Marcelo Vanzin <van...@cloudera.com>
Signed-off-by: Marcelo Vanzin <van...@cloudera.com>
---
.../scala/org/apache/spark/SecurityManager.scala | 26 --------------------
.../main/scala/org/apache/spark/util/Utils.scala | 28 +---------------------
2 files changed, 1 insertion(+), 53 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/SecurityManager.scala
b/core/src/main/scala/org/apache/spark/SecurityManager.scala
index 0661b30..26b1856 100644
--- a/core/src/main/scala/org/apache/spark/SecurityManager.scala
+++ b/core/src/main/scala/org/apache/spark/SecurityManager.scala
@@ -93,25 +93,6 @@ private[spark] class SecurityManager(
"; users with modify permissions: " + modifyAcls.toString() +
"; groups with modify permissions: " + modifyAclsGroups.toString())
- // Set our own authenticator to properly negotiate user/password for HTTP
connections.
- // This is needed by the HTTP client fetching from the HttpServer. Put here
so its
- // only set once.
- if (authOn) {
- Authenticator.setDefault(
- new Authenticator() {
- override def getPasswordAuthentication(): PasswordAuthentication = {
- var passAuth: PasswordAuthentication = null
- val userInfo = getRequestingURL().getUserInfo()
- if (userInfo != null) {
- val parts = userInfo.split(":", 2)
- passAuth = new PasswordAuthentication(parts(0),
parts(1).toCharArray())
- }
- return passAuth
- }
- }
- )
- }
-
private val hadoopConf = SparkHadoopUtil.get.newConfiguration(sparkConf)
// the default SSL configuration - it will be used by all communication
layers unless overwritten
private val defaultSSLOptions =
@@ -292,13 +273,6 @@ private[spark] class SecurityManager(
}
/**
- * Gets the user used for authenticating HTTP connections.
- * For now use a single hardcoded user.
- * @return the HTTP user as a String
- */
- def getHttpUser(): String = "sparkHttpUser"
-
- /**
* Gets the user used for authenticating SASL connections.
* For now use a single hardcoded user.
* @return the SASL user as a String
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala
b/core/src/main/scala/org/apache/spark/util/Utils.scala
index cade0dd..af53238 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -369,22 +369,6 @@ private[spark] object Utils extends Logging {
}
/**
- * Construct a URI container information used for authentication.
- * This also sets the default authenticator to properly negotiation the
- * user/password based on the URI.
- *
- * Note this relies on the Authenticator.setDefault being set properly to
decode
- * the user name and password. This is currently set in the SecurityManager.
- */
- def constructURIForAuthentication(uri: URI, securityMgr: SecurityManager):
URI = {
- val userCred = securityMgr.getSecretKey()
- if (userCred == null) throw new Exception("Secret key is null with
authentication on")
- val userInfo = securityMgr.getHttpUser() + ":" + userCred
- new URI(uri.getScheme(), userInfo, uri.getHost(), uri.getPort(),
uri.getPath(),
- uri.getQuery(), uri.getFragment())
- }
-
- /**
* A file name may contain some invalid URI characters, such as " ". This
method will convert the
* file name to a raw path accepted by `java.net.URI(String)`.
*
@@ -654,17 +638,7 @@ private[spark] object Utils extends Logging {
val is = Channels.newInputStream(source)
downloadFile(url, is, targetFile, fileOverwrite)
case "http" | "https" | "ftp" =>
- var uc: URLConnection = null
- if (securityMgr.isAuthenticationEnabled()) {
- logDebug("fetchFile with security enabled")
- val newuri = constructURIForAuthentication(uri, securityMgr)
- uc = newuri.toURL().openConnection()
- uc.setAllowUserInteraction(false)
- } else {
- logDebug("fetchFile not using security")
- uc = new URL(url).openConnection()
- }
-
+ val uc = new URL(url).openConnection()
val timeoutMs =
conf.getTimeAsSeconds("spark.files.fetchTimeout", "60s").toInt * 1000
uc.setConnectTimeout(timeoutMs)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
