Browse Source

Revert "SPNEGO TLS verification"

This reverts commit 0f27c04c23c53f625ecea75ed914375eaf6b9538.
Akira Ajisaka 5 years ago
parent
commit
ee58c112d0

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

@@ -152,7 +152,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
@@ -182,7 +181,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.
@@ -244,7 +242,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());
@@ -702,11 +699,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) {