Skip to content

Auditor can be given additional context information #26913

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
luk-kaminski wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −8
Open

Auditor can be given additional context information #26913

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
34 changes: 26 additions & 8 deletions graylog2-server/src/main/java/org/graylog2/audit/Auditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,47 @@ public <T> T audited(final String username,
final String eventType,
final Object actionInput,
final Supplier<T> auditableAction) {
return audited(username, eventType, actionInput, auditableAction, SUCCESS_ON_NON_NULL);
return audited(username, eventType, actionInput, auditableAction, SUCCESS_ON_NON_NULL, null);
}

public <T> T audited(final String username,

@monrax monrax Aug 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this guy has no call sites. Should we drop it?

final String eventType,
final Object actionInput,
final Supplier<T> auditableAction,
final Map<String, Object> extra) {
return audited(username, eventType, actionInput, auditableAction, SUCCESS_ON_NON_NULL, extra);
}

public <T> T audited(final String username,
final String eventType,
final Object actionInput,
final Supplier<T> auditableAction,
final Predicate<? super T> isSuccess) {
return audited(username, eventType, actionInput, auditableAction, isSuccess, null);
}

public <T> T audited(final String username,
final String eventType,
final Object actionInput,
final Supplier<T> auditableAction,
final Predicate<? super T> isSuccess,
final Map<String, Object> extra) {
final T actionResult;
try {
actionResult = auditableAction.get();
} catch (RuntimeException e) {
recordFailure(username,
eventType,
actionInput,
null,
Map.of(ERROR, String.valueOf(e.getMessage())));
final Map<String, Object> extraWithError = new LinkedHashMap<>();
if (extra != null) {

@monrax monrax Aug 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about passing Map.of() in the overloads? then

final Map<String, Object> extraWithError = new LinkedHashMap<>(extra);
extraWithError.put(ERROR, String.valueOf(e.getMessage()));

extraWithError.putAll(extra);
}
extraWithError.put(ERROR, String.valueOf(e.getMessage()));
recordFailure(username, eventType, actionInput, null, extraWithError);
throw e;
}
if (isSuccess.test(actionResult)) {
recordSuccess(username, eventType, actionInput, actionResult, null);
recordSuccess(username, eventType, actionInput, actionResult, extra);
} else {
recordFailure(username, eventType, actionInput, actionResult, null);
recordFailure(username, eventType, actionInput, actionResult, extra);
}
return actionResult;
}
Expand Down
Loading