opendev/gerrit
Code Issues Proposed changes

SshLog: audit methods cleaned-up

Browse Source 
Change-Id: Ieedfe2291d02203a67b4b24cee4a791733eff170
Signed-off-by: Eryk Szymanski <eryksz@gmail.com>
This commit is contained in:
Eryk Szymanski
2013-11-23 00:27:17 +01:00
parent 3ca59b803c
commit d38e71ef4e
1 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
View File

@@ -242,17 +242,29 @@ class SshLog implements LifecycleListener {
} }
void audit(Context ctx, Object result, String cmd) { void audit(Context ctx, Object result, String cmd) {
final String sid = extractSessionId(ctx); audit(ctx, result, cmd, null);
final long created = extractCreated(ctx);
auditService.dispatch(new SshAuditEvent(sid, extractCurrentUser(ctx), cmd,
created, null, result));
} }
void audit(Context ctx, Object result, DispatchCommand cmd) { void audit(Context ctx, Object result, DispatchCommand cmd) {
final String sid = extractSessionId(ctx); audit(ctx, result, extractWhat(cmd), extractParameters(cmd));
final long created = extractCreated(ctx); }
auditService.dispatch(new SshAuditEvent(sid, extractCurrentUser(ctx),
extractWhat(cmd), created, extractParameters(cmd), result)); private void audit(Context ctx, Object result, String cmd, Multimap<String, ?> params) {
String sessionId;
CurrentUser currentUser;
long created;
if (ctx == null) {
sessionId = null;
currentUser = null;
created = TimeUtil.nowMs();
} else {
SshSession session = ctx.getSession();
sessionId = IdGenerator.format(session.getSessionId());
currentUser = session.getCurrentUser();
created = ctx.created;
}
auditService.dispatch(new SshAuditEvent(sessionId, currentUser,
cmd, created, params, result));
} }
private String extractWhat(DispatchCommand dcmd) { private String extractWhat(DispatchCommand dcmd) {
@@ -260,30 +272,7 @@ class SshLog implements LifecycleListener {
String[] args = dcmd.getArguments(); String[] args = dcmd.getArguments();
if (args.length > 1) { if (args.length > 1) {
return commandName + "." + args[1]; return commandName + "." + args[1];
} else { }
return commandName; return commandName;
} }
}
private long extractCreated(final Context ctx) {
return (ctx != null) ? ctx.created : TimeUtil.nowMs();
}
private CurrentUser extractCurrentUser(final Context ctx) {
if (ctx != null) {
SshSession session = ctx.getSession();
return (session == null) ? null : session.getCurrentUser();
} else {
return null;
}
}
private String extractSessionId(final Context ctx) {
if (ctx != null) {
SshSession session = ctx.getSession();
return (session == null) ? null : IdGenerator.format(session.getSessionId());
} else {
return null;
}
}
} }