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.

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

Add new audit handler method for action responses #63708

Merged
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c710726
Remove redundant IOException
albertzaharovits Oct 14, 2020
e9f2866
Merge branch 'master' into post_authz_audit_event
albertzaharovits Oct 14, 2020
48d647e
WIP
albertzaharovits Oct 14, 2020
e3c5c3f
Merge branch 'master' into post_authz_audit_event
albertzaharovits Oct 15, 2020
9469127
SecurityActionFilterTests
albertzaharovits Oct 15, 2020
2f5e546
Strict!
albertzaharovits Oct 15, 2020
d88969b
Merge branch 'master' into post_authz_audit_event
albertzaharovits Oct 26, 2020
0ebadb9
Trash test
albertzaharovits Oct 26, 2020
f6ff433
SecurityActionFilter
albertzaharovits Oct 26, 2020
9f56238
extract requestId and authentication before running the action
albertzaharovits Oct 26, 2020
765493f
remove thrash
albertzaharovits Oct 26, 2020
cf172b8
Merge branch 'master' into post_authz_audit_event
albertzaharovits Oct 26, 2020
71790f9
Security enabled guard in SecurityServerTransport
albertzaharovits Oct 26, 2020
e25903e
AuthenticationServiceTests
albertzaharovits Oct 27, 2020
6e229a8
AuthorizationServiceTests
albertzaharovits Oct 29, 2020
43f3644
ServerTransportFilterTests
albertzaharovits Oct 29, 2020
a922aa8
SecurityActionFilterTests
albertzaharovits Oct 29, 2020
aada0ae
Merge branch 'master' into post_authz_audit_event
albertzaharovits Oct 29, 2020
655bba9
More tests
albertzaharovits Oct 29, 2020
8c03167
Checkstyle
albertzaharovits Oct 29, 2020
b514c0c
Merge branch 'master' into post_authz_audit_event
albertzaharovits Nov 4, 2020
6706993
Reuse the `User#isInternal` method in the authorization service
albertzaharovits Nov 4, 2020
ec22611
Merge branch 'master' into post_authz_audit_event
albertzaharovits Dec 7, 2020
1b5b65e
tests afte merge conflict
albertzaharovits Dec 7, 2020
e7383c5
wrong merge choice
albertzaharovits Dec 7, 2020
14425d5
Good merge choice
albertzaharovits Dec 7, 2020
a730658
Move chain.proceed down
albertzaharovits Dec 7, 2020
c6d1a74
Remove line
albertzaharovits Dec 8, 2020
93299a3
Merge branch 'master' into post_authz_audit_event
albertzaharovits Dec 9, 2020
3926ada
Checkstyle
albertzaharovits Dec 9, 2020
4d579d7
Merge branch 'master' into post_authz_audit_event
albertzaharovits Dec 14, 2020
e5ddb6e
Only intercept the action filter
albertzaharovits Dec 15, 2020
cf59a60
Checkstyle test
albertzaharovits Dec 15, 2020
7851883
Merge branch 'master' into post_authz_audit_event
albertzaharovits Dec 15, 2020
3753771
Merge branch 'master' into post_authz_audit_event
albertzaharovits Dec 15, 2020
49a2852
Nits
albertzaharovits Dec 15, 2020
6e2e882
Update x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/s…
albertzaharovits Dec 16, 2020
b81f644
Merge branch 'master' into post_authz_audit_event
elasticmachine Dec 16, 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
Prev Previous commit
Next Next commit
wrong merge choice
albertzaharovits committed Dec 7, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit e7383c50698e949ca1ac92b603b85220f864776a
Original file line number Diff line number Diff line change
@@ -659,15 +659,10 @@ public void testAuthenticationInContextAndHeader() throws Exception {
if (requestIdAlreadyPresent) {
assertThat(expectAuditRequestId(threadContext), is(reqId.get()));
}
assertThat(expectAuditRequestId(threadContext), is(result.v2()));
assertThat(result, notNullValue());
assertThat(expectAuditRequestId(threadContext), is(result.v2()));
assertThat(result.v1().getUser(), is(user));
assertThat(result.v1().getAuthenticationType(), is(AuthenticationType.REALM));

String userStr = threadContext.getHeader(AuthenticationField.AUTHENTICATION_KEY);
assertThat(userStr, notNullValue());
Authentication ctxAuth = threadContext.getTransient(AuthenticationField.AUTHENTICATION_KEY);
assertThat(ctxAuth, is(result));
verify(operatorPrivilegesService).maybeMarkOperatorUser(eq(result.v1()), eq(threadContext));
}