From 1013e7dc190969e21b8febebb8caa579673920a2 Mon Sep 17 00:00:00 2001 From: dadav <33197631+dadav@users.noreply.github.com> Date: Sat, 18 Apr 2020 17:09:39 +0200 Subject: [PATCH] make less verbose --- pwnagotchi/plugins/default/onlinehashcrack.py | 10 +++++----- pwnagotchi/plugins/default/wigle.py | 18 +++++++++--------- pwnagotchi/plugins/default/wpa-sec.py | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pwnagotchi/plugins/default/onlinehashcrack.py b/pwnagotchi/plugins/default/onlinehashcrack.py index 8f5db40..1a7484f 100644 --- a/pwnagotchi/plugins/default/onlinehashcrack.py +++ b/pwnagotchi/plugins/default/onlinehashcrack.py @@ -55,9 +55,9 @@ class OnlineHashCrack(plugins.Plugin): files=payload, timeout=timeout) if 'already been sent' in result.text: - logging.warning(f"{path} was already uploaded.") + logging.debug(f"{path} was already uploaded.") except requests.exceptions.RequestException as e: - logging.error(f"OHC: Got an exception while uploading {path} -> {e}") + logging.debug(f"OHC: Got an exception while uploading {path} -> {e}") raise e def _download_cracked(self, save_file, timeout=120): @@ -118,14 +118,14 @@ class OnlineHashCrack(plugins.Plugin): if handshake not in reported: reported.append(handshake) self.report.update(data={'reported': reported}) - logging.info(f"OHC: Successfully uploaded {handshake}") + logging.debug(f"OHC: Successfully uploaded {handshake}") except requests.exceptions.RequestException as req_e: self.skip.append(handshake) - logging.error("OHC: %s", req_e) + logging.debug("OHC: %s", req_e) continue except OSError as os_e: self.skip.append(handshake) - logging.error("OHC: %s", os_e) + logging.debug("OHC: %s", os_e) continue if 'dashboard' in self.options and self.options['dashboard']: cracked_file = os.path.join(handshake_dir, 'onlinehashcrack.cracked') diff --git a/pwnagotchi/plugins/default/wigle.py b/pwnagotchi/plugins/default/wigle.py index e344e06..f281757 100644 --- a/pwnagotchi/plugins/default/wigle.py +++ b/pwnagotchi/plugins/default/wigle.py @@ -106,7 +106,7 @@ class Wigle(plugins.Plugin): def on_loaded(self): if 'api_key' not in self.options or ('api_key' in self.options and self.options['api_key'] is None): - logging.error("WIGLE: api_key isn't set. Can't upload to wigle.net") + logging.debug("WIGLE: api_key isn't set. Can't upload to wigle.net") return if not 'whitelist' in self.options: @@ -141,21 +141,21 @@ class Wigle(plugins.Plugin): for gps_file in new_gps_files: pcap_filename = gps_file.replace('.gps.json', '.pcap') if not os.path.exists(pcap_filename): - logging.error("WIGLE: Can't find pcap for %s", gps_file) + logging.debug("WIGLE: Can't find pcap for %s", gps_file) self.skip.append(gps_file) continue try: gps_data = _extract_gps_data(gps_file) except OSError as os_err: - logging.error("WIGLE: %s", os_err) + logging.debug("WIGLE: %s", os_err) self.skip.append(gps_file) continue except json.JSONDecodeError as json_err: - logging.error("WIGLE: %s", json_err) + logging.debug("WIGLE: %s", json_err) self.skip.append(gps_file) continue if gps_data['Latitude'] == 0 and gps_data['Longitude'] == 0: - logging.warning("WIGLE: Not enough gps-information for %s. Trying again next time.", gps_file) + logging.debug("WIGLE: Not enough gps-information for %s. Trying again next time.", gps_file) self.skip.append(gps_file) continue try: @@ -165,11 +165,11 @@ class Wigle(plugins.Plugin): WifiInfo.CHANNEL, WifiInfo.RSSI]) except FieldNotFoundError: - logging.error("WIGLE: Could not extract all information. Skip %s", gps_file) + logging.debug("WIGLE: Could not extract all information. Skip %s", gps_file) self.skip.append(gps_file) continue except Scapy_Exception as sc_e: - logging.error("WIGLE: %s", sc_e) + logging.debug("WIGLE: %s", sc_e) self.skip.append(gps_file) continue new_entry = _transform_wigle_entry(gps_data, pcap_data) @@ -185,7 +185,7 @@ class Wigle(plugins.Plugin): logging.info("WIGLE: Successfully uploaded %d files", len(no_err_entries)) except requests.exceptions.RequestException as re_e: self.skip += no_err_entries - logging.error("WIGLE: Got an exception while uploading %s", re_e) + logging.debug("WIGLE: Got an exception while uploading %s", re_e) except OSError as os_e: self.skip += no_err_entries - logging.error("WIGLE: Got the following error: %s", os_e) + logging.debug("WIGLE: Got the following error: %s", os_e) diff --git a/pwnagotchi/plugins/default/wpa-sec.py b/pwnagotchi/plugins/default/wpa-sec.py index fe779df..120d716 100644 --- a/pwnagotchi/plugins/default/wpa-sec.py +++ b/pwnagotchi/plugins/default/wpa-sec.py @@ -39,7 +39,7 @@ class WpaSec(plugins.Plugin): files=payload, timeout=timeout) if ' already submitted' in result.text: - logging.warning("%s was already submitted.", path) + logging.debug("%s was already submitted.", path) except requests.exceptions.RequestException as req_e: raise req_e @@ -116,13 +116,13 @@ class WpaSec(plugins.Plugin): self._upload_to_wpasec(handshake) reported.append(handshake) self.report.update(data={'reported': reported}) - logging.info("WPA_SEC: Successfully uploaded %s", handshake) + logging.debug("WPA_SEC: Successfully uploaded %s", handshake) except requests.exceptions.RequestException as req_e: self.skip.append(handshake) - logging.error("WPA_SEC: %s", req_e) + logging.debug("WPA_SEC: %s", req_e) continue except OSError as os_e: - logging.error("WPA_SEC: %s", os_e) + logging.debug("WPA_SEC: %s", os_e) continue if 'download_results' in self.options and self.options['download_results']: