[v14] removeSecure() should close the file before removing it on Wi…

…ndows (#32963) * `removeSecure()` should close the file before removing it on Windows * Do not return early if `Close()` returns an error
gravitational · Oct 4, 2023 · e781889 · e781889
1 parent c7ba53c
commit e781889
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/utils/fs.go b/lib/utils/fs.go
@@ -323,7 +323,10 @@ func removeSecure(filePath string, fi os.FileInfo) error {
 				}
 			}
 		}
-		return trace.ConvertSystemError(os.Remove(filePath))
+		// The file should be closed before removing it on Windows.
+		closeErr := trace.ConvertSystemError(f.Close())
+		removeErr := trace.ConvertSystemError(os.Remove(filePath))
+		return trace.NewAggregate(closeErr, removeErr)
 	} else {
 		removeErr := os.Remove(filePath)
 		if f != nil {