Author: todd Date: Wed Mar 7 18:42:53 2012 New Revision: 1298036 URL: http://svn.apache.org/viewvc?rev=1298036&view=rev Log: HADOOP-8141. Add method to SecurityUtil to init krb5 cipher suites. Contributed by Todd Lipcon.
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1298036&r1=1298035&r2=1298036&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Mar 7 18:42:53 2012 @@ -113,6 +113,9 @@ Trunk (unreleased changes) HADOOP-7888. TestFailoverProxy fails intermittently on trunk. (Jason Lowe via atm) + HADOOP-8141. Add method to SecurityUtil to init krb5 cipher suites. + (todd) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java?rev=1298036&r1=1298035&r2=1298036&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Krb5AndCertsSslSocketConnector.java Wed Mar 7 18:42:53 2012 @@ -58,7 +58,7 @@ public class Krb5AndCertsSslSocketConnec Collections.unmodifiableList(Collections.singletonList( "TLS_KRB5_WITH_3DES_EDE_CBC_SHA")); static { - System.setProperty("https.cipherSuites", KRB5_CIPHER_SUITES.get(0)); + SecurityUtil.initKrb5CipherSuites(); } private static final Log LOG = LogFactory Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java?rev=1298036&r1=1298035&r2=1298036&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java Wed Mar 7 18:42:53 2012 @@ -620,4 +620,11 @@ public class SecurityUtil { searchDomains = Arrays.asList(domains); } } + + public static void initKrb5CipherSuites() { + if (UserGroupInformation.isSecurityEnabled()) { + System.setProperty("https.cipherSuites", + Krb5AndCertsSslSocketConnector.KRB5_CIPHER_SUITES.get(0)); + } + } }