build(deps): bump github/codeql-action from 3 to 4 (#497)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
         go-version: [1.25.x]
     steps:
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v7
         with:
           go-version: ${{ matrix.go-version }}
       - name: Updating packages database
@@ -21,7 +21,7 @@ jobs:
       - name: Install CLI Dependencies
         run: sudo apt-get install -y ldap-utils oathtool libpam0g-dev
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
       - name: Fetch Go dependencies
         working-directory: ./v2
         run: go get -t -v ./...

.github/workflows/codeql.yml

@@ -24,18 +24,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:${{ matrix.language }}"

v2/pkg/logging/loghandler_other.go

@@ -56,14 +56,13 @@ func InitLogging(reqdebug bool, reqsyslog bool, reqstructlog bool) zerolog.Logge
 		logr = zerolog.New(mainWriter).Level(level).With().Timestamp().Logger()
 	}
 
-	log.SetOutput(customWriter{logr: logr, structlog: reqstructlog})
+	log.SetOutput(customWriter{logr: logr})
 
 	return logr
 }
 
 type customWriter struct {
-	logr      zerolog.Logger
-	structlog bool
+	logr zerolog.Logger
 }
 
 func (e customWriter) Write(p []byte) (int, error) {
@@ -75,10 +74,6 @@ func (e customWriter) Write(p []byte) (int, error) {
 	if msg == "" {
 		msg = strings.TrimSpace(string(p))
 	}
-	if e.structlog {
-		fmt.Fprintf(os.Stderr, "{\"level\":\"info\",\"time\":\"%s\",\"message\":\"%s\"}\n", time.Now().Format(time.RFC1123Z), strings.Replace(strings.TrimSpace(msg), `"`, `\"`, -1))
-	} else {
-		e.logr.Info().Msg(msg)
-	}
+	e.logr.Info().Msg(msg)
 	return len(p), nil
 }

v2/pkg/logging/loghandler_test.go

@@ -0,0 +1,59 @@
+package logging
+
+import (
+	"bytes"
+	"encoding/json"
+	"strings"
+	"testing"
+
+	"github.com/rs/zerolog"
+)
+
+// customWriter adapts log output from libraries that emit unstructured text.
+// Everything it receives must go through the logger, so that it lands wherever
+// the logger points - notably syslog only, when syslog is enabled.
+func TestCustomWriterEmitsValidJSONThroughTheLogger(t *testing.T) {
+	for _, tc := range []struct {
+		name string
+		in   string
+		want string
+	}{
+		{"plain", "something happened", "something happened"},
+		{"quotes", `bind for "cn=foo"`, `bind for "cn=foo"`},
+		{"backslashes", `path C:\Users\x`, `path C:\Users\x`},
+		{"control characters", "tab\there\nand a newline", "tab\there\nand a newline"},
+		{
+			"library timestamp prefix is stripped",
+			"2026/09/13 16:50:54 connection closed",
+			"connection closed",
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			var buf bytes.Buffer
+			w := customWriter{logr: zerolog.New(&buf).With().Timestamp().Logger()}
+
+			if _, err := w.Write([]byte(tc.in)); err != nil {
+				t.Fatalf("Write: %v", err)
+			}
+
+			// One record, one line: an unescaped newline would split this.
+			if got := strings.Count(strings.TrimRight(buf.String(), "\n"), "\n"); got != 0 {
+				t.Fatalf("expected a single log line, got %d extra newlines in %q", got, buf.String())
+			}
+
+			var record struct {
+				Level   string `json:"level"`
+				Message string `json:"message"`
+			}
+			if err := json.Unmarshal(buf.Bytes(), &record); err != nil {
+				t.Fatalf("emitted invalid JSON (%v): %s", err, buf.String())
+			}
+			if record.Message != tc.want {
+				t.Errorf("message = %q, want %q", record.Message, tc.want)
+			}
+			if record.Level != "info" {
+				t.Errorf("level = %q, want %q", record.Level, "info")
+			}
+		})
+	}
+}

v2/pkg/logging/loghandler_windows.go

@@ -4,7 +4,6 @@
 package logging
 
 import (
-	"fmt"
 	"io"
 	"log"
 	"os"
@@ -42,14 +41,13 @@ func InitLogging(reqdebug bool, reqsyslog bool, reqstructlog bool) zerolog.Logge
 
 	logr := zerolog.New(mainWriter).Level(level).With().Timestamp().Logger()
 
-	log.SetOutput(customWriter{logr: logr, structlog: reqstructlog})
+	log.SetOutput(customWriter{logr: logr})
 
 	return logr
 }
 
 type customWriter struct {
-	logr      zerolog.Logger
-	structlog bool
+	logr zerolog.Logger
 }
 
 func (e customWriter) Write(p []byte) (int, error) {
@@ -61,10 +59,6 @@ func (e customWriter) Write(p []byte) (int, error) {
 	if msg == "" {
 		msg = strings.TrimSpace(string(p))
 	}
-	if e.structlog {
-		fmt.Fprintf(os.Stderr, "{\"level\":\"info\",\"time\":\"%s\",\"message\":\"%s\"}\n", time.Now().Format(time.RFC1123Z), strings.Replace(strings.TrimSpace(msg), `"`, `\"`, -1))
-	} else {
-		e.logr.Info().Msg(msg)
-	}
+	e.logr.Info().Msg(msg)
 	return len(p), nil
 }