common: Use cockpit.conf for fatal criticals

The way that our testing uses environment variables to setup
fatal criticals during testing doesn't work for the privileged
bridge or other bridges. Both pkexec and sudo clean out the
environment.

So lets use cockpit.conf to configure this consistently across
all cockpit processes.

Closes #7315

doc/man/cockpit.conf.xml

@@ -130,6 +130,19 @@ ProtocolHeader = X-Forwarded-Proto
     </variablelist>
   </refsect1>
 
+  <refsect1 id="cockpit-conf-log">
+    <title>Log</title>
+    <variablelist>
+      <varlistentry>
+        <term><option>Fatal</option></term>
+        <listitem>
+          <para>The kind of log messages in the bridge to treat as fatal. Separate multiple values
+            with spaces. Relevant values are: <code>criticals</code> and <code>warnings</code>.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
   <refsect1 id="cockpit-conf-oauth">
     <title>OAuth</title>
     <para>Cockpit can be configured to support the <ulink url="https://tools.ietf.org/html/rfc6749#section-4.2">

src/common/cockpitlog.c

@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include "cockpitlog.h"
+#include "cockpitconf.h"
 
 #include <systemd/sd-journal.h>
 #include <syslog.h>
@@ -151,8 +152,24 @@ void
 cockpit_set_journal_logging (const gchar *stderr_domain,
                              gboolean only)
 {
+  GLogLevelFlags fatal;
+  const gchar **fatals;
   int fd;
 
+  fatals = cockpit_conf_strv ("Log", "Fatal", ' ');
+  if (fatals)
+    {
+      fatal = G_LOG_LEVEL_ERROR;
+      for (; fatals[0] != NULL; fatals++)
+        {
+          if (g_ascii_strcasecmp ("criticals", fatals[0]) == 0)
+            fatal |= G_LOG_LEVEL_CRITICAL;
+          else if (g_ascii_strcasecmp ("warnings", fatals[0]) == 0)
+            fatal |= G_LOG_LEVEL_WARNING;
+        }
+      g_log_set_always_fatal (fatal);
+    }
+
   /* Don't log to journal while being tested by test-server */
   if (g_getenv ("COCKPIT_TEST_SERVER_PORT") != NULL)
     only = FALSE;

src/ws/Makefile-ws.am

@@ -382,9 +382,9 @@ testassetsdir = $(prefix)/lib/cockpit-test-assets
 testserviceddir = $(systemdunitdir)/cockpit.service.d
 
 install-tests::
-	$(MKDIR_P) $(DESTDIR)$(testassetsdir) $(DESTDIR)$(testserviceddir)
+	$(MKDIR_P) $(DESTDIR)$(testassetsdir) $(DESTDIR)$(testserviceddir) $(DESTDIR)/etc/cockpit
 	$(INSTALL_DATA) mock-pam-conv-mod.so $(DESTDIR)$(testassetsdir)
-	$(INSTALL_DATA) $(srcdir)/src/ws/fatal.conf $(DESTDIR)$(testserviceddir)
+	$(INSTALL_DATA) $(srcdir)/src/ws/fatal.conf $(DESTDIR)/etc/cockpit/cockpit.conf
 
 install-exec-hook::
 	mkdir -p $(DESTDIR)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(sysconfdir)/cockpit/machines.d

src/ws/fatal.conf

@@ -1,2 +1,2 @@
-[Service]
-Environment=G_DEBUG=fatal-criticals
+[Log]
+Fatal = criticals

tools/cockpit.spec

@@ -450,7 +450,7 @@ This package contains tests and files used while testing Cockpit.
 These files are not required for running Cockpit.
 
 %files tests
-%{_unitdir}/cockpit.service.d
+%config(noreplace) %{_sysconfdir}/cockpit/cockpit.conf
 %{_datadir}/%{name}/playground
 %{_prefix}/lib/cockpit-test-assets