Compare commits
2 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
| c62a4dd5e9 | |||
|
|
34438cb5b9 |
@@ -224,7 +224,12 @@ func (c *Checker) checkFile(entry *MFFilePath, checkedBytes *FileSize) Result {
|
|||||||
// Check if file exists
|
// Check if file exists
|
||||||
info, err := c.fs.Stat(absPath)
|
info, err := c.fs.Stat(absPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.Is(err, os.ErrNotExist) || errors.Is(err, afero.ErrFileNotFound) {
|
if errors.Is(err, afero.ErrFileNotFound) || errors.Is(err, errors.New("file does not exist")) {
|
||||||
|
return Result{Path: relPath, Status: StatusMissing, Message: "file not found"}
|
||||||
|
}
|
||||||
|
// Check for "file does not exist" style errors
|
||||||
|
exists, _ := afero.Exists(c.fs, absPath)
|
||||||
|
if !exists {
|
||||||
return Result{Path: relPath, Status: StatusMissing, Message: "file not found"}
|
return Result{Path: relPath, Status: StatusMissing, Message: "file not found"}
|
||||||
}
|
}
|
||||||
return Result{Path: relPath, Status: StatusError, Message: err.Error()}
|
return Result{Path: relPath, Status: StatusError, Message: err.Error()}
|
||||||
|
|||||||
@@ -381,39 +381,6 @@ func TestCheckSubdirectories(t *testing.T) {
|
|||||||
assert.Equal(t, 3, okCount)
|
assert.Equal(t, 3, okCount)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCheckMissingFileDetectedWithoutFallback(t *testing.T) {
|
|
||||||
// Regression test: errors.Is(err, errors.New("...")) never matches because
|
|
||||||
// errors.New creates a new value each time. The fix uses os.ErrNotExist instead.
|
|
||||||
fs := afero.NewMemMapFs()
|
|
||||||
files := map[string][]byte{
|
|
||||||
"exists.txt": []byte("here"),
|
|
||||||
"missing.txt": []byte("not on disk"),
|
|
||||||
}
|
|
||||||
createTestManifest(t, fs, "/manifest.mf", files)
|
|
||||||
// Only create one file on disk
|
|
||||||
createFilesOnDisk(t, fs, "/data", map[string][]byte{
|
|
||||||
"exists.txt": []byte("here"),
|
|
||||||
})
|
|
||||||
|
|
||||||
chk, err := NewChecker("/manifest.mf", "/data", fs)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
results := make(chan Result, 10)
|
|
||||||
err = chk.Check(context.Background(), results, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
statusCounts := map[Status]int{}
|
|
||||||
for r := range results {
|
|
||||||
statusCounts[r.Status]++
|
|
||||||
if r.Status == StatusMissing {
|
|
||||||
assert.Equal(t, RelFilePath("missing.txt"), r.Path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
assert.Equal(t, 1, statusCounts[StatusOK], "one file should be OK")
|
|
||||||
assert.Equal(t, 1, statusCounts[StatusMissing], "one file should be MISSING")
|
|
||||||
assert.Equal(t, 0, statusCounts[StatusError], "no files should be ERROR")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestCheckEmptyManifest(t *testing.T) {
|
func TestCheckEmptyManifest(t *testing.T) {
|
||||||
fs := afero.NewMemMapFs()
|
fs := afero.NewMemMapFs()
|
||||||
// Create manifest with no files
|
// Create manifest with no files
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ func gpgExtractPubKeyFingerprint(pubKey []byte) (string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("failed to create temp dir: %w", err)
|
return "", fmt.Errorf("failed to create temp dir: %w", err)
|
||||||
}
|
}
|
||||||
defer func() { _ = os.RemoveAll(tmpDir) }()
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
// Set restrictive permissions
|
// Set restrictive permissions
|
||||||
if err := os.Chmod(tmpDir, 0o700); err != nil {
|
if err := os.Chmod(tmpDir, 0o700); err != nil {
|
||||||
@@ -158,7 +158,7 @@ func gpgVerify(data, signature, pubKey []byte) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to create temp dir: %w", err)
|
return fmt.Errorf("failed to create temp dir: %w", err)
|
||||||
}
|
}
|
||||||
defer func() { _ = os.RemoveAll(tmpDir) }()
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
// Set restrictive permissions
|
// Set restrictive permissions
|
||||||
if err := os.Chmod(tmpDir, 0o700); err != nil {
|
if err := os.Chmod(tmpDir, 0o700); err != nil {
|
||||||
|
|||||||
@@ -34,15 +34,15 @@ func testGPGEnv(t *testing.T) (GPGKeyID, func()) {
|
|||||||
|
|
||||||
// Save original GNUPGHOME and set new one
|
// Save original GNUPGHOME and set new one
|
||||||
origGPGHome := os.Getenv("GNUPGHOME")
|
origGPGHome := os.Getenv("GNUPGHOME")
|
||||||
require.NoError(t, os.Setenv("GNUPGHOME", gpgHome))
|
os.Setenv("GNUPGHOME", gpgHome)
|
||||||
|
|
||||||
cleanup := func() {
|
cleanup := func() {
|
||||||
if origGPGHome == "" {
|
if origGPGHome == "" {
|
||||||
_ = os.Unsetenv("GNUPGHOME")
|
os.Unsetenv("GNUPGHOME")
|
||||||
} else {
|
} else {
|
||||||
_ = os.Setenv("GNUPGHOME", origGPGHome)
|
os.Setenv("GNUPGHOME", origGPGHome)
|
||||||
}
|
}
|
||||||
_ = os.RemoveAll(gpgHome)
|
os.RemoveAll(gpgHome)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate a test key with no passphrase
|
// Generate a test key with no passphrase
|
||||||
|
|||||||
@@ -385,9 +385,6 @@ func (s *Scanner) ToManifest(ctx context.Context, w io.Writer, progress chan<- S
|
|||||||
// The path should use forward slashes.
|
// The path should use forward slashes.
|
||||||
func IsHiddenPath(p string) bool {
|
func IsHiddenPath(p string) bool {
|
||||||
tp := path.Clean(p)
|
tp := path.Clean(p)
|
||||||
if tp == "." || tp == "/" {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if strings.HasPrefix(tp, ".") {
|
if strings.HasPrefix(tp, ".") {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -352,8 +352,6 @@ func TestIsHiddenPath(t *testing.T) {
|
|||||||
{"/absolute/.hidden", true},
|
{"/absolute/.hidden", true},
|
||||||
{"./relative", false}, // path.Clean removes leading ./
|
{"./relative", false}, // path.Clean removes leading ./
|
||||||
{"a/b/c/.d/e", true},
|
{"a/b/c/.d/e", true},
|
||||||
{".", false}, // current directory is not hidden
|
|
||||||
{"/", false}, // root is not hidden
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
|
|||||||
Reference in New Issue
Block a user