fix: resolve SSL field type, RPC failure check, generated package name, and context support

.github/workflows/ci.yml

@@ -20,5 +20,8 @@ jobs:
       - name: Vet
         run: go vet ./...
 
+      - name: Verify module
+        run: go mod verify
+
       - name: Test
         run: go test ./...

examples/main.go

@@ -1,22 +1,35 @@
 package main
 
-// running some tests on the lib
 import (
 	"context"
 	"fmt"
 	"log"
+	"os"
 
 	"github.com/arisinghackers/goxploit/pkg/metasploit"
 	"github.com/arisinghackers/goxploit/pkg/msfrpc"
 )
 
+func env(key, fallback string) string {
+	if v := os.Getenv(key); v != "" {
+		return v
+	}
+	return fallback
+}
+
 func main() {
+	host := env("MSF_HOST", "127.0.0.1")
+	port := 3000
+	ssl := env("MSF_SSL", "false")
+	webURI := env("MSF_WEB_URI", "/api")
+	user := env("MSF_USER", "msf")
+	pass := env("MSF_PASS", "msf")
 
-	client := msfrpc.NewMsfRpcClient("killodds", "false", "veemweaver", "127.0.0.1", 3000, "/api")
+	client := msfrpc.NewMsfRpcClient(pass, ssl, user, host, port, webURI)
 	typedClient := metasploit.NewClient(client)
 	ctx := context.Background()
 
-	login, err := typedClient.Auth.LoginContext(ctx, "veemweaver", "killodds")
+	login, err := typedClient.Auth.LoginContext(ctx, user, pass)
 	if err != nil {
 		log.Fatalf("Error authenticating: %v", err)
 	}
@@ -27,5 +40,4 @@ func main() {
 		log.Fatal(err)
 	}
 	fmt.Printf("Metasploit Core Version: %s (ruby=%s api=%s)\n", version.Version, version.Ruby, version.API)
-
 }

internal/generator/library.go

@@ -50,8 +50,9 @@ func (g *LibraryGenerator) GenerateLibrary() error {
 		builder := &strings.Builder{}
 
 		builder.WriteString("// Code generated by goxploit msfrpc LibraryGenerator. DO NOT EDIT.\n\n")
-		builder.WriteString("package metasploit\n\n")
+		builder.WriteString("package generated\n\n")
 		builder.WriteString("import (")
+		builder.WriteString("\n\t\"context\"")
 		builder.WriteString("\n\t\"errors\"")
 		builder.WriteString("\n\t\"fmt\"")
 		builder.WriteString("\n\t\"github.com/arisinghackers/goxploit/pkg/msfrpc\"")
@@ -81,6 +82,7 @@ func (g *LibraryGenerator) GenerateLibrary() error {
 			funcName := toCamelCase(rawMethod)
 
 			params := []string{}
+			paramNames := []string{}
 			args := []string{fmt.Sprintf(`"%s"`, method[0])}
 			requiresAuth := false
 
@@ -93,6 +95,7 @@ func (g *LibraryGenerator) GenerateLibrary() error {
 					}
 					args = append(args, param)
 					params = append(params, fmt.Sprintf("%s string", param))
+					paramNames = append(paramNames, param)
 					continue
 				}
 
@@ -102,13 +105,21 @@ func (g *LibraryGenerator) GenerateLibrary() error {
 					args = append(args, val)
 				}
 				params = append(params, fmt.Sprintf("%s string", val))
+				paramNames = append(paramNames, val)
 			}
 
+			// Non-context wrapper delegates to context version.
 			builder.WriteString(fmt.Sprintf("func (c *%s) %s(%s) (map[string]interface{}, error) {\n", className, funcName, strings.Join(params, ", ")))
+			builder.WriteString(fmt.Sprintf("\treturn c.%sContext(context.Background(), %s)\n", funcName, strings.Join(paramNames, ", ")))
+			builder.WriteString("}\n\n")
+
+			// Context version with the actual implementation.
+			contextParams := append([]string{"ctx context.Context"}, params...)
+			builder.WriteString(fmt.Sprintf("func (c *%s) %sContext(ctx context.Context, %s) (map[string]interface{}, error) {\n", className, funcName, strings.Join(contextParams, ", ")))
 			if requiresAuth {
-				builder.WriteString(fmt.Sprintf("\tresp, err := c.AuthenticatedRequest(%s)\n", buildArgsString(args)))
+				builder.WriteString(fmt.Sprintf("\tresp, err := c.AuthenticatedRequestContext(ctx, %s)\n", buildArgsString(args)))
 			} else {
-				builder.WriteString(fmt.Sprintf("\tresp, err := c.MsfRequest(%s)\n", buildArgsString(args)))
+				builder.WriteString(fmt.Sprintf("\tresp, err := c.MsfRequestContext(ctx, %s)\n", buildArgsString(args)))
 			}
 			builder.WriteString("\tif err != nil {\n\t\treturn nil, err\n\t}\n")
 			builder.WriteString("\tif result, ok := resp[\"result\"]; ok && result == \"failure\" {\n")

pkg/metasploit/response.go

@@ -78,15 +78,27 @@ func readInt(resp map[string]interface{}, key string, required bool) (int64, err
 	}
 }
 
+var errRPCFailed = fmt.Errorf("rpc call returned failure")
+
 func checkRPCFailure(resp map[string]interface{}) error {
-	if result, ok := resp["result"]; ok && fmt.Sprintf("%v", result) == "failure" {
-		if msg, exists := resp["error_message"]; exists {
-			return fmt.Errorf("%v", msg)
+	v, ok := resp["result"]
+	if !ok {
+		return nil
+	}
+	switch s := v.(type) {
+	case string:
+		if s != "failure" {
+			return nil
 		}
-		return fmt.Errorf("rpc call returned failure")
+	case []byte:
+		if string(s) != "failure" {
+			return nil
+		}
+	default:
+		return nil
 	}
 	if msg, ok := resp["error_message"]; ok {
 		return fmt.Errorf("%v", msg)
 	}
-	return nil
+	return errRPCFailed
 }

pkg/msfrpc/client.go

@@ -15,7 +15,7 @@ import (
 type MsfRpcClient struct {
 	UserPassword string
 	Token        *string
-	SSL          string
+	UseSSL       bool
 	UserName     string
 	IP           string
 	Port         int
@@ -25,15 +25,16 @@ type MsfRpcClient struct {
 }
 
 func NewMsfRpcClient(userPassword, ssl, userName, ip string, port int, webServerURI string) *MsfRpcClient {
+	useSSL := ssl == "true"
 	protocol := "http://"
-	if ssl == "true" {
+	if useSSL {
 		protocol = "https://"
 	}
 	baseURL := fmt.Sprintf("%s%s:%d%s", protocol, ip, port, webServerURI)
 
 	return &MsfRpcClient{
 		UserPassword: userPassword,
-		SSL:          protocol,
+		UseSSL:       useSSL,
 		UserName:     userName,
 		IP:           ip,
 		Port:         port,