diff --git a/builder/data/etc/dhcpcd.conf b/builder/data/etc/dhcpcd.conf index deac8212..3878a8fe 100644 --- a/builder/data/etc/dhcpcd.conf +++ b/builder/data/etc/dhcpcd.conf @@ -49,8 +49,10 @@ denyinterfaces wlan0 interface eth0 static domain_name_servers=8.8.8.8 1.1.1.1 +metric=202 interface usb0 static ip_address=10.0.0.2/24 static routers=10.0.0.1 -static domain_name_servers=10.0.0.1 8.8.8.8 1.1.1.1 \ No newline at end of file +static domain_name_servers=10.0.0.1 8.8.8.8 1.1.1.1 +metric=203 \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/age.toml b/builder/data/etc/pwnagotchi/conf.d/age.toml deleted file mode 100644 index 4ca7e8ea..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/age.toml +++ /dev/null @@ -1,5 +0,0 @@ -main.plugins.age.enabled = false -main.plugins.age.age_x_coord = 0 -main.plugins.age.age_y_coord = 32 -main.plugins.age.str_x_coord = 67 -main.plugins.age.str_y_coord = 32 \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/auto-update.toml b/builder/data/etc/pwnagotchi/conf.d/auto-update.toml deleted file mode 100644 index e073dbb9..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/auto-update.toml +++ /dev/null @@ -1,3 +0,0 @@ -main.plugins.auto-update.enabled = true -main.plugins.auto-update.install = true -main.plugins.auto-update.interval = 1 \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/bt-tether.toml b/builder/data/etc/pwnagotchi/conf.d/bt-tether.toml deleted file mode 100644 index 64d1691a..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/bt-tether.toml +++ /dev/null @@ -1,23 +0,0 @@ -main.plugins.bt-tether.enabled = false - -main.plugins.bt-tether.devices.android-phone.enabled = false -main.plugins.bt-tether.devices.android-phone.search_order = 1 -main.plugins.bt-tether.devices.android-phone.mac = "" -main.plugins.bt-tether.devices.android-phone.ip = "192.168.44.44" -main.plugins.bt-tether.devices.android-phone.netmask = 24 -main.plugins.bt-tether.devices.android-phone.interval = 1 -main.plugins.bt-tether.devices.android-phone.scantime = 10 -main.plugins.bt-tether.devices.android-phone.max_tries = 10 -main.plugins.bt-tether.devices.android-phone.share_internet = false -main.plugins.bt-tether.devices.android-phone.priority = 1 - -main.plugins.bt-tether.devices.ios-phone.enabled = false -main.plugins.bt-tether.devices.ios-phone.search_order = 2 -main.plugins.bt-tether.devices.ios-phone.mac = "" -main.plugins.bt-tether.devices.ios-phone.ip = "172.20.10.6" -main.plugins.bt-tether.devices.ios-phone.netmask = 24 -main.plugins.bt-tether.devices.ios-phone.interval = 5 -main.plugins.bt-tether.devices.ios-phone.scantime = 20 -main.plugins.bt-tether.devices.ios-phone.max_tries = 0 -main.plugins.bt-tether.devices.ios-phone.share_internet = false -main.plugins.bt-tether.devices.ios-phone.priority = 999 \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/fix_services.toml b/builder/data/etc/pwnagotchi/conf.d/fix_services.toml deleted file mode 100644 index 9af7b6e1..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/fix_services.toml +++ /dev/null @@ -1 +0,0 @@ -main.plugins.fix_services.enabled = true \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/gdrivesync.toml b/builder/data/etc/pwnagotchi/conf.d/gdrivesync.toml deleted file mode 100644 index f5a3b65c..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/gdrivesync.toml +++ /dev/null @@ -1,4 +0,0 @@ -main.plugins.gdrivesync.enabled = false -main.plugins.gdrivesync.backupfiles = [''] -main.plugins.gdrivesync.backup_folder = "PwnagotchiBackups" -main.plugin.gdrivesync.interval = 1 \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/gpio_buttons.toml b/builder/data/etc/pwnagotchi/conf.d/gpio_buttons.toml deleted file mode 100644 index 3567b22b..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/gpio_buttons.toml +++ /dev/null @@ -1 +0,0 @@ -main.plugins.gpio_buttons.enabled = false \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/gps.toml b/builder/data/etc/pwnagotchi/conf.d/gps.toml deleted file mode 100644 index e975b538..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/gps.toml +++ /dev/null @@ -1,3 +0,0 @@ -main.plugins.gps.enabled = false -main.plugins.gps.speed = 19200 -main.plugins.gps.device = "/dev/ttyUSB0" \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/grid.toml b/builder/data/etc/pwnagotchi/conf.d/grid.toml deleted file mode 100644 index 0ec2ab52..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/grid.toml +++ /dev/null @@ -1,5 +0,0 @@ -main.plugins.grid.enabled = true -main.plugins.grid.report = true -main.plugins.grid.exclude = [ - "YourHomeNetworkHere" -] \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/logtail.toml b/builder/data/etc/pwnagotchi/conf.d/logtail.toml deleted file mode 100644 index 55393368..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/logtail.toml +++ /dev/null @@ -1,2 +0,0 @@ -main.plugins.logtail.enabled = false -main.plugins.logtail.max-lines = 10000 \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/memtemp.toml b/builder/data/etc/pwnagotchi/conf.d/memtemp.toml deleted file mode 100644 index d3521d5f..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/memtemp.toml +++ /dev/null @@ -1,3 +0,0 @@ -main.plugins.memtemp.enabled = false -main.plugins.memtemp.scale = "celsius" -main.plugins.memtemp.orientation = "horizontal" \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/net-pos.toml b/builder/data/etc/pwnagotchi/conf.d/net-pos.toml deleted file mode 100644 index bdf22f1c..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/net-pos.toml +++ /dev/null @@ -1,2 +0,0 @@ -main.plugins.net-pos.enabled = false -main.plugins.net-pos.api_key = "test" \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/onlinehascrack.toml b/builder/data/etc/pwnagotchi/conf.d/onlinehascrack.toml deleted file mode 100644 index b1170d0a..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/onlinehascrack.toml +++ /dev/null @@ -1,5 +0,0 @@ -main.plugins.onlinehashcrack.enabled = false -main.plugins.onlinehashcrack.email = "" -main.plugins.onlinehashcrack.dashboard = "" -main.plugins.onlinehashcrack.single_files = false -main.plugins.onlinehashcrack.whitelist = [] \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/paw-gps.toml b/builder/data/etc/pwnagotchi/conf.d/paw-gps.toml deleted file mode 100644 index b5e0cfee..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/paw-gps.toml +++ /dev/null @@ -1,2 +0,0 @@ -main.plugins.paw-gps.enabled = false -main.plugins.paw-gps.ip = "192.168.44.1:8080" \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/pisugar2.toml b/builder/data/etc/pwnagotchi/conf.d/pisugar2.toml deleted file mode 100644 index 424c8873..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/pisugar2.toml +++ /dev/null @@ -1,3 +0,0 @@ -main.plugins.pisugar2.enabled = false -main.plugins.pisugar2.shutdown = 5 -main.plugins.pisugar2.sync_rtc_on_boot = false \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/session-stats.toml b/builder/data/etc/pwnagotchi/conf.d/session-stats.toml deleted file mode 100644 index ef57f4c8..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/session-stats.toml +++ /dev/null @@ -1,2 +0,0 @@ -main.plugins.session-stats.enabled = true -main.plugins.session-stats.save_directory = "/var/tmp/pwnagotchi/sessions/" \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/ups_hat_c.toml b/builder/data/etc/pwnagotchi/conf.d/ups_hat_c.toml deleted file mode 100644 index 5a0e405d..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/ups_hat_c.toml +++ /dev/null @@ -1,5 +0,0 @@ -main.plugins.ups_hat_c.enabled = false -main.plugins.ups_hat_c.label_on = true # show BAT label or just percentage -main.plugins.ups_hat_c.shutdown = 5 # battery percent at which the device will turn off -main.plugins.ups_hat_c.bat_x_coord = 140 -main.plugins.ups_hat_c.bat_y_coord = 0 \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/ups_lite.toml b/builder/data/etc/pwnagotchi/conf.d/ups_lite.toml deleted file mode 100644 index 7b6a43fc..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/ups_lite.toml +++ /dev/null @@ -1,2 +0,0 @@ -main.plugins.ups_lite.enabled = false -main.plugins.ups_lite.shutdown = 2 \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/webcfg.toml b/builder/data/etc/pwnagotchi/conf.d/webcfg.toml deleted file mode 100644 index d57b403e..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/webcfg.toml +++ /dev/null @@ -1 +0,0 @@ -main.plugins.webcfg.enabled = true \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/webgpsmap.toml b/builder/data/etc/pwnagotchi/conf.d/webgpsmap.toml deleted file mode 100644 index 6a22d55c..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/webgpsmap.toml +++ /dev/null @@ -1 +0,0 @@ -main.plugins.webgpsmap.enabled = false \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/wigle.toml b/builder/data/etc/pwnagotchi/conf.d/wigle.toml deleted file mode 100644 index 8f612473..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/wigle.toml +++ /dev/null @@ -1,4 +0,0 @@ -main.plugins.wigle.enabled = false -main.plugins.wigle.api_key = "" -main.plugins.wigle.whitelist = [] -main.plugins.wigle.donate = true \ No newline at end of file diff --git a/builder/data/etc/pwnagotchi/conf.d/wpa-sec.toml b/builder/data/etc/pwnagotchi/conf.d/wpa-sec.toml deleted file mode 100644 index bdd91e4b..00000000 --- a/builder/data/etc/pwnagotchi/conf.d/wpa-sec.toml +++ /dev/null @@ -1,5 +0,0 @@ -main.plugins.wpa-sec.enabled = false -main.plugins.wpa-sec.api_key = "" -main.plugins.wpa-sec.api_url = "https://wpa-sec.stanev.org" -main.plugins.wpa-sec.download_results = false -main.plugins.wpa-sec.whitelist = [] \ No newline at end of file diff --git a/pwnagotchi/__init__.py b/pwnagotchi/__init__.py index 4387579b..730c7d93 100644 --- a/pwnagotchi/__init__.py +++ b/pwnagotchi/__init__.py @@ -92,7 +92,8 @@ def cpu_load(tag=None): parts0 = _cpu_stat() time.sleep(0.1) # only need to sleep when no tag parts1 = _cpu_stat() - if tag: _cpu_stats[tag] = parts1 + if tag: + _cpu_stats[tag] = parts1 parts_diff = [p1 - p0 for (p0, p1) in zip(parts0, parts1)] user, nice, sys, idle, iowait, irq, softirq, steal, _guest, _guest_nice = parts_diff diff --git a/pwnagotchi/_version.py b/pwnagotchi/_version.py index e91b5bf4..85bd7ff0 100644 --- a/pwnagotchi/_version.py +++ b/pwnagotchi/_version.py @@ -1 +1 @@ -__version__ = '2.4.8' +__version__ = '2.4.9' diff --git a/pwnagotchi/defaults.toml b/pwnagotchi/defaults.toml index 1e2f5caa..3cb3f5d8 100644 --- a/pwnagotchi/defaults.toml +++ b/pwnagotchi/defaults.toml @@ -10,6 +10,103 @@ main.custom_plugin_repos = [ main.custom_plugins = "/usr/local/share/pwnagotchi/custom-plugins/" +main.plugins.auto-update.enabled = true +main.plugins.auto-update.install = true +main.plugins.auto-update.interval = 1 + +main.plugins.bt-tether.enabled = false + +main.plugins.bt-tether.devices.android-phone.enabled = false +main.plugins.bt-tether.devices.android-phone.search_order = 1 +main.plugins.bt-tether.devices.android-phone.mac = "" +main.plugins.bt-tether.devices.android-phone.ip = "192.168.44.44" +main.plugins.bt-tether.devices.android-phone.netmask = 24 +main.plugins.bt-tether.devices.android-phone.interval = 1 +main.plugins.bt-tether.devices.android-phone.scantime = 10 +main.plugins.bt-tether.devices.android-phone.max_tries = 10 +main.plugins.bt-tether.devices.android-phone.share_internet = false +main.plugins.bt-tether.devices.android-phone.priority = 1 + +main.plugins.bt-tether.devices.ios-phone.enabled = false +main.plugins.bt-tether.devices.ios-phone.search_order = 2 +main.plugins.bt-tether.devices.ios-phone.mac = "" +main.plugins.bt-tether.devices.ios-phone.ip = "172.20.10.6" +main.plugins.bt-tether.devices.ios-phone.netmask = 24 +main.plugins.bt-tether.devices.ios-phone.interval = 5 +main.plugins.bt-tether.devices.ios-phone.scantime = 20 +main.plugins.bt-tether.devices.ios-phone.max_tries = 0 +main.plugins.bt-tether.devices.ios-phone.share_internet = false +main.plugins.bt-tether.devices.ios-phone.priority = 999 + +main.plugins.fix_services.enabled = true + +main.plugins.gdrivesync.enabled = false +main.plugins.gdrivesync.backupfiles = [''] +main.plugins.gdrivesync.backup_folder = "PwnagotchiBackups" +main.plugin.gdrivesync.interval = 1 + +main.plugins.gpio_buttons.enabled = false + +main.plugins.gps.enabled = false +main.plugins.gps.speed = 19200 +main.plugins.gps.device = "/dev/ttyUSB0" + +main.plugins.grid.enabled = true +main.plugins.grid.report = true +main.plugins.grid.exclude = [ + "YourHomeNetworkHere" +] + +main.plugins.logtail.enabled = false +main.plugins.logtail.max-lines = 10000 + +main.plugins.memtemp.enabled = false +main.plugins.memtemp.scale = "celsius" +main.plugins.memtemp.orientation = "horizontal" + +main.plugins.net-pos.enabled = false +main.plugins.net-pos.api_key = "test" + +main.plugins.onlinehashcrack.enabled = false +main.plugins.onlinehashcrack.email = "" +main.plugins.onlinehashcrack.dashboard = "" +main.plugins.onlinehashcrack.single_files = false +main.plugins.onlinehashcrack.whitelist = [] + +main.plugins.paw-gps.enabled = false +main.plugins.paw-gps.ip = "192.168.44.1:8080" + +main.plugins.pisugar2.enabled = false +main.plugins.pisugar2.shutdown = 5 +main.plugins.pisugar2.sync_rtc_on_boot = false + +main.plugins.session-stats.enabled = true +main.plugins.session-stats.save_directory = "/var/tmp/pwnagotchi/sessions/" + +main.plugins.ups_hat_c.enabled = false +main.plugins.ups_hat_c.label_on = true # show BAT label or just percentage +main.plugins.ups_hat_c.shutdown = 5 # battery percent at which the device will turn off +main.plugins.ups_hat_c.bat_x_coord = 140 +main.plugins.ups_hat_c.bat_y_coord = 0 + +main.plugins.ups_lite.enabled = false +main.plugins.ups_lite.shutdown = 2 + +main.plugins.webcfg.enabled = true + +main.plugins.webgpsmap.enabled = false + +main.plugins.wigle.enabled = false +main.plugins.wigle.api_key = "" +main.plugins.wigle.whitelist = [] +main.plugins.wigle.donate = true + +main.plugins.wpa-sec.enabled = false +main.plugins.wpa-sec.api_key = "" +main.plugins.wpa-sec.api_url = "https://wpa-sec.stanev.org" +main.plugins.wpa-sec.download_results = false +main.plugins.wpa-sec.whitelist = [] + main.iface = "wlan0mon" main.mon_start_cmd = "/usr/bin/monstart" main.mon_stop_cmd = "/usr/bin/monstop" diff --git a/pwnagotchi/utils.py b/pwnagotchi/utils.py index f8f38677..f9e9d117 100644 --- a/pwnagotchi/utils.py +++ b/pwnagotchi/utils.py @@ -223,13 +223,13 @@ def load_config(args): if user_config: config = merge_config(user_config, config) except Exception as ex: - logging.error("There was an error processing the configuration file:\n%s ",ex) + logging.error("There was an error processing the configuration file:\n%s ", ex) sys.exit(1) # dropins dropin = config['main']['confd'] if dropin and os.path.isdir(dropin): - dropin += '*.toml' if dropin.endswith('/') else '/*.toml' # only toml here; yaml is no more + dropin += '*.toml' if dropin.endswith('/') else '/*.toml' # only toml here; yaml is no more for conf in glob.glob(dropin): with open(conf) as toml_file: additional_config = toml.load(toml_file)