Преглед изворни кода

Updates for the CEF enhancement

rkeil пре 7 година
родитељ
комит
f8146fec59

+ 3 - 1
server/src/main/java/password/pwm/svc/event/AuditService.java

@@ -109,7 +109,9 @@ public class AuditService implements PwmService {
         }
 
         final List<String> syslogConfigString = pwmApplication.getConfig().readSettingAsStringArray(PwmSetting.AUDIT_SYSLOG_SERVERS);
-        if (syslogConfigString != null && !syslogConfigString.isEmpty()) {
+        final List<String> cefConfigString = pwmApplication.getConfig().readSettingAsStringArray(PwmSetting.AUDIT_COMMONEVENTFORMAT_SERVERS);
+
+        if ((syslogConfigString != null && !syslogConfigString.isEmpty()) || (cefConfigString != null && !cefConfigString.isEmpty())) {
             try {
                 if (cefEnabled) {
                     cefManager = new CEFAuditService(pwmApplication);

+ 3 - 3
server/src/main/java/password/pwm/svc/event/CEFAuditService.java

@@ -119,7 +119,7 @@ public class CEFAuditService {
     private class SyslogItemProcessor implements WorkQueueProcessor.ItemProcessor<String> {
         @Override
         public WorkQueueProcessor.ProcessResult process(final String workItem) {
-            return processEvent(workItem);
+            return processCEFEvent(workItem);
         }
 
         @Override
@@ -191,9 +191,10 @@ public class CEFAuditService {
         return healthRecords;
     }
 
-    private WorkQueueProcessor.ProcessResult processEvent(final String auditRecord) {
+    private WorkQueueProcessor.ProcessResult processCEFEvent(final String auditRecord) {
 
         for (SyslogIF cefInstance : cefInstances) {
+
             try {
                 cefInstance.info(auditRecord);
                 LOGGER.trace("delivered syslog audit event: " + auditRecord);
@@ -354,7 +355,6 @@ public class CEFAuditService {
 
     private class LocalTrustSSLTCPNetSyslog extends SSLTCPNetSyslog {
 
-
         @Override
         public AbstractSyslogWriter createWriter() {
             final CEFAuditService.LocalTrustSyslogWriterClass newClass = new CEFAuditService.LocalTrustSyslogWriterClass();