limit windows testing to R/W permissions for owner

modules/logging/filewriter_test.go

@@ -12,12 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !windows
+
 package logging
 
 import (
 	"encoding/json"
 	"os"
 	"path"
+	"syscall"
 	"testing"
 
 	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
@@ -64,8 +67,8 @@ func TestFileCreationMode(t *testing.T) {
 		},
 	}
 
-	m := umask(0o000)
-	defer umask(m)
+	m := syscall.Umask(0o000)
+	defer syscall.Umask(m)
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -96,8 +99,8 @@ func TestFileCreationMode(t *testing.T) {
 }
 
 func TestFileRotationPreserveMode(t *testing.T) {
-	m := umask(0o000)
-	defer umask(m)
+	m := syscall.Umask(0o000)
+	defer syscall.Umask(m)
 
 	dir, err := os.MkdirTemp("", "caddytest")
 	if err != nil {
@@ -132,6 +135,7 @@ func TestFileRotationPreserveMode(t *testing.T) {
 	}
 
 	if len(files) != 2 {
+		t.Log("got files: ", files)
 		t.Fatalf("got %v files want 2", len(files))
 	}
 

modules/logging/filewriter_test_windows.go

@@ -1,6 +1,55 @@
+// Copyright 2015 Matthew Holt and The Caddy Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
 package logging
 
-//nolint:unused
-func umask(_ int) (oldmask int) {
-	return 0000
+import (
+	"os"
+	"path"
+	"testing"
+)
+
+// Windows relies on ACLs instead of unix permissions model.
+// Go allows to open files with a particular mode put it is limited to read or write.
+// See https://cs.opensource.google/go/go/+/refs/tags/go1.22.3:src/syscall/syscall_windows.go;l=708.
+// This is pretty restrictive and has few interest for log files and thus we just test that log files are
+// opened with R/W permissions by default on Windows too.
+func TestFileCreationMode(t *testing.T) {
+	dir, err := os.MkdirTemp("", "caddytest")
+	if err != nil {
+		t.Fatalf("failed to create tempdir: %v", err)
+	}
+	defer os.RemoveAll(dir)
+
+	fw := &FileWriter{
+		Filename: path.Join(dir, "test.log"),
+	}
+
+	logger, err := fw.OpenWriter()
+	if err != nil {
+		t.Fatalf("failed to create file: %v", err)
+	}
+	defer logger.Close()
+
+	st, err := os.Stat(fw.Filename)
+	if err != nil {
+		t.Fatalf("failed to check file permissions: %v", err)
+	}
+
+	if st.Mode().Perm()&0o600 != 0o600 {
+		t.Errorf("file mode is %v, want rw for user", st.Mode().Perm())
+	}
 }