Skip to content

HADOOP-17379. AbstractS3ATokenIdentifier to set issue date == now. #2466

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

Merged
merged 2 commits into from
Nov 17, 2020
Merged

HADOOP-17379. AbstractS3ATokenIdentifier to set issue date == now. #2466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc2d3c5
HADOOP-17379. AbstractS3ATokenIdentifier to set issue date == now.
HeartSaVioR Nov 16, 2020
82a2bbb
checkstyle fix
HeartSaVioR Nov 17, 2020
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
9 changes: 9 additions & 0 deletions ...ws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/AbstractS3ATokenIdentifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.io.DataOutput;
import java.io.IOException;
import java.net.URI;
import java.time.Clock;
import java.util.Objects;
import java.util.UUID;

Expand Down Expand Up @@ -140,6 +141,7 @@ protected AbstractS3ATokenIdentifier(
final URI uri) {
super(kind, owner, renewer, realUser);
this.uri = requireNonNull(uri);
initializeIssueDate();
}

/**
Expand All @@ -164,6 +166,13 @@ protected AbstractS3ATokenIdentifier(
*/
protected AbstractS3ATokenIdentifier(final Text kind) {
super(kind);
initializeIssueDate();
}

private void initializeIssueDate() {
Clock clock = Clock.systemDefaultZone();
long now = clock.millis();
setIssueDate(now);
}

public String getBucket() {
Expand Down
11 changes: 11 additions & 0 deletions ...src/test/java/org/apache/hadoop/fs/s3a/auth/delegation/TestS3ADelegationTokenSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

/**
* Unit tests related to S3A DT support.
Expand All @@ -58,6 +59,14 @@ public void testSessionTokenKind() throws Throwable {
assertEquals(SESSION_TOKEN_KIND, identifier.getKind());
}

@Test
public void testSessionTokenIssueDate() throws Throwable {
AbstractS3ATokenIdentifier identifier
= new SessionTokenIdentifier();
assertEquals(SESSION_TOKEN_KIND, identifier.getKind());
assertTrue("issue date is not set", identifier.getIssueDate() > 0L);
}

@Test
public void testSessionTokenDecode() throws Throwable {
Text alice = new Text("alice");
Expand Down Expand Up @@ -90,6 +99,8 @@ public void testSessionTokenDecode() throws Throwable {
UserGroupInformation.AuthenticationMethod.TOKEN,
decodedUser.getAuthenticationMethod());
assertEquals("origin", decoded.getOrigin());
assertEquals("issue date", identifier.getIssueDate(),
decoded.getIssueDate());
}

@Test
Expand Down