diff --git a/cmd/validator/main.go b/cmd/validator/main.go index f0587c9..3a085a7 100644 --- a/cmd/validator/main.go +++ b/cmd/validator/main.go @@ -54,7 +54,7 @@ func main() { log.Fatalf("error validating smtp: %v", err) } - if err = validateEncryptKeys(&config.ExternalCfg.EncryptCommon); err != nil { + if err = validate.ValidateEncryptKeys(&config.ExternalCfg.EncryptCommon); err != nil { log.Fatalf("error validating encrypted: %v", err) } @@ -201,24 +201,6 @@ func validateMail(cfg models.MailClientCfg) error { return nil } -func validateEncryptKeys(e *encrypt.Encrypt) error { - codeWord := "ДАЙТЕ Jazz-у!" - shifr, err := e.EncryptStr(codeWord) - if err != nil { - return err - } - - deShifr, err := e.DecryptStr(shifr) - if err != nil { - return err - } - - if deShifr != codeWord { - return fmt.Errorf("invalid encrypt key") - } - return nil -} - func validateNotEmpty(config *models.Config) error { if config.ExternalCfg.EncryptCommon.PrivKey == "" { return fmt.Errorf("invalid private encrypt key") diff --git a/cmd/validator/main_test.go b/cmd/validator/main_test.go index 765a327..b759b29 100644 --- a/cmd/validator/main_test.go +++ b/cmd/validator/main_test.go @@ -7,6 +7,7 @@ import ( "encoding/pem" "fmt" "gitea.pena/PenaSide/common/encrypt" + "gitea.pena/PenaSide/common/validate" "gitea.pena/PenaSide/customer/internal/models" "github.com/stretchr/testify/assert" "os" @@ -54,7 +55,7 @@ func TestValidateKafka(t *testing.T) { func TestValidateEncryptKeys(t *testing.T) { priveKey, pubKey, err := generateRSAKeys(2048) assert.NoError(t, err) - err = validateEncryptKeys(&encrypt.Encrypt{ + err = validate.ValidateEncryptKeys(&encrypt.Encrypt{ PubKey: pubKey, PrivKey: priveKey, }) diff --git a/go.mod b/go.mod index 6a263d3..17f60aa 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.2 toolchain go1.23.3 require ( - gitea.pena/PenaSide/common v0.0.0-20241202085238-def6267b6da0 + gitea.pena/PenaSide/common v0.0.0-20241206095133-a4a6f7df8b45 gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 github.com/caarlos0/env/v8 v8.0.0 diff --git a/go.sum b/go.sum index fc8f412..c864c99 100644 --- a/go.sum +++ b/go.sum @@ -7,6 +7,8 @@ gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1 h1:w1AAxrlZGmxUI9N gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= gitea.pena/PenaSide/common v0.0.0-20241202085238-def6267b6da0 h1:YkaR1shmenCRumIpllxanZJEUI38Snea7kZ94xjHUYM= gitea.pena/PenaSide/common v0.0.0-20241202085238-def6267b6da0/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= +gitea.pena/PenaSide/common v0.0.0-20241206095133-a4a6f7df8b45 h1:0YzvHSgRitVeqvniSCPr6BERHusGP5yrGozAITYbWmg= +gitea.pena/PenaSide/common v0.0.0-20241206095133-a4a6f7df8b45/go.mod h1:BDk6/EA9ekKun+UP7UBLcczhlmFRLxglYi00G9FBkUw= gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a h1:UySqMgaOKNsR42Y6GQXoM2wn/waYNc9cakMUSvbEEAg= gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU= gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 h1:y9B4CSPIgiUoaXKyXLZxs1A9hxzDj26F9MH2R6uTkHQ=