trackerjacker 2.1.0__tar.gz → 2.2.0__tar.gz

{trackerjacker-2.1.0/trackerjacker.egg-info → trackerjacker-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trackerjacker
-Version: 2.1.0
+Version: 2.2.0
 Summary: Finds and tracks wifi devices through raw 802.11 monitoring
 Home-page: https://github.com/calebmadrigal/trackerjacker
 Author: Caleb Madrigal

trackerjacker-2.2.0/tests/test_dot11map.py

@@ -0,0 +1,119 @@
+# pylint: disable=C0111, C0413, C0103, E0401, R0903
+import os
+import sys
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+
+import unittest
+import trackerjacker.dot11_mapper as dot11_mapper
+import trackerjacker.dot11_frame as dot11_frame
+
+
+class FakePayload:
+    def __init__(self):
+        self.payload = None
+
+
+class FakeDot11Elt:
+    def __init__(self, element_id, info, payload=None):
+        self.ID = element_id
+        self.info = info
+        self.payload = payload if payload is not None else FakePayload()
+
+
+class FakeRadioTap:
+    dBm_AntSignal = -42
+
+
+class FakeFrame:
+    def __init__(self, addr1, addr2, addr3, frame_type, fcfield=0, elements=None,
+                 has_beacon=False, has_probe_resp=False):
+        self.addr1 = addr1
+        self.addr2 = addr2
+        self.addr3 = addr3
+        self.type = frame_type
+        self.FCfield = fcfield
+        self._elements = elements
+        self._has_beacon = has_beacon
+        self._has_probe_resp = has_probe_resp
+
+    def haslayer(self, layer):
+        if layer is dot11_frame.scapy.Dot11Elt:
+            return self._elements is not None
+        if layer is dot11_frame.scapy.Dot11Beacon:
+            return self._has_beacon
+        if layer is dot11_frame.scapy.Dot11ProbeResp:
+            return self._has_probe_resp
+        if layer is dot11_frame.scapy.RadioTap:
+            return True
+        return False
+
+    def getlayer(self, layer):
+        if layer is dot11_frame.scapy.Dot11Elt:
+            return self._elements
+        return None
+
+    def __getitem__(self, layer):
+        if layer is dot11_frame.scapy.Dot11Elt:
+            return self._elements
+        if layer is dot11_frame.scapy.RadioTap:
+            return FakeRadioTap()
+        raise KeyError(layer)
+
+    def __len__(self):
+        return 128
+
+
+class Dot11MapperTest(unittest.TestCase):
+    def test_trim_frames_to_window(self):
+        frames = [(1521090725, 0), (1521090726, 100), (1521090727, 200), (1521090728, 300),
+                  (1521090729, 400), (1521090730, 500), (1521090731, 600), (1521090732, 700),
+                  (1521090733, 800), (1521090734, 900), (1521090735, 1000), (1521090736, 1100),
+                  (1521090737, 1200), (1521090738, 1300), (1521090739, 1400), (1521090740, 1500)]
+        expected_trimmed_frames = [(1521090736, 1100), (1521090737, 1200),
+                                   (1521090738, 1300), (1521090739, 1400), (1521090740, 1500)]
+        now = 1521090740.4395268
+        window = 5  # seconds
+        trimmed_frames = dot11_mapper.trim_frames_to_window(frames, window, now=now)
+        self.assertEqual(expected_trimmed_frames, trimmed_frames)
+
+    def test_access_point_channels_use_advertised_channel(self):
+        ds_set = FakeDot11Elt(3, bytes([6]))
+        beacon = FakeFrame(addr1='ff:ff:ff:ff:ff:ff',
+                           addr2='00:11:22:33:44:55',
+                           addr3='00:11:22:33:44:55',
+                           frame_type=dot11_frame.Dot11Frame.DOT11_FRAME_TYPE_MANAGEMENT,
+                           elements=ds_set,
+                           has_beacon=True)
+        parsed_beacon = dot11_frame.Dot11Frame(beacon, channel=11)
+
+        wifi_map = dot11_mapper.Dot11Map()
+        wifi_map.add_frame(parsed_beacon)
+
+        self.assertEqual({6}, wifi_map.access_points['00:11:22:33:44:55']['channels'])
+
+    def test_access_point_data_frame_channel_is_only_fallback(self):
+        wifi_map = dot11_mapper.Dot11Map()
+
+        ds_set = FakeDot11Elt(3, bytes([6]))
+        beacon = FakeFrame(addr1='ff:ff:ff:ff:ff:ff',
+                           addr2='00:11:22:33:44:55',
+                           addr3='00:11:22:33:44:55',
+                           frame_type=dot11_frame.Dot11Frame.DOT11_FRAME_TYPE_MANAGEMENT,
+                           elements=ds_set,
+                           has_beacon=True)
+        wifi_map.add_frame(dot11_frame.Dot11Frame(beacon, channel=11))
+
+        data_frame = FakeFrame(addr1='00:11:22:33:44:55',
+                               addr2='66:77:88:99:aa:bb',
+                               addr3='cc:dd:ee:ff:00:11',
+                               frame_type=dot11_frame.Dot11Frame.DOT11_FRAME_TYPE_DATA,
+                               fcfield=dot11_frame.Dot11Frame.TO_DS)
+        wifi_map.add_frame(dot11_frame.Dot11Frame(data_frame, channel=44))
+
+        ap_node = wifi_map.access_points['00:11:22:33:44:55']
+        self.assertEqual({6}, ap_node['channels'])
+        self.assertEqual({'66:77:88:99:aa:bb', 'cc:dd:ee:ff:00:11'}, ap_node['devices'])
+
+
+if __name__ == '__main__':
+    unittest.main()

{trackerjacker-2.1.0 → trackerjacker-2.2.0}/trackerjacker/dot11_frame.py

@@ -15,12 +15,27 @@ class Dot11Frame:
     DOT11_FRAME_TYPE_CONTROL = 1
     DOT11_FRAME_TYPE_DATA = 2
 
+    @staticmethod
+    def _iter_dot11_elements(frame):
+        elt = frame.getlayer(scapy.Dot11Elt)
+        while elt and hasattr(elt, 'ID') and hasattr(elt, 'info'):
+            yield elt
+            elt = elt.payload if hasattr(elt, 'payload') else None
+
+    @classmethod
+    def _get_advertised_channel(cls, frame):
+        for elt in cls._iter_dot11_elements(frame):
+            if elt.ID in (3, 61) and elt.info:
+                return elt.info[0]
+        return None
+
     def __init__(self, frame, channel=0, iface=None):
         self.frame = frame
         self.bssid = None
         self.ssid = None
         self.signal_strength = 0
         self.channel = channel
+        self.advertised_channel = None
         self.iface = iface
         self.frame_bytes = len(frame)
 
@@ -50,6 +65,7 @@ class Dot11Frame:
 
         if (frame.haslayer(scapy.Dot11Elt) and
                 (frame.haslayer(scapy.Dot11Beacon) or frame.haslayer(scapy.Dot11ProbeResp))):
+            self.advertised_channel = self._get_advertised_channel(frame)
 
             try:
                 self.ssid = frame[scapy.Dot11Elt].info.decode().replace('\x00', '[NULL]')

{trackerjacker-2.1.0 → trackerjacker-2.2.0}/trackerjacker/dot11_mapper.py

@@ -131,7 +131,7 @@ class Dot11Map:
             ap_node = {'bssid': bssid,
                        'ssid': frame.ssid,
                        'vendor': self.mac_vendor_db.lookup(bssid),
-                       'channels': {frame.channel},
+                       'channels': set(),
                        'devices': set(),
                        'frames': []}
             self.access_points[bssid] = ap_node
@@ -163,11 +163,14 @@ class Dot11Map:
         if frame.signal_strength:
             ap_node['signal'] = frame.signal_strength
 
-        # Only associate with channels and devices for data packets since, for example, APs
-        # send beacons on channels that they don't actually communicate on.
+        if frame.advertised_channel:
+            ap_node['channels'] |= {frame.advertised_channel}
+
+        # Data frames do not advertise the AP channel, so use the sniffing channel as a fallback there.
         if frame.frame_type() == dot11_frame.Dot11Frame.DOT11_FRAME_TYPE_DATA:
             ap_node['devices'] |= (frame.macs - MACS_TO_IGNORE - {bssid})
-            ap_node['channels'] |= {frame.channel}
+            if not ap_node['channels']:
+                ap_node['channels'] |= {frame.channel}
 
         ap_node['frames'].append((time.time(), frame.frame_bytes))
 

trackerjacker-2.2.0/trackerjacker/version.py

@@ -0,0 +1 @@
+__version__ = "2.2.0"

{trackerjacker-2.1.0 → trackerjacker-2.2.0/trackerjacker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trackerjacker
-Version: 2.1.0
+Version: 2.2.0
 Summary: Finds and tracks wifi devices through raw 802.11 monitoring
 Home-page: https://github.com/calebmadrigal/trackerjacker
 Author: Caleb Madrigal

trackerjacker-2.1.0/tests/test_dot11map.py

@@ -1,25 +0,0 @@
-# pylint: disable=C0111, C0413, C0103, E0401, R0903
-import os
-import sys
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-
-import unittest
-import trackerjacker.dot11_mapper as dot11_mapper
-
-
-class Dot11MapperTest(unittest.TestCase):
-    def test_trim_frames_to_window(self):
-        frames = [(1521090725, 0), (1521090726, 100), (1521090727, 200), (1521090728, 300),
-                  (1521090729, 400), (1521090730, 500), (1521090731, 600), (1521090732, 700),
-                  (1521090733, 800), (1521090734, 900), (1521090735, 1000), (1521090736, 1100),
-                  (1521090737, 1200), (1521090738, 1300), (1521090739, 1400), (1521090740, 1500)]
-        expected_trimmed_frames = [(1521090736, 1100), (1521090737, 1200),
-                                   (1521090738, 1300), (1521090739, 1400), (1521090740, 1500)]
-        now = 1521090740.4395268
-        window = 5  # seconds
-        trimmed_frames = dot11_mapper.trim_frames_to_window(frames, window, now=now)
-        self.assertEqual(expected_trimmed_frames, trimmed_frames)
-
-
-if __name__ == '__main__':
-    unittest.main()

trackerjacker-2.1.0/trackerjacker/version.py

@@ -1 +0,0 @@
-__version__ = "2.1.0"