alexandre/wifite2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Comparisons to singletons like None should always be done with is or is not, never the equality operators.

Browse Source
This commit is contained in:
deix
2017-08-28 17:51:27 +02:00
parent d9330ef698
commit 00e5246f96
12 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
py/Aircrack.py
View File

@@ -26,14 +26,14 @@ class Aircrack(object):
def is_running(self):
return self.pid.poll() == None
return self.pid.poll() is None
def is_cracked(self):
return os.path.exists(self.cracked_file)
def stop(self):
''' Stops aircrack process '''
if self.pid.poll() == None:
if self.pid.poll() is None:
self.pid.interrupt()
def get_key_hex_ascii(self):
@@ -56,7 +56,7 @@ class Aircrack(object):
# Hex key is non-printable in ascii
ascii_key = None
continue
elif ascii_key == None:
elif ascii_key is None:
# We can't generate an Ascii key
continue
# Convert decimal to char

10
py/Aireplay.py
View File

@@ -81,11 +81,11 @@ class Aireplay(Thread):
self.start()
def is_running(self):
return self.pid.poll() == None
return self.pid.poll() is None
def stop(self):
''' Stops aireplay process '''
if hasattr(self, "pid") and self.pid and self.pid.poll() == None:
if hasattr(self, "pid") and self.pid and self.pid.poll() is None:
self.pid.interrupt()
def get_output(self):
@@ -182,7 +182,7 @@ class Aireplay(Thread):
# Interface is required at this point
Configuration.initialize()
if Configuration.interface == None:
if Configuration.interface is None:
raise Exception("Wireless interface must be defined (-i)")
cmd = ["aireplay-ng"]
@@ -259,7 +259,7 @@ class Aireplay(Thread):
cmd.extend(["-h", client_mac])
elif attack_type == WEPAttackType.hirte:
if client_mac == None:
if client_mac is None:
# Unable to carry out hirte attack
raise Exception("Client is required for hirte attack")
cmd.extend([
@@ -267,7 +267,7 @@ class Aireplay(Thread):
"-h", client_mac
])
elif attack_type == WEPAttackType.forgedreplay:
if client_mac == None or replay_file == None:
if client_mac is None or replay_file is None:
raise Exception("Client_mac and Replay_File are required for arp replay")
cmd.extend([
"--arpreplay",

2
py/Airmon.py
View File

@@ -89,7 +89,7 @@ class Airmon(object):
mon_iface = mon_iface.split(')')[0]
break
if mon_iface == None:
if mon_iface is None:
# Airmon did not enable monitor mode on an interface
Color.pl("{R}failed{W}")

8
py/Airodump.py
View File

@@ -21,15 +21,15 @@ class Airodump(object):
Configuration.initialize()
if interface == None:
if interface is None:
interface = Configuration.interface
if interface == None:
if interface is None:
raise Exception("Wireless interface must be defined (-i)")
self.interface = interface
self.targets = []
if channel == None:
if channel is None:
channel = Configuration.target_channel
self.channel = channel
self.five_ghz = Configuration.five_ghz
@@ -133,7 +133,7 @@ class Airodump(object):
# Found the file
csv_filename = fil
break
if csv_filename == None or not os.path.exists(csv_filename):
if csv_filename is None or not os.path.exists(csv_filename):
# No file found
return self.targets

2
py/Attack.py
View File

@@ -39,7 +39,7 @@ class Attack(object):
airodump_target = t
break
if airodump_target == None:
if airodump_target is None:
raise Exception(
'Could not find target (%s) in airodump' % self.target.bssid)

2
py/Bully.py
View File

@@ -206,7 +206,7 @@ class Bully(Attack):
return False
def stop(self):
if hasattr(self, "pid") and self.pid and self.pid.poll() == None:
if hasattr(self, "pid") and self.pid and self.pid.poll() is None:
self.pid.interrupt()
def __del__(self):

8
py/Configuration.py
View File

@@ -100,7 +100,7 @@ class Configuration(object):
@staticmethod
def get_interface():
if Configuration.interface == None:
if Configuration.interface is None:
# Interface wasn't defined, select it!
from Airmon import Airmon
Configuration.interface = Airmon.ask()
@@ -273,7 +273,7 @@ class Configuration(object):
@staticmethod
def temp(subfile=''):
''' Creates and/or returns the temporary directory '''
if Configuration.temp_dir == None:
if Configuration.temp_dir is None:
Configuration.temp_dir = Configuration.create_temp()
return Configuration.temp_dir + subfile
@@ -289,7 +289,7 @@ class Configuration(object):
@staticmethod
def delete_temp():
''' Remove temp files and folder '''
if Configuration.temp_dir == None: return
if Configuration.temp_dir is None: return
if os.path.exists(Configuration.temp_dir):
for f in os.listdir(Configuration.temp_dir):
os.remove(Configuration.temp_dir + f)
@@ -323,7 +323,7 @@ class Configuration(object):
for (key,val) in sorted(Configuration.__dict__.iteritems()):
if key.startswith('__'): continue
if type(val) == staticmethod: continue
if val == None: continue
if val is None: continue
result += Color.s("{G}%s {W} {C}%s{W}\n" % (key.ljust(max_len),val))
return result

4
py/Handshake.py
View File

@@ -100,7 +100,7 @@ class Handshake(object):
mac_regex = ('[a-zA-Z0-9]{2}:' * 6)[:-1]
match = re.search('(%s) [^ ]* (%s).*.*SSID=(.*)$'
% (mac_regex, mac_regex), line)
if match == None:
if match is None:
# Line doesn't contain src, dst, ssid
continue
(src, dst, essid) = match.groups()
@@ -139,7 +139,7 @@ class Handshake(object):
mac_regex = ('[a-zA-Z0-9]{2}:' * 6)[:-1]
match = re.search('(%s) (?:->|→) (%s).*Message.*(\d).*(\d)'
% (mac_regex, mac_regex), line)
if match == None:
if match is None:
# Line doesn't contain src, dst, Message numbers
continue
(src, dst, index, ttl) = match.groups()

4
py/Interface.py
View File

@@ -82,10 +82,10 @@ class Interface(object):
from Process import Process
import re
if iface == None:
if iface is None:
Configuration.initialize()
iface = Configuration.interface
if iface == None:
if iface is None:
raise Exception('Interface must be defined (-i)')
output = Process(['ifconfig', iface]).stdout()

8
py/Process.py
View File

@@ -85,7 +85,7 @@ class Process(object):
Ran when object is GC'd.
If process is still running at this point, it should die.
'''
if self.pid and self.pid.poll() == None:
if self.pid and self.pid.poll() is None:
self.interrupt()
def stdout(self):
@@ -110,9 +110,9 @@ class Process(object):
def get_output(self):
''' Waits for process to finish, sets stdout & stderr '''
if self.pid.poll() == None:
if self.pid.poll() is None:
self.pid.wait()
if self.out == None:
if self.out is None:
(self.out, self.err) = self.pid.communicate()
def poll(self):
@@ -139,7 +139,7 @@ class Process(object):
kill(pid, SIGINT)
wait_time = 0 # Time since Interrupt was sent
while self.pid.poll() == None:
while self.pid.poll() is None:
# Process is still running
wait_time += 0.1
sleep(0.1)

4
py/Reaver.py
View File

@@ -96,7 +96,7 @@ class Reaver(Attack):
(pin, psk, ssid) = self.get_pin_psk_ssid(stdout)
# Check if we cracked it, or if process stopped.
if (pin and psk and ssid) or reaver.poll() != None:
if (pin and psk and ssid) or reaver.poll() is not None:
reaver.interrupt()
# Check one-last-time for PIN/PSK/SSID, in case of race condition.
@@ -321,7 +321,7 @@ class Reaver(Attack):
pin_current = 11000 - pins_left
# Check if process is still running
if reaver.pid.poll() != None:
if reaver.pid.poll() is not None:
Color.pl('{R}failed{W}')
Color.pl('{!} {R}reaver{O} quit unexpectedly{W}')
self.success = False

4
py/Scanner.py
View File

@@ -30,7 +30,7 @@ class Scanner(object):
# Loop until interrupted (Ctrl+C)
while True:
if airodump.pid.poll() != None:
if airodump.pid.poll() is not None:
# Airodump process died!
raise Exception(
"Airodump exited unexpectedly! " +
@@ -76,7 +76,7 @@ class Scanner(object):
bssid = Configuration.target_bssid
essid = Configuration.target_essid
if bssid == None and essid == None:
if bssid is None and essid is None:
return False
for target in self.targets: