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 ar...@apache.org on 2018/02/27 16:48:59 UTC
hadoop git commit: HADOOP-14959.
DelegationTokenAuthenticator.authenticate() to wrap network exceptions.
Contributed by Ajay Kumar.
Repository: hadoop
Updated Branches:
refs/heads/branch-3.1 4d1d1d7ae -> a2e824f9c
HADOOP-14959. DelegationTokenAuthenticator.authenticate() to wrap network exceptions. Contributed by Ajay Kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a2e824f9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a2e824f9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a2e824f9
Branch: refs/heads/branch-3.1
Commit: a2e824f9c6c9359319b00f788651bb59d92640d9
Parents: 4d1d1d7
Author: Arpit Agarwal <ar...@apache.org>
Authored: Tue Feb 27 08:48:13 2018 -0800
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Tue Feb 27 08:48:24 2018 -0800
----------------------------------------------------------------------
.../web/DelegationTokenAuthenticator.java | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2e824f9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticator.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticator.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticator.java
index a1c6003..617773b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticator.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticator.java
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authentication.client.AuthenticatedURL;
@@ -138,11 +139,17 @@ public abstract class DelegationTokenAuthenticator implements Authenticator {
public void authenticate(URL url, AuthenticatedURL.Token token)
throws IOException, AuthenticationException {
if (!hasDelegationToken(url, token)) {
- // check and renew TGT to handle potential expiration
- UserGroupInformation.getCurrentUser().checkTGTAndReloginFromKeytab();
- LOG.debug("No delegation token found for url={}, token={}, authenticating"
- + " with {}", url, token, authenticator.getClass());
- authenticator.authenticate(url, token);
+ try {
+ // check and renew TGT to handle potential expiration
+ UserGroupInformation.getCurrentUser().checkTGTAndReloginFromKeytab();
+ LOG.debug("No delegation token found for url={}, token={}, "
+ + "authenticating with {}", url, token, authenticator.getClass());
+ authenticator.authenticate(url, token);
+ } catch (IOException ex) {
+ throw NetUtils.wrapException(url.getHost(), url.getPort(),
+ null, 0, ex);
+ }
+
} else {
LOG.debug("Authenticated from delegation token. url={}, token={}",
url, token);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org