Also prevent overwriting backup key

spacemeshos · Mar 15, 2024 · e57bcfa · e57bcfa
1 parent 4a44bba
commit e57bcfa
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/node/node_identities.go b/node/node_identities.go
@@ -79,6 +79,17 @@ func (app *App) MigrateExistingIdentity() error {
 		return fmt.Errorf("stat %s: %w", newKey, err)
 	}
 
+	_, err = os.Stat(oldKey + ".bak")
+	switch {
+	case errors.Is(err, fs.ErrNotExist):
+		// no backup, migrate old to new
+	case err == nil:
+		// backup already exists - something is wrong
+		return fmt.Errorf("%w: backup %s already exists", fs.ErrExist, oldKey+".bak")
+	case err != nil:
+		return fmt.Errorf("stat %s: %w", oldKey+".bak", err)
+	}
+
 	dst, err := os.Create(newKey)
 	if err != nil {
 		return fmt.Errorf("failed to create new identity file: %w", err)

diff --git a/node/node_identities_test.go b/node/node_identities_test.go
@@ -265,7 +265,7 @@ func Test_MigrateExistingIdentity(t *testing.T) {
 
 		err = app.MigrateExistingIdentity()
 		require.ErrorIs(t, err, fs.ErrExist)
-		require.ErrorContains(t, err, "file already exists")
+		require.ErrorContains(t, err, fmt.Sprintf("both %s and %s exist", newKey, oldKey))
 		require.FileExists(t, newKey)
 		require.FileExists(t, oldKey)
 
@@ -277,4 +277,38 @@ func Test_MigrateExistingIdentity(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, []byte(sigOld.PrivateKey()), oldKeyBin)
 	})
+
+	t.Run("migrate with an already existing backup", func(t *testing.T) {
+		app := New(WithLog(logtest.New(t)))
+		app.Config.DataDirParent = t.TempDir()
+		app.Config.SMESHING.Opts.DataDir = t.TempDir()
+
+		sigOld, err := signing.NewEdSigner()
+		require.NoError(t, err)
+
+		oldKey := filepath.Join(app.Config.SMESHING.Opts.DataDir, legacyKeyFileName)
+		err = os.WriteFile(oldKey, sigOld.PrivateKey(), 0o600)
+		require.NoError(t, err)
+
+		sigBackup, err := signing.NewEdSigner()
+		require.NoError(t, err)
+
+		backupKey := filepath.Join(app.Config.SMESHING.Opts.DataDir, legacyKeyFileName+".bak")
+		err = os.WriteFile(backupKey, sigBackup.PrivateKey(), 0o600)
+		require.NoError(t, err)
+
+		err = app.MigrateExistingIdentity()
+		require.ErrorIs(t, err, fs.ErrExist)
+		require.ErrorContains(t, err, fmt.Sprintf("backup %s already exists", backupKey))
+		require.FileExists(t, filepath.Join(app.Config.SMESHING.Opts.DataDir, legacyKeyFileName))
+		require.FileExists(t, filepath.Join(app.Config.SMESHING.Opts.DataDir, legacyKeyFileName+".bak"))
+
+		oldKeyBin, err := os.ReadFile(oldKey)
+		require.NoError(t, err)
+		require.Equal(t, []byte(sigOld.PrivateKey()), oldKeyBin)
+
+		backupKeyBin, err := os.ReadFile(backupKey)
+		require.NoError(t, err)
+		require.Equal(t, []byte(sigBackup.PrivateKey()), backupKeyBin)
+	})
 }