github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-06 04:52:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

new: parsing wps wfa version2 field

Browse source
This commit is contained in:
evilsocket 2019-01-28 12:12:58 +01:00
parent 53d07298b7
commit cac366913a
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
1 changed files with 83 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

90
packets/dot11_wps.go
View file

@ -28,6 +28,9 @@ type wpsAttr struct {
var (
wpsSignatureBytes = []byte{0x00, 0x50, 0xf2, 0x04}
wfaExtensionBytes = []byte{0x00, 0x37, 0x2a}
wpsVersion2ID = uint8(0x00)
wpsAttributes = map[uint16]wpsAttr{
0x104A: wpsAttr{Name: "Version", Desc: map[string]string{
"10": "1.0",
@ -37,8 +40,6 @@ var (
"01": "Not Configured",
"02": "Configured",
}},
0x1057: wpsAttr{Name: "AP Setup Locked"},
0x1041: wpsAttr{Name: "Selected Registrar"},
0x1012: wpsAttr{Name: "Device Password ID", Desc: map[string]string{
"0000": "Pin",
"0004": "PushButton",
@ -49,6 +50,9 @@ var (
"02": "Registrar",
"03": "AP",
}},
0x1049: wpsAttr{Name: "Vendor Extension", Func: dot11ParseWPSVendorExtension},
0x1057: wpsAttr{Name: "AP Setup Locked"},
0x1041: wpsAttr{Name: "Selected Registrar"},
0x1047: wpsAttr{Name: "UUID-E"},
0x1021: wpsAttr{Name: "Manufacturer", Type: wpsStr},
0x1023: wpsAttr{Name: "Model Name", Type: wpsStr},
@ -61,7 +65,6 @@ var (
0x103C: wpsAttr{Name: "RF Bands", Func: dott11ParseWPSBands},
0x1045: wpsAttr{Name: "SSID", Type: wpsStr},
0x102D: wpsAttr{Name: "OS Version", Type: wpsStr},
0x1049: wpsAttr{Name: "Vendor Extension"},
}
wpsConfigs = map[uint16]string{
@ -120,23 +123,52 @@ func dot11ParseWPSConfigMethods(data []byte) string {
return hex.EncodeToString(data)
}
func dot11ParseWPSData(data []byte) (ok bool, info map[string]string) {
info = map[string]string{}
func dot11ParseWPSVendorExtension(data []byte) string {
if len(data) > 3 && bytes.Equal(data[0:3], wfaExtensionBytes) {
size := len(data)
for offset := 3; offset < size; {
idByte := uint8(data[offset])
sizeByte := uint8(data[offset+1])
if idByte == wpsVersion2ID {
return fmt.Sprintf("version2=0x%x", data[offset+2])
}
offset += int(sizeByte) + 2
}
}
return hex.EncodeToString(data)
}
for offset := 0; offset < size; {
tagId := binary.BigEndian.Uint16(data[offset:])
offset += 2
tagLen := binary.BigEndian.Uint16(data[offset:])
offset += 2
tagData := data[offset : offset+int(tagLen)]
func wpsUint16At(data []byte, size int, offset *int) (bool, uint16) {
if *offset <= size-2 {
off := *offset
*offset += 2
return true, binary.BigEndian.Uint16(data[off:])
}
// fmt.Printf("uint16At( data(%d), off=%d )\n", size, *offset)
return false, 0
}
if attr, found := wpsAttributes[tagId]; found {
func wpsDataAt(data []byte, size int, offset *int, num int) (bool, []byte) {
max := size - num
if *offset <= max {
off := *offset
*offset += num
return true, data[off : off+num]
}
// fmt.Printf("dataAt( data(%d), off=%d, num=%d )\n", size, *offset, num)
return false, nil
}
func dot11ParseWPSTag(id uint16, size uint16, data []byte, info *map[string]string) {
name := ""
val := ""
if attr, found := wpsAttributes[id]; found {
name = attr.Name
if attr.Type == wpsStr {
val = string(tagData)
val = string(data)
} else {
val = hex.EncodeToString(tagData)
val = hex.EncodeToString(data)
}
if attr.Desc != nil {
@ -146,15 +178,35 @@ func dot11ParseWPSData(data []byte) (ok bool, info map[string]string) {
}
if attr.Func != nil {
val = attr.Func(tagData)
val = attr.Func(data)
}
info[attr.Name] = val
} else {
info[fmt.Sprintf("0x%X", tagId)] = hex.EncodeToString(tagData)
name = fmt.Sprintf("0x%X", id)
val = hex.EncodeToString(data)
}
offset += int(tagLen)
(*info)[name] = val
}
func dot11ParseWPSData(data []byte) (ok bool, info map[string]string) {
info = map[string]string{}
size := len(data)
for offset := 0; offset < size; {
ok := false
tagId := uint16(0)
tagLen := uint16(0)
tagData := []byte(nil)
if ok, tagId = wpsUint16At(data, size, &offset); !ok {
break
} else if ok, tagLen = wpsUint16At(data, size, &offset); !ok {
break
} else if ok, tagData = wpsDataAt(data, size, &offset, int(tagLen)); !ok {
break
} else {
dot11ParseWPSTag(tagId, tagLen, tagData, &info)
}
}
return true, info