diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/alfredo/client/KerberosAuthenticator.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/alfredo/client/KerberosAuthenticator.java index 69a91f5081..3635f76d70 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/alfredo/client/KerberosAuthenticator.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/alfredo/client/KerberosAuthenticator.java @@ -48,17 +48,17 @@ public class KerberosAuthenticator implements Authenticator { /** * HTTP header used by the SPNEGO server endpoint during an authentication sequence. */ - public static String WWW_AUTHENTICATE = "WWW-Authenticate"; + public static final String WWW_AUTHENTICATE = "WWW-Authenticate"; /** * HTTP header used by the SPNEGO client endpoint during an authentication sequence. */ - public static String AUTHORIZATION = "Authorization"; + public static final String AUTHORIZATION = "Authorization"; /** * HTTP header prefix used by the SPNEGO client/server endpoints during an authentication sequence. */ - public static String NEGOTIATE = "Negotiate"; + public static final String NEGOTIATE = "Negotiate"; private static final String AUTH_HTTP_METHOD = "OPTIONS"; diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/alfredo/server/AuthenticationFilter.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/alfredo/server/AuthenticationFilter.java index 2b39d7ee59..f7f4944216 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/alfredo/server/AuthenticationFilter.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/alfredo/server/AuthenticationFilter.java @@ -103,6 +103,8 @@ public class AuthenticationFilter implements Filter { */ public static final String COOKIE_PATH = "cookie.path"; + private static final Random RAN = new Random(); + private Signer signer; private AuthenticationHandler authHandler; private boolean randomSecret; @@ -139,7 +141,7 @@ public void init(FilterConfig filterConfig) throws ServletException { } try { - Class klass = Thread.currentThread().getContextClassLoader().loadClass(authHandlerClassName); + Class klass = Thread.currentThread().getContextClassLoader().loadClass(authHandlerClassName); authHandler = (AuthenticationHandler) klass.newInstance(); authHandler.init(config); } catch (ClassNotFoundException ex) { @@ -151,7 +153,7 @@ public void init(FilterConfig filterConfig) throws ServletException { } String signatureSecret = config.getProperty(configPrefix + SIGNATURE_SECRET); if (signatureSecret == null) { - signatureSecret = Long.toString(new Random(System.currentTimeMillis()).nextLong()); + signatureSecret = Long.toString(RAN.nextLong()); randomSecret = true; LOG.warn("'signature.secret' configuration not set, using a random value as secret"); } @@ -237,7 +239,7 @@ public void destroy() { */ protected Properties getConfiguration(String configPrefix, FilterConfig filterConfig) throws ServletException { Properties props = new Properties(); - Enumeration names = filterConfig.getInitParameterNames(); + Enumeration names = filterConfig.getInitParameterNames(); while (names.hasMoreElements()) { String name = (String) names.nextElement(); if (name.startsWith(configPrefix)) { diff --git a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/alfredo/client/AuthenticatorTestCase.java b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/alfredo/client/AuthenticatorTestCase.java index c139fa5902..d28f5278f1 100644 --- a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/alfredo/client/AuthenticatorTestCase.java +++ b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/alfredo/client/AuthenticatorTestCase.java @@ -57,6 +57,7 @@ protected Properties getConfiguration(String configPrefix, FilterConfig filterCo } } + @SuppressWarnings("serial") public static class TestServlet extends HttpServlet { @Override diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 73fc8f82a8..b5c8e83f4d 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -533,6 +533,9 @@ Release 0.23.0 - Unreleased HADOOP-7560. Change src layout to be heirarchical. (Alejandro Abdelnur via acmurthy) + HADOOP-7576. Fix findbugs warnings and javac warnings in hadoop-auth. + (szetszwo) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES