mirrors/stfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Decompose key readers

Browse Source
This commit is contained in:
Felicitas Pojtinger
2021-12-02 23:23:14 +01:00
parent 4aeef7f1f3
commit 52c39596c3
8 changed files with 32 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/stbak/cmd/archive.go
View File

@@ -96,14 +96,9 @@ var archiveCmd = &cobra.Command{
lastIndexedBlock = b
}
pubkey := []byte{}
if viper.GetString(encryptionFlag) != encryptionFormatNoneKey {
p, err := ioutil.ReadFile(viper.GetString(recipientFlag))
if err != nil {
return err
}
pubkey = p
pubkey, err := readKey(viper.GetString(encryptionFlag), viper.GetString(recipientFlag))
if err != nil {
return err
}
hdrs, err := archive(
@@ -398,6 +393,14 @@ func checkKeyAccessible(encryptionFormat string, pathToKey string) error {
return nil
}
func readKey(encryptionFormat string, pathToKey string) ([]byte, error) {
if encryptionFormat == encryptionFormatNoneKey {
return []byte{}, nil
}
return ioutil.ReadFile(pathToKey)
}
func checkCompressionLevel(compressionLevel string) error {
compressionLevelIsKnown := false

12
cmd/stbak/cmd/delete.go
View File

@@ -4,7 +4,6 @@ import (
"archive/tar"
"bufio"
"context"
"io/ioutil"
"os"
"github.com/pojntfx/stfs/pkg/controllers"
@@ -43,14 +42,9 @@ var deleteCmd = &cobra.Command{
boil.DebugMode = true
}
pubkey := []byte{}
if viper.GetString(encryptionFlag) != encryptionFormatNoneKey {
p, err := ioutil.ReadFile(viper.GetString(recipientFlag))
if err != nil {
return err
}
pubkey = p
pubkey, err := readKey(viper.GetString(encryptionFlag), viper.GetString(recipientFlag))
if err != nil {
return err
}
return delete(

12
cmd/stbak/cmd/move.go
View File

@@ -3,7 +3,6 @@ package cmd
import (
"archive/tar"
"context"
"io/ioutil"
"strings"
"github.com/pojntfx/stfs/pkg/converters"
@@ -36,14 +35,9 @@ var moveCmd = &cobra.Command{
boil.DebugMode = true
}
pubkey := []byte{}
if viper.GetString(encryptionFlag) != encryptionFormatNoneKey {
p, err := ioutil.ReadFile(viper.GetString(recipientFlag))
if err != nil {
return err
}
pubkey = p
pubkey, err := readKey(viper.GetString(encryptionFlag), viper.GetString(recipientFlag))
if err != nil {
return err
}
return move(

18
cmd/stbak/cmd/recovery_fetch.go
View File

@@ -8,7 +8,6 @@ import (
"context"
"encoding/base32"
"io"
"io/ioutil"
"os"
"path/filepath"
@@ -41,12 +40,6 @@ var recoveryFetchCmd = &cobra.Command{
return err
}
if viper.GetString(encryptionFlag) != encryptionFormatNoneKey {
if _, err := os.Stat(viper.GetString(identityFlag)); err != nil {
return errIdentityNotAccessible
}
}
return checkKeyAccessible(viper.GetString(encryptionFlag), viper.GetString(identityFlag))
},
RunE: func(cmd *cobra.Command, args []string) error {
@@ -58,14 +51,9 @@ var recoveryFetchCmd = &cobra.Command{
boil.DebugMode = true
}
privkey := []byte{}
if viper.GetString(encryptionFlag) != encryptionFormatNoneKey {
p, err := ioutil.ReadFile(viper.GetString(identityFlag))
if err != nil {
return err
}
privkey = p
privkey, err := readKey(viper.GetString(encryptionFlag), viper.GetString(identityFlag))
if err != nil {
return err
}
return restoreFromRecordAndBlock(

11
cmd/stbak/cmd/recovery_index.go
View File

@@ -42,14 +42,9 @@ var recoveryIndexCmd = &cobra.Command{
boil.DebugMode = true
}
privkey := []byte{}
if viper.GetString(encryptionFlag) != encryptionFormatNoneKey {
p, err := ioutil.ReadFile(viper.GetString(identityFlag))
if err != nil {
return err
}
privkey = p
privkey, err := readKey(viper.GetString(encryptionFlag), viper.GetString(identityFlag))
if err != nil {
return err
}
return index(

11
cmd/stbak/cmd/recovery_query.go
View File

@@ -34,14 +34,9 @@ var recoveryQueryCmd = &cobra.Command{
boil.DebugMode = true
}
privkey := []byte{}
if viper.GetString(encryptionFlag) != encryptionFormatNoneKey {
p, err := ioutil.ReadFile(viper.GetString(identityFlag))
if err != nil {
return err
}
privkey = p
privkey, err := readKey(viper.GetString(encryptionFlag), viper.GetString(identityFlag))
if err != nil {
return err
}
return query(

12
cmd/stbak/cmd/restore.go
View File

@@ -4,7 +4,6 @@ import (
"archive/tar"
"context"
"database/sql"
"io/ioutil"
"path"
"path/filepath"
"strings"
@@ -47,14 +46,9 @@ var restoreCmd = &cobra.Command{
return err
}
privkey := []byte{}
if viper.GetString(encryptionFlag) != encryptionFormatNoneKey {
p, err := ioutil.ReadFile(viper.GetString(identityFlag))
if err != nil {
return err
}
privkey = p
privkey, err := readKey(viper.GetString(encryptionFlag), viper.GetString(identityFlag))
if err != nil {
return err
}
headersToRestore := []*models.Header{}

12
cmd/stbak/cmd/update.go
View File

@@ -6,7 +6,6 @@ import (
"fmt"
"io"
"io/fs"
"io/ioutil"
"os"
"path/filepath"
"strconv"
@@ -56,14 +55,9 @@ var updateCmd = &cobra.Command{
return err
}
pubkey := []byte{}
if viper.GetString(encryptionFlag) != encryptionFormatNoneKey {
p, err := ioutil.ReadFile(viper.GetString(recipientFlag))
if err != nil {
return err
}
pubkey = p
pubkey, err := readKey(viper.GetString(encryptionFlag), viper.GetString(recipientFlag))
if err != nil {
return err
}
hdrs, err := update(