Skip to content

HADOOP-19342. SaslRpcServer.AuthMethod print INFO messages in client side #7173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

HADOOP-19342. SaslRpcServer.AuthMethod print INFO messages in client side #7173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4e04b6
HADOOP-19342. SaslRpcServer.AuthMethod print INFO messages in client …
szetszwo Nov 18, 2024
c2b6ab4
Avoid using Guava.
szetszwo Nov 19, 2024
5d3699f
Fix checkstyle.
szetszwo Nov 19, 2024
6d001e5
Address review comments.
szetszwo Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions ...-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslMechanismFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package org.apache.hadoop.security;

import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
Expand All @@ -36,39 +35,34 @@ public final class SaslMechanismFactory {
static final Logger LOG = LoggerFactory.getLogger(SaslMechanismFactory.class);

private static final String SASL_MECHANISM_ENV = "HADOOP_SASL_MECHANISM";
private static final String SASL_MECHANISM;
private static volatile String mechanism;

static {
private static synchronized String getSynchronously() {
// env
final String envValue = System.getenv(SASL_MECHANISM_ENV);
LOG.debug("{} = {} (env)", SASL_MECHANISM_ENV, envValue);

// conf
final Configuration conf = new Configuration(false);
final Configuration conf = new Configuration();
final String confValue = conf.get(HADOOP_SECURITY_SASL_MECHANISM_KEY,
HADOOP_SECURITY_SASL_MECHANISM_DEFAULT);
LOG.debug("{} = {} (conf)", HADOOP_SECURITY_SASL_MECHANISM_KEY, confValue);

if (envValue != null && confValue != null) {
if (!envValue.equals(confValue)) {
throw new HadoopIllegalArgumentException("SASL Mechanism mismatched: env "
+ SASL_MECHANISM_ENV + " is " + envValue + " but conf "
+ HADOOP_SECURITY_SASL_MECHANISM_KEY + " is " + confValue);
}
}

SASL_MECHANISM = envValue != null ? envValue
// env has a higher precedence than conf
mechanism = envValue != null ? envValue
: confValue != null ? confValue
: HADOOP_SECURITY_SASL_MECHANISM_DEFAULT;
LOG.debug("SASL_MECHANISM = {} (effective)", SASL_MECHANISM);
LOG.debug("SASL_MECHANISM = {} (effective)", mechanism);
return mechanism;
}

public static String getMechanism() {
return SASL_MECHANISM;
final String value = mechanism;
return value != null ? value : getSynchronously();
}

public static boolean isDefaultMechanism(String mechanism) {
return HADOOP_SECURITY_SASL_MECHANISM_DEFAULT.equals(mechanism);
public static boolean isDefaultMechanism(String saslMechanism) {
return HADOOP_SECURITY_SASL_MECHANISM_DEFAULT.equals(saslMechanism);
}

private SaslMechanismFactory() {}
Expand Down
15 changes: 9 additions & 6 deletions ...-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;

import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
Expand Down Expand Up @@ -225,19 +226,21 @@ public enum AuthMethod {
SIMPLE((byte) 80, ""),
KERBEROS((byte) 81, "GSSAPI"),
@Deprecated
DIGEST((byte) 82, SaslMechanismFactory.getMechanism()),
TOKEN((byte) 82, SaslMechanismFactory.getMechanism()),
DIGEST((byte) 82, SaslMechanismFactory::getMechanism),
TOKEN((byte) 82, SaslMechanismFactory::getMechanism),
PLAIN((byte) 83, "PLAIN");

/** The code for this method. */
public final byte code;
public final String mechanismName;
private final Supplier<String> mechanismName;

private AuthMethod(byte code, String mechanismName) {
this(code, () -> mechanismName);
}

AuthMethod(byte code, Supplier<String> mechanismName) {
this.code = code;
this.mechanismName = mechanismName;
LOG.info("{} {}: code={}, mechanism=\"{}\"",
getClass().getSimpleName(), name(), code, mechanismName);
}

private static final int FIRST_CODE = values()[0].code;
Expand All @@ -253,7 +256,7 @@ private static AuthMethod valueOf(byte code) {
* @return mechanismName.
*/
public String getMechanismName() {
return mechanismName;
return mechanismName.get();
}

/**
Expand Down
Loading