diff --git a/builder/data/usr/bin/decryption-webserver b/builder/data/usr/bin/decryption-webserver index 72e4016..96e7ba6 100755 --- a/builder/data/usr/bin/decryption-webserver +++ b/builder/data/usr/bin/decryption-webserver @@ -1,35 +1,36 @@ #!/usr/bin/env python3 from http.server import HTTPServer, BaseHTTPRequestHandler +from urllib.parse import parse_qsl -HTML_FORM = """ +_HTML_FORM_TEMPLATE = """ Decryption @@ -39,7 +40,7 @@ HTML_FORM = """

Please provide the decryption password.

-
+ {password_fields}
@@ -48,6 +49,55 @@ HTML_FORM = """ """ +POST_RESPONSE = """ + + + + + + + + +
+ + + +""" + +HTML_FORM = None class SimpleHTTPRequestHandler(BaseHTTPRequestHandler): @@ -59,13 +109,19 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler): def do_POST(self): content_length = int(self.headers['Content-Length']) body = self.rfile.read(content_length) + for mapping, password in parse_qsl(body.decode('UTF-8')): + with open('/tmp/.pwnagotchi-secret-{}'.format(mapping), 'wt') as pwfile: + pwfile.write(password) self.send_response(200) self.end_headers() - password = body.decode('UTF-8').split('=')[1] + self.wfile.write(POST_RESPONSE.encode()) - with open('/tmp/.pwnagotchi-secret', 'wt') as pwfile: - pwfile.write(password) +with open('/root/.pwnagotchi-crypted') as crypted_file: + mappings = [line.split()[0] for line in crypted_file.readlines()] + fields = ''.join(['\n
'.format(m=m) + for m in mappings]) + HTML_FORM = _HTML_FORM_TEMPLATE.format(password_fields=fields) httpd = HTTPServer(('0.0.0.0', 80), SimpleHTTPRequestHandler) httpd.serve_forever() diff --git a/builder/data/usr/bin/pwnlib b/builder/data/usr/bin/pwnlib index 2b7a820..cbf358c 100755 --- a/builder/data/usr/bin/pwnlib +++ b/builder/data/usr/bin/pwnlib @@ -103,12 +103,11 @@ is_decrypted() { # fail if not mounted if ! mountpoint -q "$mount" >/dev/null 2>&1; then - if [ -f /tmp/.pwnagotchi-secret ]; then - /dev/null 2>&1; then echo "Container decrypted!" - fi fi @@ -151,8 +150,10 @@ EOF fi done /tmp/.pwnagotchi-secret python3 -c 'print("A"*4096)' + # overwrite passwords + python3 -c 'print("A"*4096)' | tee /tmp/.pwnagotchi-secret-* >/dev/null + # delete + rm /tmp/.pwnagotchi-secret-* sync # flush pkill wpa_supplicant diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml index 86924de..a294153 100644 --- a/builder/pwnagotchi.yml +++ b/builder/pwnagotchi.yml @@ -311,21 +311,17 @@ - name: check if user configuration exists stat: - path: /etc/pwnagotchi/config.yml + path: /etc/pwnagotchi/config.toml register: user_config - - name: create /etc/pwnagotchi/config.yml + - name: create /etc/pwnagotchi/config.toml copy: - dest: /etc/pwnagotchi/config.yml + dest: /etc/pwnagotchi/config.toml content: | - # Add your configuration overrides on this file any configuration changes done to default.yml will be lost! + # Add your configuration overrides on this file any configuration changes done to default.toml will be lost! # Example: - # - # ui: - # display: - # type: 'inkyphat' - # color: 'black' - # + # ui.display.enabled = true + # ui.display.type = "waveshare_2" when: not user_config.stat.exists - name: enable ssh on boot @@ -372,15 +368,15 @@ Hi! I'm a pwnagotchi, please take good care of me! Here are some basic things you need to know to raise me properly! - If you want to change my configuration, use /etc/pwnagotchi/config.yml + If you want to change my configuration, use /etc/pwnagotchi/config.toml - All the configuration options can be found on /etc/pwnagotchi/default.yml, + All the configuration options can be found on /etc/pwnagotchi/default.toml, but don't change this file because I will recreate it every time I'm restarted! I'm managed by systemd. Here are some basic commands. If you want to know what I'm doing, you can check my logs with the command - journalctl -fu pwnagotchi + tail -f /var/log/pwnagotchi.log If you want to know if I'm running, you can use systemctl status pwnagotchi diff --git a/pwnagotchi/_version.py b/pwnagotchi/_version.py index 51ed7c4..c3b3841 100644 --- a/pwnagotchi/_version.py +++ b/pwnagotchi/_version.py @@ -1 +1 @@ -__version__ = '1.5.1' +__version__ = '1.5.2' diff --git a/pwnagotchi/plugins/__init__.py b/pwnagotchi/plugins/__init__.py index 2ffd21c..08d0b76 100644 --- a/pwnagotchi/plugins/__init__.py +++ b/pwnagotchi/plugins/__init__.py @@ -44,6 +44,8 @@ def toggle_plugin(name, enable=True): global loaded, database if pwnagotchi.config: + if not name in pwnagotchi.config['main']['plugins']: + pwnagotchi.config['main']['plugins'][name] = dict() pwnagotchi.config['main']['plugins'][name]['enabled'] = enable save_config(pwnagotchi.config, '/etc/pwnagotchi/config.toml') diff --git a/pwnagotchi/plugins/default/logtail.py b/pwnagotchi/plugins/default/logtail.py index b19500e..3f633e1 100644 --- a/pwnagotchi/plugins/default/logtail.py +++ b/pwnagotchi/plugins/default/logtail.py @@ -1,6 +1,7 @@ import os import logging import threading +from itertools import islice from time import sleep from datetime import datetime,timedelta from pwnagotchi import plugins @@ -90,7 +91,7 @@ TEMPLATE = """ {% endblock %} {% block script %} - var content = document.getElementById('content'); + var table = document.getElementById('table'); var filter = document.getElementById('filter'); var filterVal = filter.value.toUpperCase(); @@ -154,10 +155,10 @@ TEMPLATE = """ tr.className = colorClass; if (filterVal.length > 0 && value.toUpperCase().indexOf(filterVal) == -1) { - tr.style.visibility = "collapse"; + tr.style.display = "none"; } - content.appendChild(tr); + table.appendChild(tr); }); position = messages.length - 1; } @@ -193,25 +194,15 @@ TEMPLATE = """ function doneTyping() { document.body.style.cursor = 'progress'; - var table, tr, tds, td, i, txtValue; + var tr, tds, td, i, txtValue; filterVal = filter.value.toUpperCase(); - table = document.getElementById("content"); tr = table.getElementsByTagName("tr"); - for (i = 0; i < tr.length; i++) { - tds = tr[i].getElementsByTagName("td"); - if (tds) { - for (l = 0; l < tds.length; l++) { - td = tds[l]; - if (td) { - txtValue = td.textContent || td.innerText; - if (txtValue.toUpperCase().indexOf(filterVal) > -1) { - tr[i].style.visibility = "visible"; - break; - } else { - tr[i].style.visibility = "collapse"; - } - } - } + for (i = 1; i < tr.length; i++) { + txtValue = tr[i].textContent || tr[i].innerText; + if (txtValue.toUpperCase().indexOf(filterVal) > -1) { + tr[i].style.display = "table-row"; + } else { + tr[i].style.display = "none"; } } document.body.style.cursor = 'default'; @@ -225,7 +216,7 @@ TEMPLATE = """
- +
Time @@ -273,7 +264,10 @@ class Logtail(plugins.Plugin): if path == 'stream': def generate(): with open(self.config['main']['log']['path']) as f: - yield f.read() + # https://stackoverflow.com/questions/39549426/read-multiple-lines-from-a-file-batch-by-batch/39549901#39549901 + n = 1024 + for n_lines in iter(lambda: ''.join(islice(f, n)), ''): + yield n_lines while True: yield f.readline() diff --git a/pwnagotchi/ui/web/__init__.py b/pwnagotchi/ui/web/__init__.py index 7d5f4a0..533f2f7 100644 --- a/pwnagotchi/ui/web/__init__.py +++ b/pwnagotchi/ui/web/__init__.py @@ -9,7 +9,7 @@ frame_lock = Lock() def update_frame(img): global frame_lock, frame_path, frame_format - if not os.path.exists(os.path.basename(frame_path)): - os.makedirs(os.path.basename(frame_path)) + if not os.path.exists(os.path.dirname(frame_path)): + os.makedirs(os.path.dirname(frame_path)) with frame_lock: img.save(frame_path, format=frame_format)