From 786c19842a8d2a392086deeefa5d985669158c8c Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Mon, 03 Oct 2016 09:49:30 +0000
Subject: [PATCH] OPENDJ-3335 Reuse request and response fields for publishing LDAP events
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java
index fd7c6aa..78d4989 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java
@@ -125,8 +125,8 @@
return;
}
OpenDJAccessAuditEventBuilder<?> builder = getEventBuilder(abandonOperation, "ABANDON");
+ addResultCodeAndMessage(abandonOperation, builder);
appendAbandonRequest(abandonOperation, builder);
- appendResultCodeAndMessage(abandonOperation, builder);
sendEvent(builder.toEvent());
}
@@ -139,8 +139,8 @@
return;
}
OpenDJAccessAuditEventBuilder<?> builder = getEventBuilder(addOperation, "ADD");
+ addResultCodeAndMessage(addOperation, builder);
appendAddRequest(addOperation, builder);
- appendResultCodeAndMessage(addOperation, builder);
DN proxiedAuthorizationDN = addOperation.getProxiedAuthorizationDN();
appendProxiedAuthorizationDNIfNeeded(builder, proxiedAuthorizationDN);
@@ -156,8 +156,8 @@
}
OpenDJAccessAuditEventBuilder<?> builder = getEventBuilder(bindOperation, "BIND");
+ addResultCodeAndMessage(bindOperation, builder);
appendBindRequest(bindOperation, builder);
- appendResultCodeAndMessage(bindOperation, builder);
final LocalizableMessage failureMessage = bindOperation.getAuthFailureReason();
if (failureMessage != null)
@@ -211,8 +211,8 @@
return;
}
OpenDJAccessAuditEventBuilder<?> builder = getEventBuilder(compareOperation, "COMPARE");
+ addResultCodeAndMessage(compareOperation, builder);
appendCompareRequest(compareOperation, builder);
- appendResultCodeAndMessage(compareOperation, builder);
DN proxiedAuthorizationDN = compareOperation.getProxiedAuthorizationDN();
appendProxiedAuthorizationDNIfNeeded(builder, proxiedAuthorizationDN);
@@ -235,7 +235,6 @@
return;
}
OpenDJAccessAuditEventBuilder<?> builder = openDJAccessEvent()
- .eventName("DJ-" + clientConnection.getProtocol() + "-" + "CONNECT")
.client(clientConnection.getClientAddress(), clientConnection.getClientPort())
.server(clientConnection.getServerAddress(), clientConnection.getServerPort())
.request(clientConnection.getProtocol(), "CONNECT")
@@ -254,8 +253,8 @@
return;
}
OpenDJAccessAuditEventBuilder<?> builder = getEventBuilder(deleteOperation, "DELETE");
+ addResultCodeAndMessage(deleteOperation, builder);
appendDeleteRequest(deleteOperation, builder);
- appendResultCodeAndMessage(deleteOperation, builder);
DN proxiedAuthorizationDN = deleteOperation.getProxiedAuthorizationDN();
appendProxiedAuthorizationDNIfNeeded(builder, proxiedAuthorizationDN);
@@ -271,7 +270,6 @@
return;
}
OpenDJAccessAuditEventBuilder<?> builder = openDJAccessEvent()
- .eventName("DJ-" + clientConnection.getProtocol() + "-" + "DISCONNECT")
.client(clientConnection.getClientAddress(), clientConnection.getClientPort())
.server(clientConnection.getServerAddress(), clientConnection.getServerPort())
.request(clientConnection.getProtocol(), "DISCONNECT")
@@ -292,8 +290,8 @@
return;
}
OpenDJAccessAuditEventBuilder<?> builder = getEventBuilder(extendedOperation, "EXTENDED");
+ addResultCodeAndMessage(extendedOperation, builder);
appendExtendedRequest(extendedOperation, builder);
- appendResultCodeAndMessage(extendedOperation, builder);
final String oid = extendedOperation.getResponseOID();
if (oid != null)
{
@@ -316,8 +314,8 @@
return;
}
OpenDJAccessAuditEventBuilder<?> builder = getEventBuilder(modifyDNOperation, "MODIFYDN");
+ addResultCodeAndMessage(modifyDNOperation, builder);
appendModifyDNRequest(modifyDNOperation, builder);
- appendResultCodeAndMessage(modifyDNOperation, builder);
DN proxiedAuthorizationDN = modifyDNOperation.getProxiedAuthorizationDN();
appendProxiedAuthorizationDNIfNeeded(builder, proxiedAuthorizationDN);
@@ -332,8 +330,8 @@
return;
}
OpenDJAccessAuditEventBuilder<?> builder = getEventBuilder(modifyOperation, "MODIFY");
+ addResultCodeAndMessage(modifyOperation, builder);
appendModifyRequest(modifyOperation, builder);
- appendResultCodeAndMessage(modifyOperation, builder);
DN proxiedAuthorizationDN = modifyOperation.getProxiedAuthorizationDN();
appendProxiedAuthorizationDNIfNeeded(builder, proxiedAuthorizationDN);
@@ -348,10 +346,8 @@
return;
}
OpenDJAccessAuditEventBuilder<?> builder = getEventBuilder(searchOperation, "SEARCH");
- builder
- .ldapSearch(searchOperation)
- .ldapNEntries(searchOperation.getEntriesSent());
- appendResultCodeAndMessage(searchOperation, builder);
+ addResultCodeAndMessage(searchOperation, builder);
+ builder.ldapSearch(searchOperation).ldapNEntries(searchOperation.getEntriesSent());
DN proxiedAuthorizationDN = searchOperation.getProxiedAuthorizationDN();
appendProxiedAuthorizationDNIfNeeded(builder, proxiedAuthorizationDN);
@@ -435,7 +431,7 @@
builder.ldapDn(modifyOperation.getRawEntryDN().toString());
}
- private OpenDJAccessAuditEventBuilder<?> appendResultCodeAndMessage(
+ private OpenDJAccessAuditEventBuilder<?> addResultCodeAndMessage(
Operation operation, OpenDJAccessAuditEventBuilder<?> builder)
{
final LocalizableMessageBuilder message = operation.getErrorMessage();
@@ -461,7 +457,6 @@
ClientConnection clientConn = operation.getClientConnection();
OpenDJAccessAuditEventBuilder<?> builder = openDJAccessEvent()
- .eventName("DJ-" + clientConn.getProtocol() + "-" + opType)
.client(clientConn.getClientAddress(), clientConn.getClientPort())
.server(clientConn.getServerAddress(), clientConn.getServerPort())
.request(clientConn.getProtocol(), opType)
--
Gitblit v1.10.0