fix: harden thothctl Windows safe I/O

This commit is contained in:
2026-08-04 17:55:36 +02:00
parent f5468f0d36
commit c90299f24d
9 changed files with 175 additions and 32 deletions
+4 -14
View File
@@ -3,14 +3,14 @@ package main
import (
"bytes"
"context"
"errors"
"fmt"
"os"
"path/filepath"
"runtime"
"strconv"
"strings"
"testing"
"github.com/aritmolab/thothii/tools/thothctl/internal/testsupport"
)
func TestRunLogsRedactsAnUnlabelledDeclaredSecret(t *testing.T) {
@@ -155,7 +155,7 @@ func TestRunFailsClosedForTraversalAndParentSymlinkSecretSources(t *testing.T) {
t.Fatal(err)
}
linkDirectory := filepath.Join(fixture.root, "linked")
symlinkOrSkip(t, realDirectory, linkDirectory)
testsupport.SymlinkOrSkip(t, realDirectory, linkDirectory)
return filepath.Join(linkDirectory, "secret")
},
"final symlink": func(t *testing.T, fixture cliFixture) string {
@@ -164,7 +164,7 @@ func TestRunFailsClosedForTraversalAndParentSymlinkSecretSources(t *testing.T) {
t.Fatal(err)
}
linkSecret := filepath.Join(fixture.root, "linked-secret")
symlinkOrSkip(t, realSecret, linkSecret)
testsupport.SymlinkOrSkip(t, realSecret, linkSecret)
return linkSecret
},
} {
@@ -458,13 +458,3 @@ func assertDockerNotInvoked(t *testing.T, fixture cliFixture) {
t.Errorf("Docker was invoked: stat error = %v", err)
}
}
func symlinkOrSkip(t *testing.T, target, link string) {
t.Helper()
if err := os.Symlink(target, link); err != nil {
if runtime.GOOS == "windows" && errors.Is(err, os.ErrPermission) {
t.Skip("Windows symlink privilege is unavailable")
}
t.Fatal(err)
}
}