-
Notifications
You must be signed in to change notification settings - Fork 3.4k
HBASE-26667 Integrate user-experience for hbase-client #4064
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.
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
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
7cb1028
HBASE-26667. Get OAuth Bearer token from environment variable
anmolnar d844f2a
HBASE-26667. Parse expiry time from env var string <token>,<expiry>
anmolnar 69d7de3
HBASE-26667. Add unit tests
anmolnar 08ecee5
HBASE-26667. Code review feedback
anmolnar 36a4f59
HBASE-26667. Throw runtime exception if something is wrong with JWT e…
anmolnar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
...client/src/test/java/org/apache/hadoop/hbase/security/token/TestOAuthBearerTokenUtil.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.hadoop.hbase.security.token; | ||
|
|
||
| import static org.apache.hadoop.hbase.security.oauthbearer.OAuthBearerUtils.TOKEN_KIND; | ||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertTrue; | ||
| import java.security.AccessController; | ||
| import java.security.PrivilegedAction; | ||
| import java.time.Instant; | ||
| import java.util.Optional; | ||
| import java.util.Set; | ||
| import javax.security.auth.Subject; | ||
| import org.apache.hadoop.hbase.HBaseConfiguration; | ||
| import org.apache.hadoop.hbase.security.User; | ||
| import org.apache.hadoop.hbase.security.oauthbearer.OAuthBearerToken; | ||
| import org.apache.hadoop.io.Text; | ||
| import org.apache.hadoop.security.token.Token; | ||
| import org.junit.Test; | ||
|
|
||
| public class TestOAuthBearerTokenUtil { | ||
|
|
||
| @Test | ||
| public void testAddTokenFromEnvVar() { | ||
| // Arrange | ||
| User user = User.createUserForTesting(HBaseConfiguration.create(), "testuser", new String[] {}); | ||
| String testToken = "some_base64_encoded_stuff,2022-01-25T16:59:48.614000+00:00"; | ||
|
|
||
| // Act | ||
| OAuthBearerTokenUtil.addTokenFromEnvironmentVar(user, testToken); | ||
|
|
||
| // Assert | ||
| Optional<Token<?>> oauthBearerToken = user.getTokens().stream() | ||
| .filter((t) -> new Text(TOKEN_KIND).equals(t.getKind())) | ||
| .findFirst(); | ||
| assertTrue("Token cannot be found in user tokens", oauthBearerToken.isPresent()); | ||
| user.runAs(new PrivilegedAction<Object>() { | ||
| @Override public Object run() { | ||
| Subject subject = Subject.getSubject(AccessController.getContext()); | ||
| Set<OAuthBearerToken> tokens = subject.getPrivateCredentials(OAuthBearerToken.class); | ||
| assertFalse("Token cannot be found in subject's private credentials", tokens.isEmpty()); | ||
| OAuthBearerToken jwt = tokens.iterator().next(); | ||
| assertEquals("Invalid encoded JWT value", "some_base64_encoded_stuff", jwt.value()); | ||
| assertEquals("Invalid JWT expiry", "2022-01-25T16:59:48.614Z", | ||
| Instant.ofEpochMilli(jwt.lifetimeMs()).toString()); | ||
| return null; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @Test(expected = RuntimeException.class) | ||
| public void testAddTokenEnvVarWithoutExpiry() { | ||
| // Arrange | ||
| User user = User.createUserForTesting(new HBaseConfiguration(), "testuser", new String[] {}); | ||
| String testToken = "some_base64_encoded_stuff"; | ||
|
|
||
| // Act | ||
| OAuthBearerTokenUtil.addTokenFromEnvironmentVar(user, testToken); | ||
|
|
||
| // Assert | ||
| } | ||
|
|
||
| @Test(expected = RuntimeException.class) | ||
| public void testAddTokenEnvVarWithInvalidExpiry() { | ||
| // Arrange | ||
| User user = User.createUserForTesting(new HBaseConfiguration(), "testuser", new String[] {}); | ||
| String testToken = "some_base64_encoded_stuff,foobarblahblah328742"; | ||
|
|
||
| // Act | ||
| OAuthBearerTokenUtil.addTokenFromEnvironmentVar(user, testToken); | ||
|
|
||
| // Assert | ||
| } | ||
|
|
||
| @Test | ||
| public void testAddTokenEnvVarTokenAlreadyPresent() { | ||
| // Arrange | ||
| User user = User.createUserForTesting(new HBaseConfiguration(), "testuser", new String[] {}); | ||
| user.addToken(new Token<>(null, null, new Text(TOKEN_KIND), null)); | ||
| String testToken = "some_base64_encoded_stuff,foobarblahblah328742"; | ||
|
|
||
| // Act | ||
| OAuthBearerTokenUtil.addTokenFromEnvironmentVar(user, testToken); | ||
|
|
||
| // Assert | ||
| long numberOfTokens = user.getTokens().stream() | ||
| .filter((t) -> new Text(TOKEN_KIND).equals(t.getKind())) | ||
| .count(); | ||
| assertEquals("Invalid number of tokens on User", 1, numberOfTokens); | ||
| user.runAs(new PrivilegedAction<Object>() { | ||
| @Override public Object run() { | ||
| Subject subject = Subject.getSubject(AccessController.getContext()); | ||
| Set<OAuthBearerToken> tokens = subject.getPrivateCredentials(OAuthBearerToken.class); | ||
| assertTrue("Token should not have been added to subject's credentials", tokens.isEmpty()); | ||
| return null; | ||
| } | ||
| }); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.