[ISSUE-1206] improvement: Use the real user for audit information #1258
There are no files selected for viewing
This file contains 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 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 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 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 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 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,41 @@ | ||
| /* | ||
| * Copyright 2023 Datastrato Pvt Ltd. | ||
| * This software is licensed under the Apache License version 2. | ||
| */ | ||
|
|
||
| package com.datastrato.gravitino.utils; | ||
|
|
||
| import com.datastrato.gravitino.UserPrincipal; | ||
| import com.datastrato.gravitino.auth.AuthConstants; | ||
| import com.google.common.base.Throwables; | ||
| import java.security.Principal; | ||
| import java.security.PrivilegedActionException; | ||
| import java.security.PrivilegedExceptionAction; | ||
| import javax.security.auth.Subject; | ||
|
|
||
| @SuppressWarnings("removal") | ||
| public class PrincipalUtils { | ||
|
There was a problem hiding this comment. I refer to the doAs and getCurrentUser from Hadoop UserInformation. There was a problem hiding this comment. This api will be removed in the future. But JDK doesn't provide alternative solution. Hadoop will encounter the similar situation. I add the anotation to avoid the failure of compile. |
||
| private PrincipalUtils() {} | ||
|
|
||
| public static <T> T doAs(Principal principal, PrivilegedExceptionAction<T> action) | ||
| throws Exception { | ||
| try { | ||
| Subject subject = new Subject(); | ||
| subject.getPrincipals().add(principal); | ||
| return Subject.doAs(subject, action); | ||
| } catch (PrivilegedActionException pae) { | ||
| Throwable cause = pae.getCause(); | ||
| Throwables.propagateIfPossible(cause, Exception.class); | ||
| throw new RuntimeException("doAs method occurs an unexpected exception", pae); | ||
| } | ||
| } | ||
|
|
||
| public static Principal getCurrentPrincipal() { | ||
| java.security.AccessControlContext context = java.security.AccessController.getContext(); | ||
| Subject subject = Subject.getSubject(context); | ||
| if (subject == null || subject.getPrincipals(UserPrincipal.class).isEmpty()) { | ||
| return new UserPrincipal(AuthConstants.ANONYMOUS_USER); | ||
| } | ||
| return subject.getPrincipals(UserPrincipal.class).iterator().next(); | ||
| } | ||
| } | ||
This file contains 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 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,41 @@ | ||
| /* | ||
| * Copyright 2023 Datastrato Pvt Ltd. | ||
| * This software is licensed under the Apache License version 2. | ||
| */ | ||
|
|
||
| package com.datastrato.gravitino.utils; | ||
|
|
||
| import com.datastrato.gravitino.UserPrincipal; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class TestPrincipalUtils { | ||
|
|
||
| @Test | ||
| public void testNormal() throws Exception { | ||
| UserPrincipal principal = new UserPrincipal("testNormal"); | ||
| PrincipalUtils.doAs( | ||
| principal, | ||
| () -> { | ||
| Assertions.assertEquals("testNormal", PrincipalUtils.getCurrentPrincipal().getName()); | ||
| return null; | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void testThread() throws Exception { | ||
| UserPrincipal principal = new UserPrincipal("testThread"); | ||
| PrincipalUtils.doAs( | ||
| principal, | ||
| () -> { | ||
| Thread thread = | ||
| new Thread( | ||
| () -> | ||
| Assertions.assertEquals( | ||
| "testThread", PrincipalUtils.getCurrentPrincipal().getName())); | ||
| thread.start(); | ||
| thread.join(); | ||
| return null; | ||
| }); | ||
| } | ||
| } |
This file contains 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the purpose of using
AuthConstants.class.getName()as an attribute name?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Refer to the style of Pulsar. I have added the comment.