linting

msladek · msladek · commit 07f31916e6d4 · 2022-01-15T15:49:08.000+01:00
diff --git a/cmd/enpasscli/main.go b/cmd/enpasscli/main.go
@@ -213,7 +213,7 @@ func assembleVaultAccessData(logger *logrus.Logger, args *Args, store *unlock.Se
 }
 
 func initializeStore(logger *logrus.Logger, args *Args) *unlock.SecureStore {
-	vaultPath, err := filepath.EvalSymlinks(*args.vaultPath)
+	vaultPath, _ := filepath.EvalSymlinks(*args.vaultPath)
 	store, err := unlock.NewSecureStore(filepath.Base(vaultPath), logger.Level)
 	if err != nil {
 		logger.WithError(err).Fatal("could not create store")
diff --git a/pkg/enpass/vault_test.go b/pkg/enpass/vault_test.go
@@ -13,10 +13,10 @@ const (
 
 func TestVault_Initialize(t *testing.T) {
 	vault, err := NewVault(vaultPath, logrus.ErrorLevel)
-	defer vault.Close()
 	if err != nil {
 		t.Errorf("vault initialization failed: %+v", err)
 	}
+	defer vault.Close()
 	accessData := &VaultAccessData{Password: testPassword}
 	if err := vault.Open(accessData); err != nil {
 		t.Errorf("opening vault failed: %+v", err)
@@ -25,10 +25,10 @@ func TestVault_Initialize(t *testing.T) {
 
 func TestVault_GetEntries(t *testing.T) {
 	vault, err := NewVault(vaultPath, logrus.ErrorLevel)
-	defer vault.Close()
 	if err != nil {
 		t.Errorf("vault initialization failed: %+v", err)
 	}
+	defer vault.Close()
 	accessData := &VaultAccessData{Password: testPassword}
 	if err := vault.Open(accessData); err != nil {
 		t.Errorf("opening vault failed: %+v", err)
diff --git a/pkg/unlock/aes256gcm.go b/pkg/unlock/aes256gcm.go
@@ -17,10 +17,10 @@ const (
 	minKdfIterCount = 10000
 )
 
-func generateRandom(bytes int) []byte {
+func generateRandom(bytes int) ([]byte, error) {
 	generated := make([]byte, bytes)
-	rand.Read(generated)
-	return generated
+	_, err := rand.Read(generated)
+	return generated, err
 }
 
 func sha256sum(data []byte) []byte {
@@ -44,13 +44,19 @@ func createCipherGCM(key []byte) (cipher.AEAD, error) {
 }
 
 func encrypt(passphrase []byte, plaintext []byte, kdfIterCount int) ([]byte, error) {
-	salt := generateRandom(bytesSalt)
+	salt, err := generateRandom(bytesSalt)
+	if err != nil {
+		return nil, err
+	}
 	key := deriveKey(passphrase, salt, kdfIterCount)
 	aesgcm, err := createCipherGCM(key)
 	if err != nil {
 		return nil, err
 	}
-	iv := generateRandom(bytesIV)
+	iv, err := generateRandom(bytesIV)
+	if err != nil {
+		return nil, err
+	}
 	ciphertext := aesgcm.Seal(nil, iv, plaintext, nil)
 	data := append(ciphertext, salt...)
 	data = append(iv, data...)
diff --git a/pkg/unlock/securestore.go b/pkg/unlock/securestore.go
@@ -69,7 +69,7 @@ func (store *SecureStore) Read() ([]byte, error) {
 	}
 	store.logger.Debug("reading store data")
 	data, _ := os.ReadFile(store.file.Name())
-	if data == nil || len(data) == 0 {
+	if len(data) == 0 {
 		return nil, nil // nothing to read
 	}
 	store.logger.Debug("decrypting store data")
@@ -80,7 +80,7 @@ func (store *SecureStore) Read() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	store.wasReadSuccessfully = (dbKey != nil && len(dbKey) > 0)
+	store.wasReadSuccessfully = (len(dbKey) > 0)
 	return dbKey, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ func assembleVaultAccessData(logger logrus.Logger, args Args, store *unlock.Se`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`func initializeStore(logger logrus.Logger, args Args) *unlock.SecureStore {`
`216`		`- vaultPath, err := filepath.EvalSymlinks(*args.vaultPath)`
	`216`	`+ vaultPath, _ := filepath.EvalSymlinks(*args.vaultPath)`
`217`	`217`	`store, err := unlock.NewSecureStore(filepath.Base(vaultPath), logger.Level)`
`218`	`218`	`if err != nil {`
`219`	`219`	`logger.WithError(err).Fatal("could not create store")`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (store *SecureStore) Read() ([]byte, error) {`
`69`	`69`	`}`
`70`	`70`	`store.logger.Debug("reading store data")`
`71`	`71`	`data, _ := os.ReadFile(store.file.Name())`
`72`		`- if data == nil \|\| len(data) == 0 {`
	`72`	`+ if len(data) == 0 {`
`73`	`73`	`return nil, nil // nothing to read`
`74`	`74`	`}`
`75`	`75`	`store.logger.Debug("decrypting store data")`
`@@ -80,7 +80,7 @@ func (store *SecureStore) Read() ([]byte, error) {`
`80`	`80`	`if err != nil {`
`81`	`81`	`return nil, err`
`82`	`82`	`}`
`83`		`- store.wasReadSuccessfully = (dbKey != nil && len(dbKey) > 0)`
	`83`	`+ store.wasReadSuccessfully = (len(dbKey) > 0)`
`84`	`84`	`return dbKey, nil`
`85`	`85`	`}`
`86`	`86`