Skip to content

Relax the index access control check for scroll searches #61446

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

Merged
merged 3 commits into from
Aug 27, 2020
Merged

Relax the index access control check for scroll searches #61446

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bc3e79
Done
albertzaharovits Aug 23, 2020
19a2d24
Merge branch 'master' into fix-spurious-scroll-access-controll-check
albertzaharovits Aug 27, 2020
106a795
Merge woes
albertzaharovits Aug 27, 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
24 changes: 11 additions & 13 deletions ...src/main/java/org/elasticsearch/xpack/security/authz/SecuritySearchOperationListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/**
* A {@link SearchOperationListener} that is used to provide authorization for scroll requests.
*
* <p>
* In order to identify the user associated with a scroll request, we replace the {@link ReaderContext}
* on creation with a custom implementation that holds the {@link Authentication} object. When
* this context is accessed again in {@link SearchOperationListener#onPreQueryPhase(SearchContext)}
Expand Down Expand Up @@ -82,7 +82,7 @@ public void validateSearchContext(ReaderContext readerContext, TransportRequest
if (null == securityContext.getThreadContext().getTransient(AuthorizationServiceField.INDICES_PERMISSIONS_KEY)) {
// fill in the DLS and FLS permissions for the scroll search action from the scroll context
IndicesAccessControl scrollIndicesAccessControl =
readerContext.getFromContext(AuthorizationServiceField.INDICES_PERMISSIONS_KEY);
readerContext.getFromContext(AuthorizationServiceField.INDICES_PERMISSIONS_KEY);
assert scrollIndicesAccessControl != null : "scroll does not contain index access control";
securityContext.getThreadContext().putTransient(AuthorizationServiceField.INDICES_PERMISSIONS_KEY,
scrollIndicesAccessControl);
Expand All @@ -93,24 +93,22 @@ public void validateSearchContext(ReaderContext readerContext, TransportRequest

@Override
public void onPreFetchPhase(SearchContext searchContext) {
ensureIndicesAccessControlForScrollThreadContext(searchContext.readerContext());
ensureIndicesAccessControlForScrollThreadContext(searchContext);
}

@Override
public void onPreQueryPhase(SearchContext searchContext) {
ensureIndicesAccessControlForScrollThreadContext(searchContext.readerContext());
ensureIndicesAccessControlForScrollThreadContext(searchContext);
}

void ensureIndicesAccessControlForScrollThreadContext(ReaderContext readerContext) {
if (licenseState.isSecurityEnabled() && readerContext.scrollContext() != null) {
IndicesAccessControl scrollIndicesAccessControl =
readerContext.getFromContext(AuthorizationServiceField.INDICES_PERMISSIONS_KEY);
void ensureIndicesAccessControlForScrollThreadContext(SearchContext searchContext) {
if (licenseState.isSecurityEnabled() && searchContext.readerContext().scrollContext() != null) {
IndicesAccessControl threadIndicesAccessControl =
securityContext.getThreadContext().getTransient(AuthorizationServiceField.INDICES_PERMISSIONS_KEY);
if (scrollIndicesAccessControl != threadIndicesAccessControl) {
throw new ElasticsearchSecurityException("[" + readerContext.id() + "] expected scroll indices access control [" +
scrollIndicesAccessControl.toString() + "] but found [" + threadIndicesAccessControl.toString() + "] in thread " +
"context");
if (null == threadIndicesAccessControl) {
throw new ElasticsearchSecurityException("Unexpected null indices access control for search context [" +
searchContext.id() + "] for request [" + searchContext.request().getDescription() + "] with source [" +
searchContext.source() + "]");
}
}
}
Expand All @@ -131,7 +129,7 @@ static void ensureAuthenticatedUserIsSame(Authentication original, Authenticatio
if (original.getUser().isRunAs()) {
if (current.getUser().isRunAs()) {
sameRealmType = original.getLookedUpBy().getType().equals(current.getLookedUpBy().getType());
} else {
} else {
sameRealmType = original.getLookedUpBy().getType().equals(current.getAuthenticatedBy().getType());
}
} else if (current.getUser().isRunAs()) {
Expand Down