centralize endian encoding, limit debug string/hex output

Author: PeterPaul-Perfana

gatlingparser/decoders.go

@@ -18,13 +18,26 @@ const (
 
 func ReadInt(reader *bufio.Reader) (int32, error) {
 	var int32Value int32
-	err := binary.Read(reader, binary.BigEndian, &int32Value)
+	err := binary.Read(reader, currentByteOrder(), &int32Value)
 	return int32Value, err
 }
 
+func currentByteOrder() binary.ByteOrder {
+	var order binary.ByteOrder = binary.BigEndian
+	//if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
+	//	order = binary.LittleEndian
+	//}
+	//l.Debugf("Using byte order: %v for OS: %s, ARCH: %s",
+	//	order == binary.LittleEndian,
+	//	runtime.GOOS,
+	//	runtime.GOARCH,
+	//)
+	return order
+}
+
 func ReadLong(reader *bufio.Reader) (int64, error) {
 	var int64Value int64
-	err := binary.Read(reader, binary.BigEndian, &int64Value)
+	err := binary.Read(reader, currentByteOrder(), &int64Value)
 	return int64Value, err
 }
 
@@ -46,6 +59,10 @@ func ReadString(reader *bufio.Reader) (string, error) {
 		return "", fmt.Errorf("invalid string length: %d", strLength)
 	}
 
+	if strLength > 2000 {
+		return "", fmt.Errorf("invalid string length: %d", strLength)
+	}
+
 	strBytes := make([]byte, strLength)
 	_, err = reader.Read(strBytes)
 	if err != nil {
@@ -191,16 +208,24 @@ func ReadHeader(reader *bufio.Reader) (RunMessage, []string, [][]byte, error) {
 }
 
 func ReadGroup(reader *bufio.Reader) (*Group, error) {
+	const maxHierarchyLength = 2000 // adjust to needs
+
 	hierarchyLength, err := ReadInt(reader)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to read hierarchy length: %w", err)
+	}
+
+	// Validate the length before allocating slice
+	if hierarchyLength < 0 || hierarchyLength > maxHierarchyLength {
+		return nil, fmt.Errorf("invalid hierarchy length: %d (must be between 0 and %d)",
+			hierarchyLength, maxHierarchyLength)
 	}
 
 	hierarchy := make([]string, hierarchyLength)
 	for i := int32(0); i < hierarchyLength; i++ {
 		hierarchy[i], err = ReadCachedSanitizedString(reader)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("failed to read hierarchy element %d: %w", i, err)
 		}
 	}
 

gatlingparser/gatlingparser.go

@@ -458,8 +458,13 @@ func stringProcessor(lineBuffer []byte) error {
 		return err
 	default:
 		// If the line buffer contains unknown characters, convert bytes to hex string for better debugging
-		hexLineBuffer := fmt.Sprintf("%X", lineBuffer)
-		return fmt.Errorf("Unknown line type encountered: %s (hex: %s)", lineBuffer, hexLineBuffer)
+		// hexLineBuffer := fmt.Sprintf("%X", lineBuffer)
+		//return fmt.Errorf("Unknown line type encountered: %s (hex: %s)", lineBuffer, hexLineBuffer)
+		// If string is longer than 24 chars, truncate it
+		if len(lineBuffer) > 24 {
+			lineBuffer = lineBuffer[:24]
+		}
+		return fmt.Errorf("Unknown line type encountered: %s", lineBuffer)
 	}
 }
 
@@ -471,7 +476,7 @@ func detectGatlingLogVersion(file *os.File) (string, error) {
 		}
 	}()
 	var firstByte byte
-	if err := binary.Read(file, binary.BigEndian, &firstByte); err != nil {
+	if err := binary.Read(file, currentByteOrder(), &firstByte); err != nil {
 		if err == io.EOF {
 			return "", fmt.Errorf("file is empty")
 		}
@@ -561,7 +566,7 @@ ParseLoop:
 
 func processLogHeader(reader *bufio.Reader) (*RunMessage, []string, error) {
 	var recordType byte
-	err := binary.Read(reader, binary.BigEndian, &recordType)
+	err := binary.Read(reader, currentByteOrder(), &recordType)
 	if err != nil {
 		return nil, nil, err
 	}