dkforest

commit 3c988803730970533d53529c6d561e4b9a612148
parent 1267e0c115d19aa8f064b9ab356cf38b532ff275
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 11 Jan 2023 11:04:50 -0800

cleanup

Diffstat:
M
pkg/database/encryptedString.go
 | 
5
++---
M
pkg/database/tableUploads.go
 | 
5
++---
M
pkg/utils/utils.go
 | 
10
++++++++++
M
pkg/web/handlers/handlers.go
 | 
4
++--
M
pkg/web/handlers/utils/utils.go
 | 
4
++--

5 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/pkg/database/encryptedString.go b/pkg/database/encryptedString.go
@@ -2,7 +2,6 @@ package database
 
 import (
 	"database/sql/driver"
-	"dkforest/pkg/config"
 	"dkforest/pkg/utils"
 	"github.com/sirupsen/logrus"
 )
@@ -12,7 +11,7 @@ type EncryptedString string
 
 // Scan EncryptedString implements scanner interface
 func (s *EncryptedString) Scan(val any) error {
-	v, err := utils.DecryptAES(val.([]byte), []byte(config.Global.MasterKey()))
+	v, err := utils.DecryptAESMaster(val.([]byte))
 	*s = EncryptedString(v)
 	if err != nil {
 		logrus.Error("Failed to Scan EncryptedString : ", err)
@@ -22,7 +21,7 @@ func (s *EncryptedString) Scan(val any) error {
 
 // Value EncryptedString implements Valuer interface
 func (s EncryptedString) Value() (driver.Value, error) {
-	v, err := utils.EncryptAES([]byte(s), []byte(config.Global.MasterKey()))
+	v, err := utils.EncryptAESMaster([]byte(s))
 	if err != nil {
 		logrus.Error("Failed to Value EncryptedString : ", err)
 	}
diff --git a/pkg/database/tableUploads.go b/pkg/database/tableUploads.go
@@ -1,7 +1,6 @@
 package database
 
 import (
-	"dkforest/pkg/config"
 	"dkforest/pkg/utils"
 	"io"
 	"io/ioutil"
@@ -36,7 +35,7 @@ func (u *Upload) GetContent() (os.FileInfo, []byte, error) {
 	defer f.Close()
 
 	fileBytes, _ := io.ReadAll(f)
-	decFileBytes, err := utils.DecryptAES(fileBytes, []byte(config.Global.MasterKey()))
+	decFileBytes, err := utils.DecryptAESMaster(fileBytes)
 	if err != nil {
 		decFileBytes = fileBytes
 	}
@@ -68,7 +67,7 @@ func CreateUpload(fileName string, content []byte, userID UserID) (*Upload, erro
 }
 
 func CreateEncryptedUploadWithSize(fileName string, content []byte, userID UserID, size int64) (*Upload, error) {
-	encryptedContent, err := utils.EncryptAES(content, []byte(config.Global.MasterKey()))
+	encryptedContent, err := utils.EncryptAESMaster(content)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -351,6 +351,16 @@ func DecryptAES(ciphertext []byte, key []byte) ([]byte, error) {
 	return gcm.Open(nil, nonce, ciphertext, nil)
 }
 
+// EncryptAESMaster same as EncryptAES but use the default master key
+func EncryptAESMaster(plaintext []byte) ([]byte, error) {
+	return EncryptAES(plaintext, []byte(config.Global.MasterKey()))
+}
+
+// DecryptAESMaster same as DecryptAES but use the default master key
+func DecryptAESMaster(ciphertext []byte) ([]byte, error) {
+	return DecryptAES(ciphertext, []byte(config.Global.MasterKey()))
+}
+
 func GetGCM(key string) (cipher.AEAD, int, error) {
 	keyBytes, err := hex.DecodeString(key)
 	if err != nil {
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -629,7 +629,7 @@ func SignupInvitationHandler(c echo.Context) error {
 }
 
 func AesNB64(in string) string {
-	encryptedVal, _ := utils.EncryptAES([]byte(in), []byte(config.Global.MasterKey()))
+	encryptedVal, _ := utils.EncryptAESMaster([]byte(in))
 	return base64.URLEncoding.EncodeToString(encryptedVal)
 }
 
@@ -638,7 +638,7 @@ func DAesB64(in string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	encryptedVal, err := utils.DecryptAES(enc, []byte(config.Global.MasterKey()))
+	encryptedVal, err := utils.DecryptAESMaster(enc)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/web/handlers/utils/utils.go b/pkg/web/handlers/utils/utils.go
@@ -47,7 +47,7 @@ func CreateEncCookie(name string, value any, maxAge int64) *http.Cookie {
 	if err != nil {
 		return nil
 	}
-	encryptedVal, err := utils.EncryptAES(by, []byte(config.Global.MasterKey()))
+	encryptedVal, err := utils.EncryptAESMaster(by)
 	if err != nil {
 		return nil
 	}
@@ -66,7 +66,7 @@ func EncCookie[T any](c echo.Context, name string) (*http.Cookie, T, error) {
 	if err != nil {
 		return nil, zero, err
 	}
-	v, err := utils.DecryptAES(val, []byte(config.Global.MasterKey()))
+	v, err := utils.DecryptAESMaster(val)
 	if err != nil {
 		return nil, zero, err
 	}