From 966d105b05d5435bbbc03a7522a0a80c8041de2c Mon Sep 17 00:00:00 2001
From: Bart Geesink <bart.geesink@surf.nl>
Date: Tue, 16 Jul 2024 09:23:34 +0200
Subject: [PATCH] oidcng: Logback should include the json syslog as well

---
 roles/oidcng/templates/logback.xml.j2 | 35 ++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/roles/oidcng/templates/logback.xml.j2 b/roles/oidcng/templates/logback.xml.j2
index c1061bac8..31322655f 100644
--- a/roles/oidcng/templates/logback.xml.j2
+++ b/roles/oidcng/templates/logback.xml.j2
@@ -8,6 +8,20 @@
    </encoder>
  </appender>
 
+ <appender name="JSON_SYSLOG" class="net.logstash.logback.appender.LogstashSocketAppender">
+    <host>{{ ansible_fqdn }}</host>
+    <port>514</port>
+      <customFields>{"app":"oidcng"}</customFields>
+        <fieldNames>
+            <thread>[ignore]</thread>
+            <version>[ignore]</version>
+            <levelValue>[ignore]</levelValue>
+       </fieldNames>
+             <prefix class="ch.qos.logback.classic.PatternLayout">
+        <pattern>oidcngjson:</pattern>
+      </prefix>
+  </appender>
+
  <appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender">
    <smtpHost>{{ smtp_server }}</smtpHost>
    <from>{{ noreply_email }}</from>
@@ -15,15 +29,30 @@
    <subject>{{ error_subject_prefix }}Unexpected error oidcng</subject>
    <layout class="ch.qos.logback.classic.html.HTMLLayout"/>
 
-   <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+    <filter class="filter.CustomThresholdFilter">
+        <clazz>com.nimbusds.oauth2.sdk.ParseException</clazz>
+        <clazz>org.springframework.security.authentication.BadCredentialsException</clazz>
+        <clazz>oidc.exceptions.UnauthorizedException</clazz>
+        <clazz>oidc.exceptions.RedirectMismatchException</clazz>
+        <clazz>org.springframework.dao.EmptyResultDataAccessException</clazz>
+        <clazz>java.lang.IllegalArgumentException</clazz>
      <level>ERROR</level>
    </filter>
  </appender>
 
- <logger name="dashboard" level="DEBUG" />
+ <logger name="oidc" level="WARN" />
+ <logger name="org.springframework" level="WARN" />
  <root level="WARN">
-   <appender-ref ref="STDOUT" />
+{%if oidcng_logback_file |bool  %}
+   <appender-ref ref="FILE" />
+{%endif%}
+{%if oidcng_logback_email |bool  %}
    <appender-ref ref="EMAIL" />
+{%endif%}
+   <appender-ref ref="SYSLOG" />
+{%if oidcng_logback_json |bool  %}
+   <appender-ref ref="JSON_SYSLOG" />
+{%endif%}
  </root>
 
 </configuration>