add fix for unicode strings: #122

Author: staaldraad

mapi/datastructs.go

@@ -1864,8 +1864,8 @@ func (queryRows *RopQueryRowsResponse) Unmarshal(resp []byte, properties []Prope
 	queryRows.RowCount, pos = utils.ReadUint16(pos, resp)
 
 	rows := make([][]PropertyRow, queryRows.RowCount)
-	//check if flagged properties
 
+	//loop through the rows
 	for k := 0; k < int(queryRows.RowCount); k++ {
 		trow := PropertyRow{}
 		//check if has flag (is flaggedpropertyrow)
@@ -1887,9 +1887,6 @@ func (queryRows *RopQueryRowsResponse) Unmarshal(resp []byte, properties []Prope
 			} else if property.PropertyType == PtypString {
 				trow.ValueArray, pos = utils.ReadUnicodeString(pos, resp)
 				rows[k] = append(rows[k], trow)
-				if len(trow.ValueArray) > 0 { //empty string means no extra null byte.
-					pos++
-				}
 			} else if property.PropertyType == PtypBinary {
 				cnt, p := utils.ReadUint16(pos, resp)
 				pos = p

utils/utils.go

@@ -233,6 +233,12 @@ func ReadUnicodeString(pos int, buff []byte) ([]byte, int) {
 	//stupid hack as using bufio and ReadString(byte) would terminate too early
 	//would terminate on 0x00 instead of 0x0000
 	index := bytes.Index(buff[pos:], []byte{0x00, 0x00})
+	// https://github.com/sensepost/ruler/issues/122
+	// as pointed out by l0kihardt non-english servers
+	// respond with 0x00,0x00 - english 0x00,0x00,0x00
+	if buff[pos+index+2] == 0x00 {
+		index++ //unicode string end with 0x00 0x00 0x00
+	}
 	if index == -1 {
 		return nil, 0
 	}