aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorebiggers <ebiggers@google.com>2019-09-09 14:10:11 -0700
committerJoseph Richey <joerichey@google.com>2019-09-09 14:10:11 -0700
commitd3a1991d4665578e5f315d4aab00b4e29c01df07 (patch)
treeae57363d0f2881f2c886bf7630b77723e905ed96
parent237308a671bd2bbea2059bea9e75cb1272edbdbf (diff)
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
-rw-r--r--actions/policy.go5
-rw-r--r--cmd/fscrypt/status.go1
2 files changed, 6 insertions, 0 deletions
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)