Skip to content
Closed
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,6 @@ private ElasticsearchSecurityException denialException(Authentication authentica
return authcFailureHandler.authenticationRequired(action, threadContext);
}
}

String userText = "user [" + authUser.principal() + "]";
// check for run as
if (authentication.getUser().isRunAs()) {
Expand All @@ -637,7 +636,9 @@ private ElasticsearchSecurityException denialException(Authentication authentica
userText = userText + " with roles [" + Strings.arrayToCommaDelimitedString(authentication.getUser().roles()) + "]";
}

String requestIndex = extractRequestIndex(request);
String message = "action [" + action + "] is unauthorized for " + userText;
String debugMessage = message.replaceFirst("]", "]" + requestIndex);
if (context != null) {
message = message + " " + context;
}
Expand All @@ -656,10 +657,30 @@ private ElasticsearchSecurityException denialException(Authentication authentica
}
}

logger.debug(message);
logger.debug(debugMessage);
return authorizationError(message, cause);
}

private String extractRequestIndex(TransportRequest request) {
String description = request.getDescription();
if (description == null) {
return "";
}

String index = null;
if (description.contains("indices")) {
index = description
.replaceFirst("^.+indices[ ]?\\[", "")
.replaceFirst("].*$", "");
} else if (description.contains("index {[")) {
index = description
.replaceFirst("^index \\{\\[", "")
.split("]", 2)[0];
}

return index == null ? "" : String.format("(%s)", index);
}

private class AuthorizationResultListener<T extends AuthorizationResult> implements ActionListener<T> {

private final Consumer<T> responseConsumer;
Expand Down