From 02fc5c1ffa78a4a9cad86f58739634270d6bf3f8 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Sun, 25 Jan 2026 16:27:33 -0500 Subject: [PATCH] Bump rcw to add error handling for corrupt entries --- core/util.go | 6 ++---- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/util.go b/core/util.go index 145a15c..e3832ae 100644 --- a/core/util.go +++ b/core/util.go @@ -2,7 +2,6 @@ package core import ( "errors" - "fmt" "os" "strings" "time" @@ -74,7 +73,6 @@ func EntryRefresh(oldRCWPassword, newRCWPassword []byte, removeOldDir bool) erro // decrypt, optimize, and re-encrypt each entry for _, vanityPath := range entries { - fmt.Println(vanityPath) // TODO handle error in rcw (slice length?) so it can be captured and returned for use by non-CLI clients to track corrupt entries realPath := global.GetRealPath(vanityPath) encBytes, err := os.ReadFile(realPath) if err != nil { @@ -128,10 +126,10 @@ func VerifyEntries(rcwPassword []byte) error { } decBytes, err := wrappers.Decrypt(encBytes, rcwPassword) if err != nil { - return errors.New("unable verify \"" + vanityPath + "\" (decryption failure): " + err.Error()) + return errors.New("unable to verify \"" + vanityPath + "\" (decryption failure): " + err.Error()) } if len(decBytes) < 1 { - return errors.New("unable verify \"" + vanityPath + "\" (contains 0/nil bytes)") + return errors.New("unable to verify \"" + vanityPath + "\" (contains 0/nil bytes)") } } return nil diff --git a/go.mod b/go.mod index 6f6d29e..2979503 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/pkg/sftp v1.13.10 github.com/pquerna/otp v1.5.0 github.com/rwinkhart/go-boilerplate v0.2.2 - github.com/rwinkhart/rcw v0.2.4 + github.com/rwinkhart/rcw v0.2.5 golang.org/x/crypto v0.47.0 golang.org/x/sys v0.40.0 ) diff --git a/go.sum b/go.sum index cfdabe5..f570ac0 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,8 @@ github.com/rwinkhart/go-winio v0.1.0 h1:b72agLW+dETGmhR3VbcbwnStfgKfc5AfgJOXBJDk github.com/rwinkhart/go-winio v0.1.0/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0= github.com/rwinkhart/peercred-mini v0.1.2 h1:4cGWDbv0whvLeVvbUdx84V/9p+2fS+DEXgrA1KxlRFo= github.com/rwinkhart/peercred-mini v0.1.2/go.mod h1:LLHG7YshHEpbpJJP+Il9nx2dnGj5O3VGE32rWmflj0c= -github.com/rwinkhart/rcw v0.2.4 h1:FrRSsl+ui1WLmDwqjLSROtFPKqSeGLEfF2SPENt4qP0= -github.com/rwinkhart/rcw v0.2.4/go.mod h1:nhW4RAHvEjW2QcOlqEdWqRQOFJLjoOGSPkSRZlMjU3s= +github.com/rwinkhart/rcw v0.2.5 h1:3GJeii9sDZsZNL+HRkfHrnbgxnaB8a9kejiMIfPXnpE= +github.com/rwinkhart/rcw v0.2.5/go.mod h1:qVw8Yp/SKtsuVZYOzzluVEVkoRJ1G7UEh2aR1CXso/U= github.com/rwinkhart/sys v0.40.0 h1:ZPBbXb+27vLL518sZhhNV89jXK1KbCnFGmYJ2juOQ/c= github.com/rwinkhart/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=