fix: Code refactoring

Author: dogukanoksuz

app/handlers/external.go

@@ -13,7 +13,7 @@ import (
 )
 
 func ExternalAPI(c *fiber.Ctx) error {
-	extension := &models.Extension{}
+	var extension *models.Extension
 	var err error
 	if len(c.FormValue("extension_id")) > 0 {
 		if !helpers.CheckUUID(c.FormValue("extension_id")) {

app/handlers/script.go

@@ -45,7 +45,10 @@ func ScriptRunner(c *fiber.Ctx) error {
 	remotePath := ""
 	if server.Os == "linux" {
 		remotePath = "/tmp/" + filepath.Base(c.FormValue("local_path"))
-		session.Run("rm " + remotePath)
+		_, err := session.Run("rm " + remotePath)
+		if err != nil {
+			return err
+		}
 	} else {
 		remotePath = session.WindowsPath + c.FormValue("remote_path") + ".ps1"
 	}
@@ -57,7 +60,10 @@ func ScriptRunner(c *fiber.Ctx) error {
 
 	output := ""
 	if server.Os == "linux" {
-		session.Run("chmod +x " + remotePath)
+		_, err := session.Run("chmod +x " + remotePath)
+		if err != nil {
+			return err
+		}
 
 		if c.FormValue("root") == "yes" {
 			credentials, err := liman.GetCredentials(&models.User{ID: c.Locals("user_id").(string)}, server)

app/middleware/app_logger/new.go

@@ -20,22 +20,18 @@ func New() fiber.Handler {
 			if !helpers.Contains(logger.ALL, c.Path()) {
 				return c.Next()
 			}
-			break
 		case "1":
 			if !helpers.Contains(logger.MINIMAL, c.Path()) {
 				return c.Next()
 			}
-			break
 		case "2":
 			if !helpers.Contains(logger.EXT_LOG, c.Path()) {
 				return c.Next()
 			}
-			break
 		case "3":
 			if !helpers.Contains(logger.EXT_DETAIL, c.Path()) {
 				return c.Next()
 			}
-			break
 		default:
 			return c.Next()
 		}

internal/bridge/clean.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/limanmys/render-engine/pkg/helpers"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 func Clean() {
@@ -44,7 +45,11 @@ func Clean() {
 			case <-ch:
 				return
 			default:
-				session.SSH.SendRequest("[email protected]", true, nil)
+				_, _, err := session.SSH.SendRequest("[email protected]", true, nil)
+				if err != nil {
+					logger.Sugar().Warnw("error when sending request")
+				}
+
 				ch <- 1
 			}
 		}()
@@ -85,7 +90,11 @@ func Clean() {
 			case <-ch:
 				return
 			default:
-				tunnel.SshClient.SendRequest("[email protected]", true, nil)
+				_, _, err := tunnel.SshClient.SendRequest("[email protected]", true, nil)
+				if err != nil {
+					logger.Sugar().Warnw("error when sending request")
+				}
+
 				ch <- 1
 			}
 		}()

internal/bridge/session.go

@@ -2,6 +2,7 @@ package bridge
 
 import (
 	"bytes"
+	"context"
 	"encoding/base64"
 	"errors"
 	"io"
@@ -11,6 +12,7 @@ import (
 
 	"github.com/acarl005/stripansi"
 	"github.com/hirochachacha/go-smb2"
+	"github.com/limanmys/render-engine/pkg/logger"
 	"github.com/masterzen/winrm"
 	"github.com/pkg/sftp"
 	"golang.org/x/crypto/ssh"
@@ -35,23 +37,36 @@ type Session struct {
 
 func (s *Session) CloseAllConnections() {
 	if s.SSH != nil {
-		s.SSH.Close()
+		err := s.SSH.Close()
+		if err != nil {
+			logger.Sugar().Warnw("cannot close ssh session")
+		}
 	}
 
 	if s.SFTP != nil {
-		s.SFTP.Close()
+		err := s.SFTP.Close()
+		if err != nil {
+			logger.Sugar().Warnw("cannot close sftp session")
+		}
 	}
 
 	if s.SMB != nil {
-		s.SMB.Logoff()
+		err := s.SMB.Logoff()
+		if err != nil {
+			logger.Sugar().Warnw("cannot close smb session")
+		}
 	}
 }
 
 func (val *Session) checkOutput(in io.Writer, output *bytes.Buffer) bool {
 	val.Mutex.Lock()
 	defer val.Mutex.Unlock()
 	if output != nil && output.Len() > 0 && strings.Contains(output.String(), "liman-pass-sudo") {
-		in.Write([]byte(val.password + "\n"))
+		_, err := in.Write([]byte(val.password + "\n"))
+		if err != nil {
+			logger.Sugar().Warnw("cannot write sudo password")
+			return false
+		}
 		return true
 	}
 	return false
@@ -99,7 +114,10 @@ func (val *Session) Run(command string) (string, error) {
 				}
 			}(in, stdoutB, endChan)
 		}
-		sess.Run("(" + command + ") 2> /dev/null")
+		err = sess.Run("(" + command + ") 2> /dev/null")
+		if err != nil {
+			return err.Error(), err
+		}
 
 		tmp := strings.Split(stdoutB.String(), "liman-pass-sudo")
 		output := tmp[len(tmp)-1]
@@ -110,7 +128,7 @@ func (val *Session) Run(command string) (string, error) {
 		encoder := unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM).NewEncoder()
 		encoded, _ := encoder.String(command)
 		command = base64.StdEncoding.EncodeToString([]byte(encoded))
-		stdout, stderr, _, err := val.WinRM.RunWithString("powershell.exe -encodedCommand "+command, "")
+		stdout, stderr, _, err := val.WinRM.RunWithContextWithString(context.TODO(), "powershell.exe -encodedCommand "+command, "")
 		if err != nil {
 			return "", err
 		}

internal/bridge/sftp.go

@@ -80,7 +80,10 @@ func (s *Session) SftpGetFile(localPath, remotePath string) error {
 
 	_, err = os.Stat(localPath)
 	if os.IsNotExist(err) {
-		os.Create(localPath)
+		_, err = os.Create(localPath)
+		if err != nil {
+			return err
+		}
 	}
 
 	srcFile, err := os.OpenFile(localPath, os.O_APPEND|os.O_WRONLY, os.ModeAppend)

internal/bridge/smb.go

@@ -81,7 +81,10 @@ func (s *Session) SmbGetFile(localPath, remotePath, remoteDisk string) error {
 
 	_, err = os.Stat(localPath)
 	if os.IsNotExist(err) {
-		os.Create(localPath)
+		_, err = os.Create(localPath)
+		if err != nil {
+			return err
+		}
 	}
 
 	srcFile, err := os.OpenFile(localPath, os.O_APPEND|os.O_WRONLY, os.ModeAppend)

internal/bridge/ssh_tunnel.go

@@ -246,10 +246,8 @@ func (t *Tunnel) bindTunnel(ctx context.Context, wg *sync.WaitGroup, hasError *b
 			}
 		}()
 
-		select {
-		case <-ctx.Done():
-			return
-		}
+		<-ctx.Done()
+		return
 	}
 }
 

internal/bridge/winrm.go

@@ -1,6 +1,7 @@
 package bridge
 
 import (
+	"context"
 	"strconv"
 	"strings"
 
@@ -38,6 +39,6 @@ func VerifyWinRm(username, password, host, port string, secure bool) bool {
 		return false
 	}
 
-	stdout, _, _, _ := client.RunWithString("hostname", "")
+	stdout, _, _, _ := client.RunWithContextWithString(context.TODO(), "hostname", "")
 	return strings.TrimSpace(stdout) != ""
 }

internal/liman/credentials.go

@@ -26,10 +26,13 @@ func GetCredentials(user *models.User, server *models.Server) (*models.Credentia
 		}
 	}
 
-	json.Unmarshal(
+	err := json.Unmarshal(
 		[]byte(serverKey.Data),
 		encryptedKey,
 	)
+	if err != nil {
+		return nil, err
+	}
 
 	credentials := encryptedKey.DecryptData(&models.User{ID: encrypterUser}, server)
 	credentials.Type = serverKey.Type