From d3a1991d4665578e5f315d4aab00b4e29c01df07 Mon Sep 17 00:00:00 2001 From: ebiggers Date: Mon, 9 Sep 2019 14:10:11 -0700 Subject: cmd/fscrypt: show encryption options with 'fscrypt status DIR' (#145) Show the encryption options when running 'fscrypt status' on a directory. E.g.: Policy: 490515286453d3f7 Options: padding:32 contents:Adiantum filenames:Adiantum Unlocked: Yes --- actions/policy.go | 5 +++++ cmd/fscrypt/status.go | 1 + 2 files changed, 6 insertions(+) diff --git a/actions/policy.go b/actions/policy.go index ef5f0a3..875a01f 100644 --- a/actions/policy.go +++ b/actions/policy.go @@ -194,6 +194,11 @@ func (policy *Policy) Description() string { return policy.Context.getService() + policy.Descriptor() } +// Options returns the encryption options of this policy. +func (policy *Policy) Options() *metadata.EncryptionOptions { + return policy.data.Options +} + // Destroy removes a policy from the filesystem. The internal key should still // be wiped with Lock(). func (policy *Policy) Destroy() error { diff --git a/cmd/fscrypt/status.go b/cmd/fscrypt/status.go index f911193..9959b54 100644 --- a/cmd/fscrypt/status.go +++ b/cmd/fscrypt/status.go @@ -178,6 +178,7 @@ func writePathStatus(w io.Writer, path string) error { fmt.Fprintf(w, "%q is encrypted with fscrypt.\n", path) fmt.Fprintln(w) fmt.Fprintf(w, "Policy: %s\n", policy.Descriptor()) + fmt.Fprintf(w, "Options: %s\n", policy.Options()) fmt.Fprintf(w, "Unlocked: %s\n", yesNoString(policy.IsProvisioned())) fmt.Fprintln(w) -- cgit v1.2.3