Skip to content

Commit 47ddff8

Browse files
deniskorbakovdeniskorbakov
authored
Merge pull request #9 from ssh-connection-manager/141-add-logging-project
141 add logging project
2 parents 3c708ac + 084fb97 commit 47ddff8

19 files changed

+130
-14
lines changed

‎app/change.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package app
22

33
import (
4+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
45
"github.com/ssh-connection-manager/kernel/v2/pkg/json"
56
"github.com/ssh-connection-manager/kernel/v2/pkg/output"
67
"github.com/ssh-connection-manager/kernel/v2/pkg/time"
@@ -23,6 +24,7 @@ func Change(
2324

2425
err := connections.UpdateConnectJson(oldAlias, connect)
2526
if err != nil {
26-
output.GetOutError("err update")
27+
logger.Danger(err.Error())
28+
output.GetOutError(err.Error())
2729
}
2830
}

‎app/connect.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package app
22

33
import (
44
"github.com/spf13/viper"
5+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
56
"github.com/ssh-connection-manager/kernel/v2/pkg/connect"
67
"github.com/ssh-connection-manager/kernel/v2/pkg/file"
78
"github.com/ssh-connection-manager/kernel/v2/pkg/json"
@@ -18,6 +19,7 @@ func Connect(alias string) {
1819

1920
err := connect.Ssh(&connections, alias, fileConnect)
2021
if err != nil {
21-
output.GetOutError("err connect")
22+
logger.Danger(err.Error())
23+
output.GetOutError(err.Error())
2224
}
2325
}

‎app/create.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package app
22

33
import (
4+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
45
"github.com/ssh-connection-manager/kernel/v2/pkg/json"
56
"github.com/ssh-connection-manager/kernel/v2/pkg/output"
67
"github.com/ssh-connection-manager/kernel/v2/pkg/time"
@@ -22,6 +23,7 @@ func Create(alias, address, login, password string) {
2223

2324
err := connections.WriteConnectToJson(connect)
2425
if err != nil {
26+
logger.Danger(err.Error())
2527
output.GetOutError(err.Error())
2628
}
2729
}

‎app/delete.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package app
22

33
import (
4+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
45
"github.com/ssh-connection-manager/kernel/v2/pkg/json"
56
"github.com/ssh-connection-manager/kernel/v2/pkg/output"
67
)
@@ -10,6 +11,7 @@ func Delete(alias string) {
1011

1112
err := connects.DeleteConnectToJson(alias)
1213
if err != nil {
14+
logger.Danger(err.Error())
1315
output.GetOutError(err.Error())
1416
}
1517
}

‎app/list.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package app
22

33
import (
4+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
45
"github.com/ssh-connection-manager/kernel/v2/pkg/json"
56
"github.com/ssh-connection-manager/kernel/v2/pkg/output"
67
)
@@ -10,6 +11,7 @@ func List() [][]string {
1011

1112
connectionsData, err := connections.GetDataForListConnect()
1213
if err != nil {
14+
logger.Danger(err.Error())
1315
output.GetOutError(err.Error())
1416
}
1517

‎config/config.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package config
22

33
import (
4+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
45
"os/user"
56

67
"github.com/spf13/viper"
@@ -11,6 +12,7 @@ import (
1112
func getHomeDir() string {
1213
usr, err := user.Current()
1314
if err != nil {
15+
logger.Danger(err.Error())
1416
output.GetOutError("Error retrieving user data")
1517
}
1618

@@ -22,11 +24,13 @@ func existOrCreateConfig(fl file.File) {
2224
if err != nil {
2325
err := fl.CreateFile()
2426
if err != nil {
27+
logger.Danger(err.Error())
2528
output.GetOutError("File creation error down")
2629
}
2730

2831
err = viper.ReadInConfig()
2932
if err != nil {
33+
logger.Danger(err.Error())
3034
output.GetOutError("File creation error")
3135
}
3236
}
@@ -42,6 +46,7 @@ func setConfigVariable() {
4246

4347
err := viper.WriteConfig()
4448
if err != nil {
49+
logger.Danger(err.Error())
4550
output.GetOutError("Error writing to configuration file")
4651
}
4752
}

‎inits/inits.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package inits
22

33
import (
44
"github.com/spf13/viper"
5-
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
65

76
"github.com/ssh-connection-manager/kernel/v2/config"
7+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
88
"github.com/ssh-connection-manager/kernel/v2/pkg/crypt"
99
"github.com/ssh-connection-manager/kernel/v2/pkg/file"
1010
"github.com/ssh-connection-manager/kernel/v2/pkg/json"
@@ -23,6 +23,7 @@ func createFileConnects() {
2323

2424
err := json.Generate(fileConnect)
2525
if err != nil {
26+
logger.Danger(err.Error())
2627
output.GetOutError("err create file connect")
2728
}
2829
}
@@ -35,6 +36,7 @@ func generateCryptKey() {
3536

3637
err := crypt.GenerateFileKey(fileConnect)
3738
if err != nil {
39+
logger.Danger(err.Error())
3840
output.GetOutError("err generate key")
3941
}
4042
}
@@ -47,6 +49,7 @@ func generateLogFile() {
4749

4850
err := logger.GenerateFile(fileLogger)
4951
if err != nil {
52+
logger.Danger(err.Error())
5053
output.GetOutError("err generate logger")
5154
}
5255
}

‎pkg/connect/connect.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,27 @@ import (
66
"os"
77
"os/exec"
88

9+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
910
"github.com/ssh-connection-manager/kernel/v2/pkg/file"
1011
"github.com/ssh-connection-manager/kernel/v2/pkg/json"
1112
)
1213

1314
func Ssh(c *json.Connections, alias string, fl file.File) error {
1415
data, err := fl.ReadFile()
1516
if err != nil {
17+
logger.Danger(err.Error())
1618
return err
1719
}
1820

1921
err = c.SerializationJson(data)
2022
if err != nil {
23+
logger.Danger(err.Error())
2124
return err
2225
}
2326

2427
err = c.SetDecryptData()
2528
if err != nil {
29+
logger.Danger(err.Error())
2630
return err
2731
}
2832

@@ -33,7 +37,10 @@ func Ssh(c *json.Connections, alias string, fl file.File) error {
3337
}
3438
}
3539

36-
return errors.New("alias not found")
40+
errText := "alias not found"
41+
42+
logger.Danger(errText)
43+
return errors.New(errText)
3744
}
3845

3946
func sshConnect(address, login, password string) {
@@ -45,6 +52,7 @@ func sshConnect(address, login, password string) {
4552
sshCmd.Stdin = os.Stdin
4653

4754
if err := sshCmd.Run(); err != nil {
55+
logger.Danger(err.Error())
4856
fmt.Println("Error while executing the command:", err)
4957
}
5058
}

‎pkg/crypt/crypt.go

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"crypto/rand"
88
"encoding/base64"
99
"errors"
10+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
1011
"io"
1112
"strings"
1213
)
@@ -35,7 +36,10 @@ func Unpad(src []byte) ([]byte, error) {
3536
unpadding := int(src[length-1])
3637

3738
if unpadding > length {
38-
return nil, errors.New("unpad error. This could happen when incorrect encryption key is used")
39+
errText := "unpad error. This could happen when incorrect encryption key is used"
40+
41+
logger.Danger(errText)
42+
return nil, errors.New(errText)
3943
}
4044

4145
return src[:(length - unpadding)], nil
@@ -44,35 +48,42 @@ func Unpad(src []byte) ([]byte, error) {
4448
func encrypt(key []byte, text string) (string, error) {
4549
block, err := aes.NewCipher(key)
4650
if err != nil {
51+
logger.Danger(err.Error())
4752
return "", err
4853
}
4954

5055
msg := Pad([]byte(text))
5156
ciphertext := make([]byte, aes.BlockSize+len(msg))
5257
iv := ciphertext[:aes.BlockSize]
5358
if _, err := io.ReadFull(rand.Reader, iv); err != nil {
59+
logger.Danger(err.Error())
5460
return "", err
5561
}
5662

5763
cfb := cipher.NewCFBEncrypter(block, iv)
58-
cfb.XORKeyStream(ciphertext[aes.BlockSize:], []byte(msg))
64+
cfb.XORKeyStream(ciphertext[aes.BlockSize:], msg)
5965
finalMsg := removeBase64Padding(base64.URLEncoding.EncodeToString(ciphertext))
6066
return finalMsg, nil
6167
}
6268

6369
func decrypt(key []byte, text string) (string, error) {
6470
block, err := aes.NewCipher(key)
6571
if err != nil {
72+
logger.Danger(err.Error())
6673
return "", err
6774
}
6875

6976
decodedMsg, err := base64.URLEncoding.DecodeString(addBase64Padding(text))
7077
if err != nil {
78+
logger.Danger(err.Error())
7179
return "", err
7280
}
7381

7482
if (len(decodedMsg) % aes.BlockSize) != 0 {
75-
return "", errors.New("blocksize must be multipe of decoded message length")
83+
errText := "blocksize must be multipe of decoded message length"
84+
85+
logger.Danger(errText)
86+
return "", errors.New(errText)
7687
}
7788

7889
iv := decodedMsg[:aes.BlockSize]

‎pkg/crypt/crypt_key.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package crypt
33
import (
44
"crypto/rand"
55
"errors"
6+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
67

78
"github.com/ssh-connection-manager/kernel/v2/pkg/file"
89
)
@@ -12,7 +13,10 @@ func GetKey() ([]byte, error) {
1213

1314
data, err := fileCrypt.ReadFile()
1415
if err != nil {
15-
return []byte(data), errors.New("empty name")
16+
errText := "empty name"
17+
18+
logger.Danger(errText)
19+
return []byte(data), errors.New(errText)
1620
}
1721

1822
return []byte(data), nil
@@ -25,11 +29,13 @@ func GenerateFileKey(fl file.File) error {
2529
if !fileKey.IsExistFile() {
2630
err := fileKey.CreateFile()
2731
if err != nil {
32+
logger.Danger(err.Error())
2833
return err
2934
}
3035

3136
cryptKey, err := GetKey()
3237
if err != nil {
38+
logger.Danger(err.Error())
3339
return errors.New("empty name")
3440
}
3541

@@ -38,11 +44,13 @@ func GenerateFileKey(fl file.File) error {
3844

3945
_, err := rand.Read(keyData)
4046
if err != nil {
47+
logger.Danger(err.Error())
4148
return errors.New("key generation error")
4249
}
4350

4451
err = fileKey.WriteFile(keyData)
4552
if err != nil {
53+
logger.Danger(err.Error())
4654
return errors.New("error writing key")
4755
}
4856
}

‎pkg/crypt/decrypt.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
package crypt
22

3-
import "errors"
3+
import (
4+
"errors"
5+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
6+
)
47

58
func Decrypt(str string) (string, error) {
69
cryptKey, err := GetKey()
710
if err != nil {
11+
logger.Danger(err.Error())
812
return "", errors.New("err at get crypt key")
913
}
1014

1115
decrypted, err := decrypt(cryptKey, str)
1216
if err != nil {
17+
logger.Danger(err.Error())
1318
return "", errors.New("encryption error")
1419
}
1520

‎pkg/crypt/encrypt.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
package crypt
22

3-
import "errors"
3+
import (
4+
"errors"
5+
"github.com/ssh-connection-manager/kernel/v2/internal/logger"
6+
)
47

58
func Encrypt(str string) (string, error) {
69
cryptKey, err := GetKey()
710
if err != nil {
11+
logger.Danger(err.Error())
812
return "", errors.New("err at get crypt key")
913
}
1014

1115
ciphertext, err := encrypt(cryptKey, str)
1216
if err != nil {
17+
logger.Danger(err.Error())
1318
return "", errors.New("encryption error")
1419
}
1520

0 commit comments

Comments
 (0)