Extend acra-keys export/import subcommand

CHANGELOG_DEV.md

@@ -1,3 +1,6 @@
+# 0.94.0 - 2023-01-31
+- Extend `acra-keys` `export` and `import` subcommand by V1 keystore support;
+
 # 0.94.0 - 2023-01-24
 - Remove testing on the old versions of golang, leave only last fresh version
 

cmd/acra-backup/acra-backup.go

@@ -20,7 +20,6 @@ import (
 	"encoding/base64"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/cossacklabs/acra/cmd"
@@ -107,25 +106,25 @@ func main() {
 			os.Exit(1)
 		}
 
-		keysContent, err := ioutil.ReadFile(*file)
+		keysContent, err := os.ReadFile(*file)
 		if err != nil {
 			log.WithError(err).Errorln("Can't read file with exported keys")
 			os.Exit(1)
 		}
-		backup := keystore.KeysBackup{MasterKey: key, Keys: keysContent}
-		if err := backuper.Import(&backup); err != nil {
+		backup := keystore.KeysBackup{Keys: key, Data: keysContent}
+		if _, err := backuper.Import(&backup); err != nil {
 			log.WithError(err).Errorln("Can't import keys")
 			os.Exit(1)
 		}
 	case actionExport:
-		backup, err := backuper.Export()
+		backup, err := backuper.Export(nil, keystore.ExportAllKeys)
 		if err != nil {
 			log.WithError(err).Errorln("Can't generate backup")
 			os.Exit(1)
 		}
-		base64MasterKey := base64.StdEncoding.EncodeToString(backup.MasterKey)
-		utils.ZeroizeSymmetricKey(backup.MasterKey)
-		if err := ioutil.WriteFile(*file, backup.Keys, filesystem.PrivateFileMode); err != nil {
+		base64MasterKey := base64.StdEncoding.EncodeToString(backup.Keys)
+		utils.ZeroizeSymmetricKey(backup.Keys)
+		if err := os.WriteFile(*file, backup.Keys, filesystem.PrivateFileMode); err != nil {
 			log.WithError(err).Errorf("Can't write backup to file %s", *file)
 			os.Exit(1)
 		}

cmd/acra-keys/keys/acra-keys.go

@@ -22,10 +22,10 @@ import (
 	"io"
 	"os"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/cossacklabs/acra/keystore"
-	"github.com/cossacklabs/acra/keystore/v2/keystore/api"
 	"github.com/cossacklabs/acra/utils"
-	log "github.com/sirupsen/logrus"
 )
 
 func warnKeystoreV2Only(command string) {
@@ -51,55 +51,6 @@ func ListKeysCommand(params ListKeysParams, keyStore keystore.ServerKeyStore) {
 	}
 }
 
-// ExportKeysCommand implements the "export" command.
-func ExportKeysCommand(params ExportKeysParams, keyStore api.KeyStore) {
-	encryptionKeyData, cryptosuite, err := PrepareExportEncryptionKeys()
-	if err != nil {
-		log.WithError(err).Fatal("Failed to prepare encryption keys")
-	}
-	defer utils.ZeroizeSymmetricKey(encryptionKeyData)
-
-	exportedData, err := ExportKeys(keyStore, cryptosuite, params)
-	if err != nil {
-		log.WithError(err).Fatal("Failed to export keys")
-	}
-
-	err = WriteExportedData(exportedData, encryptionKeyData, params)
-	if err != nil {
-		log.WithError(err).Fatal("Failed to write exported data")
-	}
-
-	log.Infof("Exported key data is encrypted and saved here: %s", params.ExportDataFile())
-	log.Infof("New encryption keys for import generated here: %s", params.ExportKeysFile())
-	log.Infof("DO NOT transport or store these files together")
-	log.Infof("Import the keys into another keystore like this:\n\tacra-keys import --key_bundle_file \"%s\" --key_bundle_secret \"%s\"", params.ExportDataFile(), params.ExportKeysFile())
-}
-
-// ImportKeysCommand implements the "import" command.
-func ImportKeysCommand(params ImportKeysParams, keyStore api.MutableKeyStore) {
-	exportedData, err := ReadExportedData(params)
-	if err != nil {
-		log.WithError(err).Fatal("Failed to read exported data")
-	}
-
-	cryptosuite, err := ReadImportEncryptionKeys(params)
-	if err != nil {
-		log.WithError(err).Fatal("Failed to prepare encryption keys")
-	}
-
-	descriptions, err := ImportKeys(exportedData, keyStore, cryptosuite, params)
-	if err != nil {
-		log.WithError(err).Fatal("Failed to import keys")
-	}
-
-	log.Infof("successfully imported %d keys", len(descriptions))
-
-	err = PrintKeys(descriptions, os.Stdout, params)
-	if err != nil {
-		log.WithError(err).Fatal("Failed to print imported key list")
-	}
-}
-
 // PrintKeyCommand implements the "read" command.
 func (p *ReadKeySubcommand) PrintKeyCommand(params ReadKeyParams, keyStore keystore.ServerKeyStore) {
 	keyBytes, err := ReadKeyBytes(params, keyStore)