create-crypt-module

.github/workflows/golangci-lint.yml

@@ -1,9 +1,10 @@
 name: golangci-lint
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - master
   pull_request:
-    branches: [ "main" ]
 
 permissions:
   contents: read
@@ -22,4 +23,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.59
+          version: v1.60

app/json/crypt.go

@@ -1,29 +1,76 @@
 package json
 
 import (
-	"ssh+/app/crypt"
+	"ssh+/app/output"
+
+	"github.com/spf13/viper"
+	"github.com/ssh-connection-manager/crypt"
 )
 
 func SetCryptData(c Connect) Connect {
-	c.Alias = crypt.Encrypt(c.Alias)
-	c.Address = crypt.Encrypt(c.Address)
-	c.Login = crypt.Encrypt(c.Login)
-	c.Password = crypt.Encrypt(c.Password)
+	var err error
+
+	pathConf := viper.GetString("FullPathConfig")
+	fileNameKey := viper.GetString("NameFileCryptKey")
 
-	c.CreatedAt = crypt.Encrypt(c.CreatedAt)
-	c.UpdatedAt = crypt.Encrypt(c.UpdatedAt)
+	c.Alias, err = crypt.Encrypt(c.Alias, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
+	c.Address, err = crypt.Encrypt(c.Address, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
+	c.Login, err = crypt.Encrypt(c.Login, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
+	c.Password, err = crypt.Encrypt(c.Password, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
+	c.CreatedAt, err = crypt.Encrypt(c.CreatedAt, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
+	c.UpdatedAt, err = crypt.Encrypt(c.UpdatedAt, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
 
 	return c
 }
 
 func decryptData(c Connect) Connect {
-	c.Alias = crypt.Decrypt(c.Alias)
-	c.Address = crypt.Decrypt(c.Address)
-	c.Login = crypt.Decrypt(c.Login)
-	c.Password = crypt.Decrypt(c.Password)
+	var err error
 
-	c.CreatedAt = crypt.Decrypt(c.CreatedAt)
-	c.UpdatedAt = crypt.Decrypt(c.UpdatedAt)
+	pathConf := viper.GetString("FullPathConfig")
+	fileNameKey := viper.GetString("NameFileCryptKey")
+
+	c.Alias, err = crypt.Decrypt(c.Alias, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
+	c.Address, err = crypt.Decrypt(c.Address, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
+	c.Login, err = crypt.Decrypt(c.Login, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
+	c.Password, err = crypt.Decrypt(c.Password, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
+	c.CreatedAt, err = crypt.Decrypt(c.CreatedAt, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
+	c.UpdatedAt, err = crypt.Decrypt(c.UpdatedAt, pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err crypt data")
+	}
 
 	return c
 }

go.mod

@@ -42,6 +42,7 @@ require (
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/ssh-connection-manager/crypt v1.0.2 // indirect
 	github.com/ssh-connection-manager/time v1.0.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect

go.sum

@@ -87,6 +87,10 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
 github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
+github.com/ssh-connection-manager/crypt v1.0.1 h1:TKWmqgypv2C2mMyYJ8kSjtK96p1rnnyjzIkrQAp8dzQ=
+github.com/ssh-connection-manager/crypt v1.0.1/go.mod h1:q58XdwFONc12YHMN8LjbZK+G3cdes7fvatidwjegq1s=
+github.com/ssh-connection-manager/crypt v1.0.2 h1:/caPrJ5X8hwVqqeVtuu2Mj6BnO4csjYnmbiOVQ1Fchc=
+github.com/ssh-connection-manager/crypt v1.0.2/go.mod h1:q58XdwFONc12YHMN8LjbZK+G3cdes7fvatidwjegq1s=
 github.com/ssh-connection-manager/file v1.0.1 h1:t0bWe/WlYx/00i1zoO7ABL51oyB+7r1GlU4pktdVM0c=
 github.com/ssh-connection-manager/file v1.0.1/go.mod h1:v6ohozxsgX7s4ze2Vy4sesNBaJ9pcJG0aOmqgffJenA=
 github.com/ssh-connection-manager/time v1.0.0 h1:pGTqenPyDymD489mNcsUbICSBihZpl7yWEnNIICZLfA=

inits/inits.go

@@ -1,9 +1,12 @@
 package inits
 
 import (
-	"ssh+/app/crypt"
+	"github.com/spf13/viper"
 	"ssh+/app/json"
+	"ssh+/app/output"
 	"ssh+/config"
+
+	"github.com/ssh-connection-manager/crypt"
 )
 
 func generateConfigFile() {
@@ -15,7 +18,13 @@ func createFileConnects() {
 }
 
 func generateCryptKey() {
-	crypt.GenerateKey()
+	pathConf := viper.GetString("FullPathConfig")
+	fileNameKey := viper.GetString("NameFileCryptKey")
+
+	err := crypt.GenerateKey(pathConf, fileNameKey)
+	if err != nil {
+		output.GetOutError("err generate key")
+	}
 }
 
 func SetDependencies() {