fix(recovery): refine impl

Alice52 · Jan 14, 2024 · 3c07008 · 3c07008
1 parent db6ba3f
commit 3c07008
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/crypt/encryptor/default_encryptor.go b/crypt/encryptor/default_encryptor.go
@@ -25,7 +25,7 @@ func (c *DefaultAES) GetConfig() config.Config {
 }
 
 func (c *DefaultAES) EncryptWrapper(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 	encrypted, err := c.Encrypt(message)
 	if err != nil {
 		return "", err
@@ -35,7 +35,7 @@ func (c *DefaultAES) EncryptWrapper(message string) (a string, err error) {
 }
 
 func (c *DefaultAES) Encrypt(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 
 	block, err := buildCipher(c.Password)
 	if err != nil {
@@ -57,7 +57,7 @@ func (c *DefaultAES) Encrypt(message string) (a string, err error) {
 }
 
 func (c *DefaultAES) DecryptWrapper(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 	if c.NeedDecrypt(message) {
 		s := len(c.Prefix)
 		e := len(message) - len(c.Suffix)
@@ -68,7 +68,7 @@ func (c *DefaultAES) DecryptWrapper(message string) (a string, err error) {
 }
 
 func (c *DefaultAES) Decrypt(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 
 	data, err := base64.StdEncoding.DecodeString(message)
 	if err != nil {

diff --git a/crypt/encryptor/encryptor.go b/crypt/encryptor/encryptor.go
@@ -15,10 +15,10 @@ type Encryptor interface {
 	DecryptWrapper(message string) (string, error)
 }
 
-func RecoveryPanicAsError(err error) {
-	defer func() {
+func RecoveryPanicAsError() func(err error) {
+	return func(err error) {
 		if r := recover(); r != nil {
 			err = errors.New(fmt.Sprintf("recovered from panic: %v", r))
 		}
-	}()
+	}
 }
diff --git a/crypt/encryptor/pbe_aes_encryptor.go b/crypt/encryptor/pbe_aes_encryptor.go
@@ -29,7 +29,7 @@ func (c *PBEWithAES) GetConfig() config.Config {
 }
 
 func (c *PBEWithAES) EncryptWrapper(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 
 	encrypted, err := c.Encrypt(message)
 	if err != nil {
@@ -40,7 +40,7 @@ func (c *PBEWithAES) EncryptWrapper(message string) (a string, err error) {
 }
 
 func (c *PBEWithAES) Encrypt(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 
 	saltGenerator, ivGenerator, password := c.SaltGenerator, c.IvGenerator, c.Password
 	_, _, koi, ab := c.Prefix, c.Suffix, c.keyObtainIterations, c.algorithmBlockSize
@@ -71,7 +71,7 @@ func (c *PBEWithAES) Encrypt(message string) (a string, err error) {
 }
 
 func (c *PBEWithAES) DecryptWrapper(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 
 	if c.NeedDecrypt(message) {
 		s := len(c.Prefix)
@@ -83,7 +83,7 @@ func (c *PBEWithAES) DecryptWrapper(message string) (a string, err error) {
 }
 
 func (c *PBEWithAES) Decrypt(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 
 	saltGenerator, ivGenerator, password := c.SaltGenerator, c.IvGenerator, c.Password
 	_, _, koi, ab := c.Prefix, c.Suffix, c.keyObtainIterations, c.algorithmBlockSize

diff --git a/crypt/encryptor/pbe_aes_encryptor_test.go b/crypt/encryptor/pbe_aes_encryptor_test.go
@@ -48,7 +48,7 @@ func TestAesEncryptor(t *testing.T) {
 
 func TestAesDecryptWrapper(t *testing.T) {
 	encryptor := NewPBEWithAES(config.New())
-	decrypt, err := encryptor.DecryptWrapper("ENC(qMZtbG1zptyIVwwMERnR2eiBEeUufzsW6BPKQ+78kRJtr5IKhN0toIwvJY3QWipC)")
+	decrypt, err := encryptor.DecryptWrapper("ENC(+78kRJtr5IKhN0toIwvJY3QWipC)")
 	if err != nil {
 		panic(err)
 	}

diff --git a/crypt/encryptor/pbe_des_encryptor.go b/crypt/encryptor/pbe_des_encryptor.go
@@ -27,7 +27,7 @@ func NewPBEWithDES(conf config.Config) *PBEWithDES {
 }
 
 func (c *PBEWithDES) EncryptWrapper(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 
 	encrypted, err := c.Encrypt(message)
 	if err != nil {
@@ -38,7 +38,7 @@ func (c *PBEWithDES) EncryptWrapper(message string) (a string, err error) {
 }
 
 func (c *PBEWithDES) Encrypt(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 
 	saltGenerator, ivGenerator, password := c.SaltGenerator, c.IvGenerator, c.Password
 	_, _, koi, ab := c.Prefix, c.Suffix, c.keyObtainIterations, c.algorithmBlockSize
@@ -66,7 +66,7 @@ func (c *PBEWithDES) Encrypt(message string) (a string, err error) {
 }
 
 func (c *PBEWithDES) DecryptWrapper(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 
 	if c.NeedDecrypt(message) {
 		s := len(c.Prefix)
@@ -78,7 +78,7 @@ func (c *PBEWithDES) DecryptWrapper(message string) (a string, err error) {
 }
 
 func (c *PBEWithDES) Decrypt(message string) (a string, err error) {
-	RecoveryPanicAsError(err)
+	defer RecoveryPanicAsError()(err)
 
 	saltGenerator, ivGenerator, password := c.SaltGenerator, c.IvGenerator, c.Password
 	_, _, koi, ab := c.Prefix, c.Suffix, c.keyObtainIterations, c.algorithmBlockSize

diff --git a/viper/viper_jasypt.go b/viper/viper_jasypt.go
@@ -7,7 +7,7 @@ import (
 )
 
 func Unmarshal(v *viper.Viper, etor encryptor.Encryptor, rawVal any, opts ...viper.DecoderConfigOption) (err error) {
-	encryptor.RecoveryPanicAsError(err)
+	defer encryptor.RecoveryPanicAsError()(err)
 
 	jc := etor.GetConfig()
 	for _, k := range v.AllKeys() {