cleanup missed save

internal/goad/optldap/connect.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/5amu/goad/pkg/proxy"
+	"github.com/5amu/goad/pkg/proxyconn"
 	"github.com/go-ldap/ldap/v3"
 )
 
 func connect(host string, port int, useSsl bool) (*ldap.Conn, error) {
 	startConn := func(ssl bool) *ldap.Conn {
-		conn, err := proxy.GetConnection(host, port)
+		conn, err := proxyconn.GetConnection(host, port)
 		if err != nil {
 			return nil
 		}

internal/goad/optldap/helpers.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/5amu/goad/pkg/proxy"
+	"github.com/5amu/goad/pkg/proxyconn"
 	ldapfingerprint "github.com/praetorian-inc/fingerprintx/pkg/plugins/services/ldap"
 )
 
@@ -109,7 +109,7 @@ func UACFilter(prop UserAccountControl) string {
 }
 
 func IsLDAP(host string, port int) bool {
-	conn, err := proxy.GetConnection(host, port)
+	conn, err := proxyconn.GetConnection(host, port)
 	if err != nil {
 		return false
 	}

internal/goad/optssh/connection.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/5amu/goad/pkg/proxy"
+	"github.com/5amu/goad/pkg/proxyconn"
 	"golang.org/x/crypto/ssh"
 )
 
 func connect(user string, signer ssh.AuthMethod, host string, port int) (*ssh.Client, error) {
-	conn, err := proxy.GetConnection(host, port)
+	conn, err := proxyconn.GetConnection(host, port)
 	if err != nil {
 		return nil, err
 	}
@@ -112,7 +112,7 @@ func ParseBanner(s string) string {
 }
 
 func GrabBanner(host string, port int) (string, error) {
-	conn, err := proxy.GetConnection(host, port)
+	conn, err := proxyconn.GetConnection(host, port)
 	if err != nil {
 		return "", err
 	}

internal/goad/optwinrm/winrm.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/5amu/goad/internal/printer"
 	"github.com/5amu/goad/internal/utils"
-	putils "github.com/5amu/goad/pkg/proxy"
+	putils "github.com/5amu/goad/pkg/proxyconn"
 	"github.com/5amu/goad/pkg/smb"
 	"github.com/masterzen/winrm"
 )

pkg/kerberos/kclient/network.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/5amu/goad/pkg/proxy"
+	"github.com/5amu/goad/pkg/proxyconn"
 	"github.com/jcmturner/gokrb5/v8/iana/errorcode"
 	"github.com/jcmturner/gokrb5/v8/messages"
 )
@@ -103,7 +103,7 @@ func dialSendUDP(kdcs map[int]string, b []byte) ([]byte, error) {
 			return nil, err
 		}
 
-		conn, err := proxy.GetConnectionUDP(host, port)
+		conn, err := proxyconn.GetConnectionUDP(host, port)
 		if err != nil {
 			errs = append(errs, fmt.Sprintf("error setting dial timeout on connection to %s: %v", kdcs[i], err))
 			continue
@@ -177,7 +177,7 @@ func dialSendTCP(kdcs map[int]string, b []byte) ([]byte, error) {
 			return nil, err
 		}
 
-		conn, err := proxy.GetConnection(host, port)
+		conn, err := proxyconn.GetConnection(host, port)
 		if err != nil {
 			errs = append(errs, fmt.Sprintf("error setting dial timeout on connection to %s: %v", kdcs[i], err))
 			continue

pkg/proxy/proxy.go → pkg/proxyconn/proxy.go

@@ -1,4 +1,4 @@
-package utils
+package proxyconn
 
 import (
 	"fmt"

pkg/smb/smb.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/5amu/goad/pkg/proxy"
+	"github.com/5amu/goad/pkg/proxyconn"
 	"github.com/hirochachacha/go-smb2"
 	"github.com/praetorian-inc/fingerprintx/pkg/plugins"
 	smbfingerprint "github.com/praetorian-inc/fingerprintx/pkg/plugins/services/smb"
@@ -36,7 +36,7 @@ func (i *SMBInfo) String() string {
 }
 
 func getMetadata(host string) (*plugins.ServiceSMB, error) {
-	conn, err := proxy.GetConnection(host, 445)
+	conn, err := proxyconn.GetConnection(host, 445)
 	if err != nil {
 		return nil, err
 	}
@@ -87,7 +87,7 @@ func GatherSMBInfo(host string) (*SMBInfo, error) {
 }
 
 func getSMBInfo(host string, setupSession, v1 bool) (*zgrabsmb.SMBLog, error) {
-	conn, err := proxy.GetConnection(host, 445)
+	conn, err := proxyconn.GetConnection(host, 445)
 	if err != nil {
 		return nil, err
 	}
@@ -118,7 +118,7 @@ func NewClient(host string, port int, domain string) *Client {
 }
 
 func (c *Client) authenticate(username, password, hash string) error {
-	conn, err := proxy.GetConnection(c.Host, c.Port)
+	conn, err := proxyconn.GetConnection(c.Host, c.Port)
 	if err != nil {
 		return err
 	}