Skip to content
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

The Authentication class is now final #86544

Merged
merged 2 commits into from
May 17, 2022
Merged

The Authentication class is now final #86544

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
c4c1860
The Authentication class is now final
ywangd May 9, 2022
f67cc65
Merge branch 'master' into final-authentication
elasticmachine May 17, 2022
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
2 changes: 1 addition & 1 deletion ...plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

// TODO(hub-cap) Clean this up after moving User over - This class can re-inherit its field AUTHENTICATION_KEY in AuthenticationField.
// That interface can be removed
public class Authentication implements ToXContentObject {
public final class Authentication implements ToXContentObject {

private static final Logger logger = LogManager.getLogger(Authentication.class);

Expand Down
9 changes: 4 additions & 5 deletions ...est/java/org/elasticsearch/xpack/security/action/user/TransportSetEnabledActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
Expand Down Expand Up @@ -122,10 +121,10 @@ public void testValidUserWithInternalUsername() throws Exception {

public void testUserCanModifySameNameUserFromDifferentRealm() throws Exception {
final User user = randomFrom(new ElasticUser(true), new KibanaUser(true), new User("joe"));
Authentication authentication = mock(Authentication.class, RETURNS_DEEP_STUBS);
when(authentication.getEffectiveSubject().getUser()).thenReturn(user);
when(authentication.getEffectiveSubject().getRealm().getType()).thenReturn("other_realm");
when(authentication.encode()).thenReturn(randomAlphaOfLength(24)); // just can't be null
Authentication authentication = AuthenticationTestHelper.builder()
.user(user)
.realmRef(new Authentication.RealmRef(randomAlphaOfLengthBetween(3, 8), "other_realm", randomAlphaOfLengthBetween(3, 8)))
.build(false);
testValidUser(user, authentication);
}

Expand Down