Skip to content

HBASE-23722 Real user might be null in non-proxy-user case #1085

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
joshelser wants to merge 3 commits into from
Closed

HBASE-23722 Real user might be null in non-proxy-user case #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d8f705
HBASE-23722 Real user might be null in non-proxy-user case
joshelser Jan 23, 2020
4e9227e
HACK trigger QA
joshelser Jan 23, 2020
0fe781c
... and hbase-server
joshelser Jan 23, 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
8 changes: 6 additions & 2 deletions ...ient/src/main/java/org/apache/hadoop/hbase/security/provider/BuiltInProviderSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.yetus.audience.InterfaceAudience;
Expand Down Expand Up @@ -124,8 +125,11 @@ public Pair<SaslClientAuthenticationProvider, Token<? extends TokenIdentifier>>
}
}
// Unwrap PROXY auth'n method if that's what we have coming in.
if (user.getUGI().hasKerberosCredentials() ||
user.getUGI().getRealUser().hasKerberosCredentials()) {
final UserGroupInformation currentUser = user.getUGI();
// May be null if Hadoop AuthenticationMethod is PROXY
final UserGroupInformation realUser = currentUser.getRealUser();
if (currentUser.hasKerberosCredentials() ||
(realUser != null && realUser.hasKerberosCredentials())) {
return new Pair<>(krbAuth, null);
}
// This indicates that a client is requesting some authentication mechanism which the servers
Expand Down
1 change: 1 addition & 0 deletions hbase-rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,3 +543,4 @@
</profile>
</profiles>
</project>
<!-- trigger ut -->
1 change: 1 addition & 0 deletions hbase-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,3 +897,4 @@
</profile>
</profiles>
</project>
<!-- trigger ut -->
1 change: 1 addition & 0 deletions hbase-thrift/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,3 +600,4 @@
</profile>
</profiles>
</project>
<!-- trigger ut -->