aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorebiggers <ebiggers@google.com>2020-01-22 19:16:20 -0800
committerGitHub <noreply@github.com>2020-01-22 19:16:20 -0800
commit303616dc52e2b1e71883417a291f07c59025215d (patch)
tree7cbace927ccef0392706fff52d1a56cb906f52ee /actions
parent059482129c5fdafebc582887a4ae4ef80988b708 (diff)
parent8cd1b3ba2e7a12cd68e2dfd0cbb5ec09ff92783b (diff)
Merge pull request #167 from ebiggers/recovery-passphrase
Automatically generate recovery passphrase when useful
Diffstat (limited to 'actions')
-rw-r--r--actions/recovery.go100
-rw-r--r--actions/recovery_test.go90
2 files changed, 190 insertions, 0 deletions
diff --git a/actions/recovery.go b/actions/recovery.go
new file mode 100644
index 0000000..b086705
--- /dev/null
+++ b/actions/recovery.go
@@ -0,0 +1,100 @@
+/*
+ * recovery.go - support for generating recovery passphrases
+ *
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package actions
+
+import (
+ "fmt"
+ "os"
+ "strconv"
+
+ "github.com/pkg/errors"
+
+ "github.com/google/fscrypt/crypto"
+)
+
+// AddRecoveryPassphrase randomly generates a recovery passphrase and adds it as
+// a custom_passphrase protector for the given Policy.
+func AddRecoveryPassphrase(policy *Policy, dirname string) (*crypto.Key, *Protector, error) {
+ // 20 random characters in a-z is 94 bits of entropy, which is way more
+ // than enough for a passphrase which still goes through the usual
+ // passphrase hashing which makes it extremely costly to brute force.
+ passphrase, err := crypto.NewRandomPassphrase(20)
+ if err != nil {
+ return nil, nil, err
+ }
+ defer func() {
+ if err != nil {
+ passphrase.Wipe()
+ }
+ }()
+ getPassphraseFn := func(info ProtectorInfo, retry bool) (*crypto.Key, error) {
+ // CreateProtector() wipes the passphrase, but in this case we
+ // still need it for later, so make a copy.
+ return passphrase.Clone()
+ }
+ var recoveryProtector *Protector
+ seq := 1
+ for {
+ // Automatically generate a name for the recovery protector.
+ name := "Recovery passphrase for " + dirname
+ if seq != 1 {
+ name += " (" + strconv.Itoa(seq) + ")"
+ }
+ recoveryProtector, err = CreateProtector(policy.Context, name, getPassphraseFn)
+ if err == nil {
+ break
+ }
+ if errors.Cause(err) != ErrDuplicateName {
+ return nil, nil, err
+ }
+ seq++
+ }
+ if err := policy.AddProtector(recoveryProtector); err != nil {
+ return nil, nil, err
+ }
+ return passphrase, recoveryProtector, nil
+}
+
+// WriteRecoveryInstructions writes a recovery passphrase and instructions to a
+// file. This file should initially be located in the encrypted directory
+// protected by the passphrase itself. It's up to the user to store the
+// passphrase in a different location if they actually need it.
+func WriteRecoveryInstructions(recoveryPassphrase *crypto.Key, path string) error {
+ file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0600)
+ if err != nil {
+ return err
+ }
+ defer file.Close()
+ str := fmt.Sprintf(
+ `fscrypt automatically generated a recovery passphrase for this directory:
+
+ %s
+
+It did this because you chose to protect this directory with your login
+passphrase, but this directory is not on the root filesystem.
+
+Copy this passphrase to a safe place if you want to still be able to unlock this
+directory if you re-install your system or connect this storage media to a
+different system (which would result in your login protector being lost).
+`, recoveryPassphrase.Data())
+ if _, err = file.WriteString(str); err != nil {
+ return err
+ }
+ return file.Sync()
+}
diff --git a/actions/recovery_test.go b/actions/recovery_test.go
new file mode 100644
index 0000000..4332972
--- /dev/null
+++ b/actions/recovery_test.go
@@ -0,0 +1,90 @@
+/*
+ * recovery_test.go - tests for recovery passphrases
+ *
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package actions
+
+import (
+ "io/ioutil"
+ "os"
+ "path/filepath"
+ "strings"
+ "testing"
+
+ "github.com/google/fscrypt/crypto"
+)
+
+func TestRecoveryPassphrase(t *testing.T) {
+ tempDir, err := ioutil.TempDir("", "fscrypt")
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer os.RemoveAll(tempDir)
+ recoveryFile := filepath.Join(tempDir, "recovery.txt")
+
+ firstProtector, policy, err := makeBoth()
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer cleanupPolicy(policy)
+ defer cleanupProtector(firstProtector)
+
+ // Add a recovery passphrase and verify that it worked correctly.
+ passphrase, recoveryProtector, err := AddRecoveryPassphrase(policy, "foo")
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer cleanupProtector(recoveryProtector)
+ if passphrase.Len() != 20 {
+ t.Error("Recovery passphrase has wrong length")
+ }
+ if recoveryProtector.data.Name != "Recovery passphrase for foo" {
+ t.Error("Recovery passphrase protector has wrong name")
+ }
+ if len(policy.ProtectorDescriptors()) != 2 {
+ t.Error("There should be 2 protectors now")
+ }
+ getPassphraseFn := func(info ProtectorInfo, retry bool) (*crypto.Key, error) {
+ return passphrase.Clone()
+ }
+ recoveryProtector.Lock()
+ if err = recoveryProtector.Unlock(getPassphraseFn); err != nil {
+ t.Fatal(err)
+ }
+
+ // Test writing the recovery instructions.
+ if err = WriteRecoveryInstructions(passphrase, recoveryFile); err != nil {
+ t.Fatal(err)
+ }
+ contentsBytes, err := ioutil.ReadFile(recoveryFile)
+ if err != nil {
+ t.Fatal(err)
+ }
+ contents := string(contentsBytes)
+ if !strings.Contains(contents, string(passphrase.Data())) {
+ t.Error("Recovery instructions don't actually contain the passphrase!")
+ }
+
+ // Test for protector naming collision.
+ if passphrase, recoveryProtector, err = AddRecoveryPassphrase(policy, "foo"); err != nil {
+ t.Fatal(err)
+ }
+ defer cleanupProtector(recoveryProtector)
+ if recoveryProtector.data.Name != "Recovery passphrase for foo (2)" {
+ t.Error("Recovery passphrase protector has wrong name (after naming collision)")
+ }
+}