Merge pull request #403 from vulncheck-oss/string2uni

Added StringToUnicodeByteArray

Author: j-baines

framework.go

@@ -72,7 +72,6 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver"
-
 	"github.com/vulncheck-oss/go-exploit/c2"
 	"github.com/vulncheck-oss/go-exploit/c2/channel"
 	"github.com/vulncheck-oss/go-exploit/cli"

payload/reverse/vbs.go

@@ -5,10 +5,8 @@ import (
 	"fmt"
 )
 
-var (
-	//go:embed vbs/reverse_http.vbs
-	VBSShell string
-)
+//go:embed vbs/reverse_http.vbs
+var VBSShell string
 
 // Generates a script that can be used to create a reverse shell via vbs (can be run with cscript)
 // original source: https://raw.githubusercontent.com/cym13/vbs-reverse-shell/refs/heads/master/reverse_shell.vbs

random/random_test.go

@@ -47,7 +47,7 @@ func Test_RandLetters(t *testing.T) {
 	}
 
 	for _, value := range letters {
-		if !(int(value) >= 65 && int(value) <= 90) && !(int(value) >= 97 && int(value) <= 122) {
+		if (int(value) < 65 || int(value) > 90) && (int(value) < 97 || int(value) > 122) {
 			t.Error("RandLetters used value outside of ascii letter ranges.")
 		}
 	}
@@ -80,7 +80,7 @@ func Test_RandDigits(t *testing.T) {
 	}
 
 	for _, value := range digits {
-		if !(int(value) >= 48 && int(value) <= 57) {
+		if int(value) < 48 || int(value) > 57 {
 			t.Error("RandDigits used value outside of ascii digit ranges.")
 		}
 	}
@@ -93,7 +93,7 @@ func Test_RandHex(t *testing.T) {
 	}
 
 	for _, value := range hex {
-		if !(int(value) >= 48 && int(value) <= 57) && !(int(value) >= 97 && int(value) <= 102) {
+		if (int(value) < 48 || int(value) > 57) && (int(value) < 97 || int(value) > 102) {
 			t.Error("RandHex used value outside of ascii hex ranges: " + string(value))
 		}
 	}
@@ -106,7 +106,7 @@ func Test_RandLettersRange(t *testing.T) {
 	}
 
 	for _, value := range letters {
-		if !(int(value) >= 65 && int(value) <= 90) && !(int(value) >= 97 && int(value) <= 122) {
+		if (int(value) < 65 || int(value) > 90) && (int(value) < 97 || int(value) > 122) {
 			t.Error("RandLettersRange used value outside of ascii letter ranges.")
 		}
 	}
@@ -119,7 +119,7 @@ func Test_RandHexRange(t *testing.T) {
 	}
 
 	for _, value := range hex {
-		if !(int(value) >= 48 && int(value) <= 57) && !(int(value) >= 97 && int(value) <= 102) {
+		if (int(value) < 48 || int(value) > 57) && (int(value) < 97 || int(value) > 102) {
 			t.Error("RandHex used value outside of ascii hex ranges: " + string(value))
 		}
 	}
@@ -136,7 +136,7 @@ func Test_RandDigitsRange(t *testing.T) {
 	}
 
 	for _, value := range digits {
-		if !(int(value) >= 48 && int(value) <= 57) {
+		if int(value) < 48 || int(value) > 57 {
 			t.Error("RandDigits used value outside of ascii digit ranges.")
 		}
 	}

transform/encode.go

@@ -9,12 +9,23 @@ import (
 	"slices"
 	"strconv"
 	"strings"
+	"unicode/utf16"
 
 	"github.com/vulncheck-oss/go-exploit/output"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 )
 
+func StringToUnicodeByteArray(s string) []byte {
+	//nolint:prealloc
+	var byteArray []byte
+	for _, r := range utf16.Encode([]rune(s)) {
+		byteArray = append(byteArray, byte(r&0xFF), byte(r>>8&0xFF))
+	}
+
+	return byteArray
+}
+
 // Given gzip encoded data, return the decompressed data.
 func Inflate(compressed []byte) ([]byte, bool) {
 	reader, err := gzip.NewReader(bytes.NewBuffer(compressed))