scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new: user config is now copied from /boot/config.yml

Browse Source
This commit is contained in:
Simone Margaritelli 2019-10-18 16:34:58 +02:00
parent f4a59549fa
commit e220a869e0
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pwnagotchi/utils.py
View File

@ -31,11 +31,18 @@ def load_config(args):
ref_defaults_file = os.path.join(os.path.dirname(pwnagotchi.__file__), 'defaults.yml') ref_defaults_file = os.path.join(os.path.dirname(pwnagotchi.__file__), 'defaults.yml')
ref_defaults_data = None ref_defaults_data = None
if not os.path.exists(args.config): # check for a config.yml file on /boot/
if os.path.exists("/boot/config.yml"):
# logging not configured here yet # logging not configured here yet
print("installing /boot/config.yml to %s ...", args.user_config)
os.rename("/boot/config.yml", args.user_config)
# if not config is found, copy the defaults
if not os.path.exists(args.config):
print("copying %s to %s ..." % (ref_defaults_file, args.config)) print("copying %s to %s ..." % (ref_defaults_file, args.config))
shutil.copy(ref_defaults_file, args.config) shutil.copy(ref_defaults_file, args.config)
else: else:
# check if the user messed with the defaults
with open(ref_defaults_file) as fp: with open(ref_defaults_file) as fp:
ref_defaults_data = fp.read() ref_defaults_data = fp.read()
@ -46,9 +53,11 @@ def load_config(args):
print("!!! file in %s is different than release defaults, overwriting !!!" % args.config) print("!!! file in %s is different than release defaults, overwriting !!!" % args.config)
shutil.copy(ref_defaults_file, args.config) shutil.copy(ref_defaults_file, args.config)
# load the defaults
with open(args.config) as fp: with open(args.config) as fp:
config = yaml.safe_load(fp) config = yaml.safe_load(fp)
# load the user config
if os.path.exists(args.user_config): if os.path.exists(args.user_config):
with open(args.user_config) as fp: with open(args.user_config) as fp:
user_config = yaml.safe_load(fp) user_config = yaml.safe_load(fp)
@ -131,6 +140,7 @@ def blink(times=1, delay=0.3):
time.sleep(delay) time.sleep(delay)
led(True) led(True)
class WifiInfo(Enum): class WifiInfo(Enum):
""" """
Fields you can extract from a pcap file Fields you can extract from a pcap file
@ -141,6 +151,7 @@ class WifiInfo(Enum):
CHANNEL = 3 CHANNEL = 3
RSSI = 4 RSSI = 4
class FieldNotFoundError(Exception): class FieldNotFoundError(Exception):
pass pass
@ -172,7 +183,7 @@ def extract_from_pcap(path, fields):
if hasattr(packet[Dot11], 'addr3'): if hasattr(packet[Dot11], 'addr3'):
results[field] = packet[Dot11].addr3 results[field] = packet[Dot11].addr3
break break
else: # magic else: # magic
raise FieldNotFoundError("Could not find field [BSSID]") raise FieldNotFoundError("Could not find field [BSSID]")
except Exception: except Exception:
raise FieldNotFoundError("Could not find field [BSSID]") raise FieldNotFoundError("Could not find field [BSSID]")
@ -188,7 +199,7 @@ def extract_from_pcap(path, fields):
if packet.haslayer(Dot11Elt) and hasattr(packet[Dot11Elt], 'info'): if packet.haslayer(Dot11Elt) and hasattr(packet[Dot11Elt], 'info'):
results[field] = packet[Dot11Elt].info.decode('utf-8') results[field] = packet[Dot11Elt].info.decode('utf-8')
break break
else: # magic else: # magic
raise FieldNotFoundError("Could not find field [ESSID]") raise FieldNotFoundError("Could not find field [ESSID]")
except Exception: except Exception:
raise FieldNotFoundError("Could not find field [ESSID]") raise FieldNotFoundError("Could not find field [ESSID]")
@ -202,9 +213,9 @@ def extract_from_pcap(path, fields):
if packet.haslayer(Dot11Beacon) and hasattr(packet[Dot11Beacon], 'network_stats'): if packet.haslayer(Dot11Beacon) and hasattr(packet[Dot11Beacon], 'network_stats'):
stats = packet[Dot11Beacon].network_stats() stats = packet[Dot11Beacon].network_stats()
if 'crypto' in stats: if 'crypto' in stats:
results[field] = stats['crypto'] # set with encryption types results[field] = stats['crypto'] # set with encryption types
break break
else: # magic else: # magic
raise FieldNotFoundError("Could not find field [ENCRYPTION]") raise FieldNotFoundError("Could not find field [ENCRYPTION]")
except Exception: except Exception:
raise FieldNotFoundError("Could not find field [ENCRYPTION]") raise FieldNotFoundError("Could not find field [ENCRYPTION]")