PenaSide/customer
3
0
Fork 0
generated from PenaSide/GolangTemplate
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

added validate encrypte from common

Browse Source
This commit is contained in:
Pasha 2024-12-06 12:55:16 +03:00
parent 6c26eb8295
commit e509b1bee2
4 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/validator/main.go
View File

@ -54,7 +54,7 @@ func main() {
log.Fatalf("error validating smtp: %v", err) 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) log.Fatalf("error validating encrypted: %v", err)
} }
@ -201,24 +201,6 @@ func validateMail(cfg models.MailClientCfg) error {
return nil 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 { func validateNotEmpty(config *models.Config) error {
if config.ExternalCfg.EncryptCommon.PrivKey == "" { if config.ExternalCfg.EncryptCommon.PrivKey == "" {
return fmt.Errorf("invalid private encrypt key") return fmt.Errorf("invalid private encrypt key")

3
cmd/validator/main_test.go
View File

@ -7,6 +7,7 @@ import (
"encoding/pem" "encoding/pem"
"fmt" "fmt"
"gitea.pena/PenaSide/common/encrypt" "gitea.pena/PenaSide/common/encrypt"
"gitea.pena/PenaSide/common/validate"
"gitea.pena/PenaSide/customer/internal/models" "gitea.pena/PenaSide/customer/internal/models"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"os" "os"
@ -54,7 +55,7 @@ func TestValidateKafka(t *testing.T) {
func TestValidateEncryptKeys(t *testing.T) { func TestValidateEncryptKeys(t *testing.T) {
priveKey, pubKey, err := generateRSAKeys(2048) priveKey, pubKey, err := generateRSAKeys(2048)
assert.NoError(t, err) assert.NoError(t, err)
err = validateEncryptKeys(&encrypt.Encrypt{ err = validate.ValidateEncryptKeys(&encrypt.Encrypt{
PubKey: pubKey, PubKey: pubKey,
PrivKey: priveKey, PrivKey: priveKey,
}) })

2
go.mod
View File

@ -5,7 +5,7 @@ go 1.23.2
toolchain go1.23.3 toolchain go1.23.3
require ( 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/linters-golang v0.0.0-20241119212350-2759fa93724a
gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4
github.com/caarlos0/env/v8 v8.0.0 github.com/caarlos0/env/v8 v8.0.0

2
go.sum
View File

@ -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-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 h1:YkaR1shmenCRumIpllxanZJEUI38Snea7kZ94xjHUYM=
gitea.pena/PenaSide/common v0.0.0-20241202085238-def6267b6da0/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= 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 h1:UySqMgaOKNsR42Y6GQXoM2wn/waYNc9cakMUSvbEEAg=
gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU= 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= gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 h1:y9B4CSPIgiUoaXKyXLZxs1A9hxzDj26F9MH2R6uTkHQ=