Browse Source

Revert "SPNEGO TLS verification"

This reverts commit 4b7d6667fdc1e252c717fb98a01015f046910672.
Akira Ajisaka 5 years ago
parent
commit
de4ac41528

+ 0 - 8
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java

@@ -144,7 +144,6 @@ public class WebHdfsFileSystem extends FileSystem
       + "/v" + VERSION;
       + "/v" + VERSION;
   public static final String EZ_HEADER = "X-Hadoop-Accept-EZ";
   public static final String EZ_HEADER = "X-Hadoop-Accept-EZ";
   public static final String FEFINFO_HEADER = "X-Hadoop-feInfo";
   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
    * Default connection factory may be overridden in tests to use smaller
@@ -174,7 +173,6 @@ public class WebHdfsFileSystem extends FileSystem
 
 
   private DFSOpsCountStatistics storageStatistics;
   private DFSOpsCountStatistics storageStatistics;
   private KeyProvider testProvider;
   private KeyProvider testProvider;
-  private boolean isTLSKrb;
 
 
   /**
   /**
    * Return the protocol scheme for the FileSystem.
    * Return the protocol scheme for the FileSystem.
@@ -237,7 +235,6 @@ public class WebHdfsFileSystem extends FileSystem
           .newDefaultURLConnectionFactory(connectTimeout, readTimeout, conf);
           .newDefaultURLConnectionFactory(connectTimeout, readTimeout, conf);
     }
     }
 
 
-    this.isTLSKrb = "HTTPS_ONLY".equals(conf.get(DFS_HTTP_POLICY_KEY));
 
 
     ugi = UserGroupInformation.getCurrentUser();
     ugi = UserGroupInformation.getCurrentUser();
     this.uri = URI.create(uri.getScheme() + "://" + uri.getAuthority());
     this.uri = URI.create(uri.getScheme() + "://" + uri.getAuthority());
@@ -695,11 +692,6 @@ public class WebHdfsFileSystem extends FileSystem
       //redirect hostname and port
       //redirect hostname and port
       redirectHost = null;
       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
       // resolve redirects for a DN operation unless already resolved
       if (op.getRedirect() && !redirected) {
       if (op.getRedirect() && !redirected) {