完成数据库敏感信息的加密 close #127 close #46

pkg/service/asset.go

@@ -1,11 +1,8 @@
 package service
 
 import (
-	"encoding/base64"
-
 	"next-terminal/pkg/global"
 	"next-terminal/server/repository"
-	"next-terminal/server/utils"
 )
 
 type AssetService struct {
@@ -26,31 +23,10 @@ func (r AssetService) Encrypt() error {
 		if item.Encrypted {
 			continue
 		}
-		if item.Password != "" && item.Password != "-" {
+		if err := r.assetRepository.Encrypt(&item, global.Config.EncryptionPassword); err != nil {
-			encryptedCBC, err := utils.AesEncryptCBC([]byte(item.Password), global.Config.EncryptionPassword)
-			if err != nil {
 			return err
 		}
-			item.Password = base64.StdEncoding.EncodeToString(encryptedCBC)
+		if err := r.assetRepository.UpdateById(&item, item.ID); err != nil {
-		}
-
-		if item.PrivateKey != "" && item.PrivateKey != "-" {
-			encryptedCBC, err := utils.AesEncryptCBC([]byte(item.PrivateKey), global.Config.EncryptionPassword)
-			if err != nil {
-				return err
-			}
-			item.PrivateKey = base64.StdEncoding.EncodeToString(encryptedCBC)
-		}
-
-		if item.Passphrase != "" && item.Passphrase != "-" {
-			encryptedCBC, err := utils.AesEncryptCBC([]byte(item.Passphrase), global.Config.EncryptionPassword)
-			if err != nil {
-				return err
-			}
-			item.Passphrase = base64.StdEncoding.EncodeToString(encryptedCBC)
-		}
-		err = r.assetRepository.EncryptedById(true, item.Password, item.PrivateKey, item.Passphrase, item.ID)
-		if err != nil {
 			return err
 		}
 	}

pkg/service/credential.go

@@ -1,11 +1,8 @@
 package service
 
 import (
-	"encoding/base64"
-
 	"next-terminal/pkg/global"
 	"next-terminal/server/repository"
-	"next-terminal/server/utils"
 )
 
 type CredentialService struct {
@@ -26,31 +23,10 @@ func (r CredentialService) Encrypt() error {
 		if item.Encrypted {
 			continue
 		}
-		if item.Password != "" && item.Password != "-" {
+		if err := r.credentialRepository.Encrypt(&item, global.Config.EncryptionPassword); err != nil {
-			encryptedCBC, err := utils.AesEncryptCBC([]byte(item.Password), global.Config.EncryptionPassword)
-			if err != nil {
 			return err
 		}
-			item.Password = base64.StdEncoding.EncodeToString(encryptedCBC)
+		if err := r.credentialRepository.UpdateById(&item, item.ID); err != nil {
-		}
-
-		if item.PrivateKey != "" && item.PrivateKey != "-" {
-			encryptedCBC, err := utils.AesEncryptCBC([]byte(item.PrivateKey), global.Config.EncryptionPassword)
-			if err != nil {
-				return err
-			}
-			item.PrivateKey = base64.StdEncoding.EncodeToString(encryptedCBC)
-		}
-
-		if item.Passphrase != "" && item.Passphrase != "-" {
-			encryptedCBC, err := utils.AesEncryptCBC([]byte(item.Passphrase), global.Config.EncryptionPassword)
-			if err != nil {
-				return err
-			}
-			item.Passphrase = base64.StdEncoding.EncodeToString(encryptedCBC)
-		}
-		err = r.credentialRepository.EncryptedById(true, item.Password, item.PrivateKey, item.Passphrase, item.ID)
-		if err != nil {
 			return err
 		}
 	}

server/api/routes.go

@@ -48,6 +48,7 @@ var (
 	mailService       *service.MailService
 	numService        *service.NumService
 	assetService      *service.AssetService
+	credentialService *service.CredentialService
 )
 
 func SetupRoutes(db *gorm.DB) *echo.Echo {
@@ -256,6 +257,7 @@ func InitService() {
 	mailService = service.NewMailService(propertyRepository)
 	numService = service.NewNumService(numRepository)
 	assetService = service.NewAssetService(assetRepository)
+	credentialService = service.NewCredentialService(credentialRepository)
 }
 
 func InitDBData() (err error) {
@@ -280,6 +282,9 @@ func InitDBData() (err error) {
 	if err := sessionService.EmptyPassword(); err != nil {
 		return err
 	}
+	if err := credentialService.Encrypt(); err != nil {
+		return err
+	}
 	if err := assetService.Encrypt(); err != nil {
 		return err
 	}

server/repository/asset.go

@@ -243,11 +243,6 @@ func (r AssetRepository) UpdateActiveById(active bool, id string) error {
 	return r.DB.Exec(sql, active, id).Error
 }
 
-func (r AssetRepository) EncryptedById(encrypted bool, password, privateKey, passphrase, id string) error {
-	sql := "update assets set encrypted = ?, password = ?,private_key = ?, passphrase = ?  where id = ?"
-	return r.DB.Exec(sql, encrypted, password, privateKey, passphrase, id).Error
-}
-
 func (r AssetRepository) DeleteById(id string) error {
 	return r.DB.Where("id = ?", id).Delete(&model.Asset{}).Error
 }

server/repository/credential.go

@@ -192,8 +192,3 @@ func (r CredentialRepository) FindAll() (o []model.Credential, err error) {
 	err = r.DB.Find(&o).Error
 	return
 }
-
-func (r CredentialRepository) EncryptedById(encrypted bool, password, privateKey, passphrase, id string) error {
-	sql := "update assets set encrypted = ?, password = ?,private_key = ?, passphrase = ?  where id = ?"
-	return r.DB.Exec(sql, encrypted, password, privateKey, passphrase, id).Error
-}