Skip to content

Check all paths for sensitive keys and change sensitive keys to a set #70

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Check all paths for sensitive keys and change sensitive keys to a set #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 6 additions & 11 deletions src/main/java/org/opensearch/security/auditlog/impl/AuditMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Pattern;

import com.google.common.annotations.VisibleForTesting;
Expand Down Expand Up @@ -56,21 +57,18 @@
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import static org.opensearch.security.OpenSearchSecurityPlugin.LEGACY_OPENDISTRO_PREFIX;
import static org.opensearch.security.OpenSearchSecurityPlugin.PLUGINS_PREFIX;

public final class AuditMessage {

private static final Logger log = LogManager.getLogger(AuditMessage.class);

// clustername and cluster uuid
private static final WildcardMatcher AUTHORIZATION_HEADER = WildcardMatcher.from("Authorization").ignoreCase();
private static final String SENSITIVE_KEY = "password";
private static final Set<String> SENSITIVE_KEYS = Set.of("password", "openai_key");
private static final String SENSITIVE_REPLACEMENT_VALUE = "__SENSITIVE__";

private static final Pattern SENSITIVE_PATHS = Pattern.compile(
"/(" + LEGACY_OPENDISTRO_PREFIX + "|" + PLUGINS_PREFIX + ")/api/(account.*|internalusers.*|user.*)"
);
private static boolean containsSensitiveKey(String requestBody) {
return SENSITIVE_KEYS.stream().anyMatch(requestBody::contains);
}

@VisibleForTesting
public static final String BCRYPT_REGEX = "\\$2[ayb]\\$.{56}";
Expand Down Expand Up @@ -417,10 +415,7 @@ void addRestRequestInfo(final SecurityRequest request, final AuditConfig.Filter
try {
final Tuple<MediaType, BytesReference> xContentTuple = restRequest.contentOrSourceParam();
final String requestBody = XContentHelper.convertToJson(xContentTuple.v2(), false, xContentTuple.v1());
if (path != null
&& requestBody != null
&& SENSITIVE_PATHS.matcher(path).matches()
&& requestBody.contains(SENSITIVE_KEY)) {
if (requestBody != null && containsSensitiveKey(requestBody)) {
auditInfo.put(REQUEST_BODY, SENSITIVE_REPLACEMENT_VALUE);
} else {
auditInfo.put(REQUEST_BODY, requestBody);
Expand Down
Loading