You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2014/03/28 19:18:27 UTC
svn commit: r1582853 - in
/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common: ./
src/ src/main/java/ src/main/java/org/apache/hadoop/security/
src/main/java/org/apache/hadoop/security/ssl/
Author: szetszwo
Date: Fri Mar 28 18:18:26 2014
New Revision: 1582853
URL: http://svn.apache.org/r1582853
Log:
svn merge -c 1582851 from trunk for HADOOP-10449. Fix the javac warnings in the security package.
Modified:
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/ (props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/ (props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/NetgroupCache.java
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLHostnameVerifier.java
Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1582851
Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1582853&r1=1582852&r2=1582853&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt Fri Mar 28 18:18:26 2014
@@ -135,6 +135,8 @@ Release 2.4.0 - UNRELEASED
HADOOP-10441. Namenode metric "rpc.RetryCache/NameNodeRetryCache.CacheHit"
can't be correctly processed by Ganglia. (jing9)
+ HADOOP-10449. Fix the javac warnings in the security package. (szetszwo)
+
BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
HADOOP-10185. FileSystem API for ACLs. (cnauroth)
Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1582851
Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1582851
Propchange: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1582851
Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java?rev=1582853&r1=1582852&r2=1582853&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java Fri Mar 28 18:18:26 2014
@@ -251,7 +251,6 @@ public class LdapGroupsMapping
return groups;
}
- @SuppressWarnings("deprecation")
DirContext getDirContext() throws NamingException {
if (ctx == null) {
// Set up the initial environment for LDAP connectivity
Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/NetgroupCache.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/NetgroupCache.java?rev=1582853&r1=1582852&r2=1582853&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/NetgroupCache.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/NetgroupCache.java Fri Mar 28 18:18:26 2014
@@ -39,9 +39,6 @@ import org.apache.commons.logging.LogFac
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
@InterfaceStability.Unstable
public class NetgroupCache {
-
- private static final Log LOG = LogFactory.getLog(NetgroupCache.class);
-
private static boolean netgroupToUsersMapUpdated = true;
private static Map<String, Set<String>> netgroupToUsersMap =
new ConcurrentHashMap<String, Set<String>>();
Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java?rev=1582853&r1=1582852&r2=1582853&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java Fri Mar 28 18:18:26 2014
@@ -57,7 +57,6 @@ import org.apache.hadoop.ipc.StandbyExce
import org.apache.hadoop.security.token.SecretManager;
import org.apache.hadoop.security.token.SecretManager.InvalidToken;
import org.apache.hadoop.security.token.TokenIdentifier;
-import org.apache.hadoop.util.StringUtils;
/**
* A utility class for dealing with SASL on RPC server
@@ -70,7 +69,6 @@ public class SaslRpcServer {
public static final Map<String, String> SASL_PROPS =
new TreeMap<String, String>();
private static SaslServerFactory saslFactory;
- private static SaslPropertiesResolver resolver;
public static enum QualityOfProtection {
AUTHENTICATION("auth"),
Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLHostnameVerifier.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLHostnameVerifier.java?rev=1582853&r1=1582852&r2=1582853&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLHostnameVerifier.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLHostnameVerifier.java Fri Mar 28 18:18:26 2014
@@ -31,9 +31,6 @@
package org.apache.hadoop.security.ssl;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-
import java.io.IOException;
import java.io.InputStream;
import java.security.cert.Certificate;
@@ -44,6 +41,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import java.util.StringTokenizer;
import java.util.TreeSet;
@@ -52,6 +50,9 @@ import javax.net.ssl.SSLPeerUnverifiedEx
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
************************************************************************
* Copied from the not-yet-commons-ssl project at
@@ -224,7 +225,6 @@ public interface SSLHostnameVerifier ext
public final String toString() { return "ALLOW_ALL"; }
};
- @SuppressWarnings("unchecked")
abstract class AbstractVerifier implements SSLHostnameVerifier {
/**
@@ -378,7 +378,7 @@ public interface SSLHostnameVerifier ext
// STRICT implementations of the HostnameVerifier only use the
// first CN provided. All other CNs are ignored.
// (Firefox, wget, curl, Sun Java 1.4, 5, 6 all work this way).
- TreeSet names = new TreeSet();
+ final Set<String> names = new TreeSet<String>();
if (cns != null && cns.length > 0 && cns[0] != null) {
names.add(cns[0]);
if (ie6) {
@@ -404,10 +404,9 @@ public interface SSLHostnameVerifier ext
boolean match = false;
out:
- for (Iterator it = names.iterator(); it.hasNext();) {
+ for (Iterator<String> it = names.iterator(); it.hasNext();) {
// Don't trim the CN, though!
- String cn = (String) it.next();
- cn = cn.toLowerCase();
+ final String cn = it.next().toLowerCase();
// Store CN in StringBuffer in case we need to report an error.
buf.append(" <");
buf.append(cn);
@@ -508,10 +507,9 @@ public interface SSLHostnameVerifier ext
}
}
- @SuppressWarnings("unchecked")
static class Certificates {
public static String[] getCNs(X509Certificate cert) {
- LinkedList cnList = new LinkedList();
+ final List<String> cnList = new LinkedList<String>();
/*
Sebastian Hauer's original StrictSSLProtocolSocketFactory used
getName() and had the following comment:
@@ -568,8 +566,8 @@ public interface SSLHostnameVerifier ext
* @return Array of SubjectALT DNS names stored in the certificate.
*/
public static String[] getDNSSubjectAlts(X509Certificate cert) {
- LinkedList subjectAltList = new LinkedList();
- Collection c = null;
+ final List<String> subjectAltList = new LinkedList<String>();
+ Collection<List<?>> c = null;
try {
c = cert.getSubjectAlternativeNames();
}
@@ -578,9 +576,9 @@ public interface SSLHostnameVerifier ext
cpe.printStackTrace();
}
if (c != null) {
- Iterator it = c.iterator();
+ Iterator<List<?>> it = c.iterator();
while (it.hasNext()) {
- List list = (List) it.next();
+ List<?> list = it.next();
int type = ((Integer) list.get(0)).intValue();
// If type is 2, then we've got a dNSName
if (type == 2) {