Skip to content

cryptcheck: agnostify src dst order #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Levi-Hope wants to merge 3 commits into
base: master
Choose a base branch
from
Open

cryptcheck: agnostify src dst order #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
554c506
cryptcheck: agnostify src dst order
Levi-Hope Jul 22, 2021
5a39612
cryptcheck: add more log
Levi-Hope Jul 22, 2021
991c315
cryptcheck:increase log level
Levi-Hope Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions cmd/cryptcheck/cryptcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,17 @@ After it has run it will log the status of the encryptedremote:.

// cryptCheck checks the integrity of a crypted remote
func cryptCheck(ctx context.Context, fdst, fsrc fs.Fs) error {
// Check to see fcrypt is a crypt
// Check to see fdst is crypted. If not, check fsrc.
fcrypt, ok := fdst.(*crypt.Fs)
if !ok {
return errors.Errorf("%s:%s is not a crypt remote", fdst.Name(), fdst.Root())
fcrypt, ok = fsrc.(*crypt.Fs)
if !ok {
return errors.Errorf("Both %s:%s and %s:%s are not crypt remote", fdst.Name(), fdst.Root(), fsrc.Name(), fsrc.Root())
}
fs.Logf(nil, "%s:%s is not a crypt remote, using %s:%s as dst", fdst.Name(), fdst.Root(), fsrc.Name(), fsrc.Root())
fdst, fsrc = fsrc, fdst
}

// Find a hash to use
funderlying := fcrypt.UnWrap()
hashType := funderlying.Hashes().GetOne()
Expand Down