misc: small fix or general refactoring i did not bother commenting

README.md

@@ -16,6 +16,8 @@
     <a href="https://github.com/bettercap/bettercap/actions/workflows/test-on-macos.yml"><img alt="Tests on macOS" src="https://github.com/bettercap/bettercap/actions/workflows/test-on-macos.yml/badge.svg"></a>
     <a href="https://github.com/bettercap/bettercap/actions/workflows/test-on-windows.yml"><img alt="Tests on Windows" src="https://github.com/bettercap/bettercap/actions/workflows/test-on-windows.yml/badge.svg"></a>
     <a href="https://hub.docker.com/r/bettercap/bettercap"><img alt="Docker Hub" src="https://img.shields.io/docker/v/bettercap/bettercap?logo=docker"></a>
+    <img src="https://img.shields.io/badge/human-coded-brightgreen?logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiNmZmZmZmYiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBjbGFzcz0ibHVjaWRlIGx1Y2lkZS1wZXJzb24tc3RhbmRpbmctaWNvbiBsdWNpZGUtcGVyc29uLXN0YW5kaW5nIj48Y2lyY2xlIGN4PSIxMiIgY3k9IjUiIHI9IjEiLz48cGF0aCBkPSJtOSAyMCAzLTYgMyA2Ii8+PHBhdGggZD0ibTYgOCA2IDIgNi0yIi8+PHBhdGggZD0iTTEyIDEwdjQiLz48L3N2Zz4=" alt="This project is 100% made by humans."/>
+
   </p>
 </p>
 

core/banner.go

@@ -2,7 +2,7 @@ package core
 
 const (
 	Name    = "bettercap"
-	Version = "2.41.2"
+	Version = "2.41.4"
 	Author  = "Simone 'evilsocket' Margaritelli"
 	Website = "https://bettercap.org/"
 )

modules/tcp_proxy/tcp_proxy_script.go

@@ -1,6 +1,7 @@
 package tcp_proxy
 
 import (
+	"encoding/json"
 	"net"
 	"strings"
 
@@ -55,23 +56,36 @@ func (s *TcpProxyScript) OnData(from, to net.Addr, data []byte, callback func(ca
 			log.Error("error while executing onData callback: %s", err)
 			return nil
 		} else if ret != nil {
-			// thanks to @LucasParsy for his code and patience :)
+			return toByteArray(ret)
-			if array, ok := ret.([]interface{}); ok {
-				result := make([]byte, len(array))
-				for i, v := range array {
-					if num, ok := v.(float64); ok && num >= 0 && num <= 255 {
-						result[i] = byte(num)
-					} else {
-						log.Error("array element at index %d is not a valid byte value %+v", i, v)
-						return nil
 		}
 	}
+	return nil
+}
 
-				return result
+func toByteArray(ret interface{}) []byte {
+	// this approach is a bit hacky but it handles all cases
+
+	// serialize ret to JSON
+	if jsonData, err := json.Marshal(ret); err == nil {
+		// attempt to deserialize as []float64
+		var back2Array []float64
+		if err := json.Unmarshal(jsonData, &back2Array); err == nil {
+			result := make([]byte, len(back2Array))
+			for i, num := range back2Array {
+				if num >= 0 && num <= 255 {
+					result[i] = byte(num)
 				} else {
-				log.Error("error while casting exported value to array of interface: value = %+v error = %+v", ret, err)
+					log.Error("array element at index %d is not a valid byte value %d", i, num)
-			}
+					return nil
-		}
+				}
-	}
+			}
+			return result
+		} else {
+			log.Error("failed to deserialize %+v to []float64: %v", ret, err)
+		}
+	} else {
+		log.Error("failed to serialize %+v to JSON: %v", ret, err)
+	}
+
 	return nil
 }

modules/tcp_proxy/tcp_proxy_script_test.go

@@ -0,0 +1,169 @@
+package tcp_proxy
+
+import (
+	"net"
+	"testing"
+
+	"github.com/evilsocket/islazy/plugin"
+)
+
+func TestOnData_NoReturn(t *testing.T) {
+	jsCode := `
+		function onData(from, to, data, callback) {
+			// don't return anything
+		}
+	`
+
+	plug, err := plugin.Parse(jsCode)
+	if err != nil {
+		t.Fatalf("Failed to parse plugin: %v", err)
+	}
+
+	script := &TcpProxyScript{
+		Plugin:   plug,
+		doOnData: plug.HasFunc("onData"),
+	}
+
+	from := &net.TCPAddr{IP: net.ParseIP("192.168.1.1"), Port: 1234}
+	to := &net.TCPAddr{IP: net.ParseIP("192.168.1.2"), Port: 5678}
+	data := []byte("test data")
+
+	result := script.OnData(from, to, data, nil)
+	if result != nil {
+		t.Errorf("Expected nil result when callback returns nothing, got %v", result)
+	}
+}
+
+func TestOnData_ReturnsArrayOfIntegers(t *testing.T) {
+	jsCode := `
+		function onData(from, to, data, callback) {
+			// Return modified data as array of integers
+			return [72, 101, 108, 108, 111]; // "Hello" in ASCII
+		}
+	`
+
+	plug, err := plugin.Parse(jsCode)
+	if err != nil {
+		t.Fatalf("Failed to parse plugin: %v", err)
+	}
+
+	script := &TcpProxyScript{
+		Plugin:   plug,
+		doOnData: plug.HasFunc("onData"),
+	}
+
+	from := &net.TCPAddr{IP: net.ParseIP("192.168.1.1"), Port: 1234}
+	to := &net.TCPAddr{IP: net.ParseIP("192.168.1.2"), Port: 5678}
+	data := []byte("test data")
+
+	result := script.OnData(from, to, data, nil)
+	expected := []byte("Hello")
+
+	if result == nil {
+		t.Fatal("Expected non-nil result when callback returns array of integers")
+	}
+
+	if len(result) != len(expected) {
+		t.Fatalf("Expected result length %d, got %d", len(expected), len(result))
+	}
+
+	for i, b := range result {
+		if b != expected[i] {
+			t.Errorf("Expected byte at index %d to be %d, got %d", i, expected[i], b)
+		}
+	}
+}
+
+func TestOnData_ReturnsDynamicArray(t *testing.T) {
+	jsCode := `
+		function onData(from, to, data, callback) {
+			var result = [];
+			for (var i = 0; i < data.length; i++) {
+				result.push((data[i] + 1) % 256);
+			}
+			return result;
+		}
+	`
+
+	plug, err := plugin.Parse(jsCode)
+	if err != nil {
+		t.Fatalf("Failed to parse plugin: %v", err)
+	}
+
+	script := &TcpProxyScript{
+		Plugin:   plug,
+		doOnData: plug.HasFunc("onData"),
+	}
+
+	from := &net.TCPAddr{IP: net.ParseIP("192.168.1.1"), Port: 1234}
+	to := &net.TCPAddr{IP: net.ParseIP("192.168.1.2"), Port: 5678}
+	data := []byte{10, 20, 30, 40, 255}
+
+	result := script.OnData(from, to, data, nil)
+	expected := []byte{11, 21, 31, 41, 0} // 255 + 1 = 256 % 256 = 0
+
+	if result == nil {
+		t.Fatal("Expected non-nil result when callback returns array of integers")
+	}
+
+	if len(result) != len(expected) {
+		t.Fatalf("Expected result length %d, got %d", len(expected), len(result))
+	}
+
+	for i, b := range result {
+		if b != expected[i] {
+			t.Errorf("Expected byte at index %d to be %d, got %d", i, expected[i], b)
+		}
+	}
+}
+
+func TestOnData_ReturnsMixedArray(t *testing.T) {
+	jsCode := `
+		function charToInt(value) { 
+			return value.charCodeAt()
+		}
+
+		function onData(from, to, data) {
+			st_data = String.fromCharCode.apply(null, data)  
+			if( st_data.indexOf("mysearch") != -1 ) {
+				payload = "mypayload";
+				st_data = st_data.replace("mysearch", payload);
+				res_int_arr = st_data.split("").map(charToInt) // []uint16
+				res_int_arr[0] = payload.length + 1; // first index is float64 and rest []uint16
+				return res_int_arr;
+			}
+			return data;
+		}
+	`
+
+	plug, err := plugin.Parse(jsCode)
+	if err != nil {
+		t.Fatalf("Failed to parse plugin: %v", err)
+	}
+
+	script := &TcpProxyScript{
+		Plugin:   plug,
+		doOnData: plug.HasFunc("onData"),
+	}
+
+	from := &net.TCPAddr{IP: net.ParseIP("192.168.1.1"), Port: 1234}
+	to := &net.TCPAddr{IP: net.ParseIP("192.168.1.6"), Port: 5678}
+	data := []byte("Hello mysearch world")
+
+	result := script.OnData(from, to, data, nil)
+	expected := []byte("\x0aello mypayload world")
+
+	if result == nil {
+		t.Fatal("Expected non-nil result when callback returns array of integers")
+	}
+
+	if len(result) != len(expected) {
+		t.Fatalf("Expected result length %d, got %d", len(expected), len(result))
+	}
+
+	for i, b := range result {
+		if b != expected[i] {
+			t.Errorf("Expected byte at index %d to be %d, got %d", i, expected[i], b)
+		}
+	}
+}

modules/wifi/wifi_test.go

@@ -518,37 +518,6 @@ func TestWiFiModuleProbe(t *testing.T) {
 	}
 }
 
-func TestWiFiModuleChannelSwitchAnnounce(t *testing.T) {
-	sess := createMockSession()
-	mod := NewWiFiModule(sess)
-
-	// Test CSA handler
-	handlers := mod.Handlers()
-	var csaHandler session.ModuleHandler
-	for _, h := range handlers {
-		if h.Name == "wifi.channel_switch_announce bssid channel " {
-			csaHandler = h
-			break
-		}
-	}
-
-	if csaHandler.Name == "" {
-		t.Fatal("CSA handler not found")
-	}
-
-	// Test with valid parameters
-	err := csaHandler.Exec([]string{"aa:bb:cc:dd:ee:ff", "11"})
-	if err == nil {
-		t.Error("Expected error when running CSA without running module")
-	}
-
-	// Test with invalid channel
-	err = csaHandler.Exec([]string{"aa:bb:cc:dd:ee:ff", "999"})
-	if err == nil {
-		t.Error("Expected error with invalid channel")
-	}
-}
-
 func TestWiFiModuleFakeAuth(t *testing.T) {
 	sess := createMockSession()
 	mod := NewWiFiModule(sess)