Made installable on more versions of python

calebmadrigal · calebmadrigal · commit c3ea42dcb5aa · 2018-05-02T23:09:00.000-05:00
diff --git a/README.md b/README.md
@@ -8,8 +8,6 @@ PyPI page: https://pypi.python.org/pypi/trackerjacker
 
     pip3 install trackerjacker
 
-(Note: Only works on Python 3.6.x right now - other versions will be supported once one of the dependencies fixes an installation bug: https://bitbucket.org/ruamel/yaml/issues/198/pip-install-issue-runtimeerror-dictionary)
-
 *Supported platforms*: Linux (tested on Ubuntu, Kali, and RPi) and macOS (pre-alpha)
 
 ![visual description](https://i.imgur.com/I5NH5KM.jpg)
@@ -299,10 +297,10 @@ Note that trackerjacker will automatically switch channels as necessary during n
 - [x] Fox hunt mode
 - [x] Tracking by SSID (and not just BSSID)
 - [x] Basic macOS (OS X) support (pre-alpha)
+- [ ] macOS support: get signal strength values correct (will be fixed in https://github.com/secdev/scapy/pull/1381
 - [ ] macOS support: reverse airport binary to determine how to set true monitor mode
 - [ ] macOS support: diverse interface support (not just `en0`)
 - [ ] macOS support: get interface supported channels
-- [ ] macOS support: get signal strength values correct
 - [ ] Mapping a specific SSID
 - [ ] Performance enhancement: not shelling out for channel switching
 - [ ] "Jack" mode - deauth attacks
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-scapy>=2.4.0
+scapy==2.4.0
 pyaml>=17.12.1
-ruamel.yaml>=0.15.35
+ruamel.yaml==0.15.0
 
diff --git a/setup.py b/setup.py
@@ -50,6 +50,7 @@ def get_readme():
         'Topic :: System :: Networking',
         'Topic :: System :: Networking :: Monitoring',
         'Topic :: Security',
-        'Operating System :: POSIX :: Linux'
+        'Operating System :: POSIX :: Linux',
+        'Operating System :: MacOS'
     ],
 )
diff --git a/trackerjacker/__main__.py b/trackerjacker/__main__.py
@@ -99,6 +99,11 @@ def __init__(self,
             self.logger.info('Map output file: %s', self.map_file)
             if os.path.exists(self.map_file):
                 self.dot11_map = dot11_mapper.Dot11Map.load_from_file(self.map_file)
+                if self.dot11_map:
+                    self.logger.info('Loaded %d devices and %d ssids from %s',
+                                     len(self.dot11_map.devices),
+                                     len(self.dot11_map.ssid_to_access_point),
+                                     self.map_file)
             else:
                 self.logger.warning('Specified map file not found - creating new map file.')
 
@@ -206,7 +211,7 @@ def start(self):
             try:
                 # macOS
                 if platform.system() == 'Darwin':
-                    self.logger.warning('trackerjacker macOS support is pre-alpha - most functionality is linux-only')
+                    self.logger.warning('macOS support is pre-alpha - many improvements coming soon')
                     scapy.sniff(iface=self.iface_manager.iface, monitor=True, prn=self.process_packet, store=0)
                     break
                 # linux
diff --git a/trackerjacker/dot11_frame.py b/trackerjacker/dot11_frame.py
@@ -59,13 +59,14 @@ def __init__(self, frame, channel=0, iface=None):
                 #print('Error decoding ssid: {}'.format(frame[scapy.Dot11Elt].info))
 
         if frame.haslayer(scapy.RadioTap):
-            try:
-                self.signal_strength = frame[scapy.RadioTap].dbm_antsignal
-            except AttributeError:
-                try:
-                    self.signal_strength = -(256-ord(frame.notdecoded[-4:-3]))
-                except Exception:
-                    self.signal_strength = -257
+            # This will be uncommented once this scapy PR is merged: https://github.com/secdev/scapy/pull/1381
+            #try:
+            #    self.signal_strength = frame[scapy.RadioTap].dBm_AntSignal
+            #except AttributeError:
+            #    try:
+            self.signal_strength = -(256-ord(frame.notdecoded[-4:-3]))
+            #    except Exception:
+            #        self.signal_strength = -257
 
     def frame_type(self):
         """Returns the 802.11 frame type."""
diff --git a/trackerjacker/version.py b/trackerjacker/version.py
@@ -1 +1 @@
-__version__ = "1.8.0"
+__version__ = "1.8.1"

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ def get_readme():`
`50`	`50`	`'Topic :: System :: Networking',`
`51`	`51`	`'Topic :: System :: Networking :: Monitoring',`
`52`	`52`	`'Topic :: Security',`
`53`		`- 'Operating System :: POSIX :: Linux'`
	`53`	`+ 'Operating System :: POSIX :: Linux',`
	`54`	`+ 'Operating System :: MacOS'`
`54`	`55`	`],`
`55`	`56`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "1.8.0"`
	`1`	`+__version__ = "1.8.1"`