From 14bd270ca02d8f926c4044924abe588662738ab5 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Wed, 13 May 2020 17:17:07 +0900 Subject: [PATCH] Revert "SPNEGO TLS verification" This reverts commit 28715b584ab25dedc600cc2d5d22866865026bf7. --- .../org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java index 56a56da5348..7e4b3d9af0d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java @@ -140,7 +140,6 @@ public class WebHdfsFileSystem extends FileSystem + "/v" + VERSION; public static final String EZ_HEADER = "X-Hadoop-Accept-EZ"; public static final String FEFINFO_HEADER = "X-Hadoop-feInfo"; - public static final String DFS_HTTP_POLICY_KEY = "dfs.http.policy"; /** * Default connection factory may be overridden in tests to use smaller @@ -170,7 +169,6 @@ public class WebHdfsFileSystem extends FileSystem new ObjectMapper().reader(Map.class); private DFSOpsCountStatistics storageStatistics; - private boolean isTLSKrb; /** * Return the protocol scheme for the FileSystem. @@ -233,8 +231,6 @@ public synchronized void initialize(URI uri, Configuration conf .newDefaultURLConnectionFactory(connectTimeout, readTimeout, conf); } - this.isTLSKrb = "HTTPS_ONLY".equals(conf.get(DFS_HTTP_POLICY_KEY)); - ugi = UserGroupInformation.getCurrentUser(); this.uri = URI.create(uri.getScheme() + "://" + uri.getAuthority()); this.nnAddrs = resolveNNAddr(); @@ -694,11 +690,6 @@ protected HttpURLConnection connect(URL url) throws IOException { //redirect hostname and port redirectHost = null; - if (url.getProtocol().equals(getTransportScheme()) && - UserGroupInformation.isSecurityEnabled() && - isTLSKrb) { - throw new IOException("Access denied: dfs.http.policy is HTTPS_ONLY."); - } // resolve redirects for a DN operation unless already resolved if (op.getRedirect() && !redirected) {