From b1136e3dd89c1bd2f8966f8d34dd82777cb844c1 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 31 Oct 2024 16:30:45 +0100 Subject: [PATCH 1/5] issue 100 new url in qr for evidence instead of device --- workbench-script.py | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/workbench-script.py b/workbench-script.py index 380dbab..04667ec 100644 --- a/workbench-script.py +++ b/workbench-script.py @@ -6,6 +6,7 @@ import uuid import hashlib import argparse import configparser +import urllib.parse import urllib.request import gettext @@ -16,6 +17,7 @@ from datetime import datetime ## Legacy Functions ## + def convert_to_legacy_snapshot(snapshot): snapshot["sid"] = str(uuid.uuid4()).split("-")[0] snapshot["software"] = "workbench-script" @@ -25,9 +27,8 @@ def convert_to_legacy_snapshot(snapshot): snapshot["timestamp"] = snapshot["timestamp"].replace(" ", "T") snapshot["data"]["smart"] = snapshot["data"]["disks"] snapshot["data"].pop("disks") - snapshot.pop("code") snapshot.pop("erase") - + ## End Legacy Functions ## @@ -54,11 +55,6 @@ def exec_cmd_erase(cmd): return '' # return os.popen(cmd).read() - -def gen_code(): - uid = str(uuid.uuid4()).encode('utf-8') - return hashlib.shake_256(uid).hexdigest(3) - ## End Utility functions ## @@ -66,7 +62,6 @@ SNAPSHOT_BASE = { 'timestamp': str(datetime.now()), 'type': 'Snapshot', 'uuid': str(uuid.uuid4()), - 'code': gen_code(), 'software': "workbench-script", 'version': "0.0.1", 'data': {}, @@ -301,6 +296,15 @@ def save_snapshot_in_disk(snapshot, path): # TODO sanitize url, if url is like this, it fails # url = 'http://127.0.0.1:8000/api/snapshot/' def send_snapshot_to_devicehub(snapshot, token, url): + url_components = urllib.parse.urlparse(url) + ev_path = "evidence/{}".format(snapshot["uuid"]) + components = (url_components.schema, url_components.netloc, ev_path, '', '', '') + ev_url = urllib.parse.urlunparse(components) + # apt install qrencode + qr = "echo {} | qrencode -t ANSI".format(ev_url) + print(exec_cmd(qr)) + print(ev_url) + headers = { "Authorization": f"Bearer {token}", "Content-Type": "application/json" @@ -310,26 +314,17 @@ def send_snapshot_to_devicehub(snapshot, token, url): request = urllib.request.Request(url, data=data, headers=headers) with urllib.request.urlopen(request) as response: status_code = response.getcode() - response_text = response.read().decode('utf-8') + #response_text = response.read().decode('utf-8') if 200 <= status_code < 300: logger.info(_("Snapshot successfully sent to '%s'"), url) - - try: - response = json.loads(response_text) - if response.get('url'): - # apt install qrencode - qr = "echo {} | qrencode -t ANSI".format(response['url']) - print(exec_cmd(qr)) - print("url: {}".format(response['url'])) - if response.get("dhid"): - print("dhid: {}".format(response['dhid'])) - except Exception: - logger.error(response_text) + else: + logger.error(_("Snapshot cannot sent to '%s'"), url) except Exception as e: logger.error(_("Snapshot not remotely sent to URL '%s'. Do you have internet? Is your server up & running? Is the url token authorized?\n %s"), url, e) + def load_config(config_file="settings.ini"): """ Tries to load configuration from a config file. -- 2.30.2 From 82f93a9446e5013902b39d4a19eb6d65b8f28f1e Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 7 Nov 2024 10:04:34 +0100 Subject: [PATCH 2/5] fix legacy case --- workbench-script.py | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/workbench-script.py b/workbench-script.py index 04667ec..623edf5 100644 --- a/workbench-script.py +++ b/workbench-script.py @@ -295,15 +295,16 @@ def save_snapshot_in_disk(snapshot, path): # TODO sanitize url, if url is like this, it fails # url = 'http://127.0.0.1:8000/api/snapshot/' -def send_snapshot_to_devicehub(snapshot, token, url): +def send_snapshot_to_devicehub(snapshot, token, url, legacy): url_components = urllib.parse.urlparse(url) ev_path = "evidence/{}".format(snapshot["uuid"]) components = (url_components.schema, url_components.netloc, ev_path, '', '', '') ev_url = urllib.parse.urlunparse(components) # apt install qrencode qr = "echo {} | qrencode -t ANSI".format(ev_url) - print(exec_cmd(qr)) - print(ev_url) + if not legacy: + print(exec_cmd(qr)) + print(f"url: {ev_url}") headers = { "Authorization": f"Bearer {token}", @@ -314,10 +315,22 @@ def send_snapshot_to_devicehub(snapshot, token, url): request = urllib.request.Request(url, data=data, headers=headers) with urllib.request.urlopen(request) as response: status_code = response.getcode() - #response_text = response.read().decode('utf-8') + response_text = response.read().decode('utf-8') if 200 <= status_code < 300: logger.info(_("Snapshot successfully sent to '%s'"), url) + if legacy: + try: + response = json.loads(response_text) + if response.get('url'): + # apt install qrencode + qr = "echo {} | qrencode -t ANSI".format(response['url']) + print(exec_cmd(qr)) + print("url: {}".format(response['url'])) + if response.get("dhid"): + print("dhid: {}".format(response['dhid'])) + except Exception: + logger.error(response_text) else: logger.error(_("Snapshot cannot sent to '%s'"), url) @@ -409,6 +422,7 @@ def main(): config_file = args.config config = load_config(config_file) + legacy = config.get("legacy") # TODO show warning if non root, means data is not complete # if annotate as potentially invalid snapshot (pending the new API to be done) @@ -423,13 +437,13 @@ def main(): elif config['erase'] and not config.get("legacy"): snapshot['erase'] = gen_erase(all_disks, config['erase']) - if config.get("legacy"): + if legacy: convert_to_legacy_snapshot(snapshot) save_snapshot_in_disk(snapshot, config['path']) if config['url']: - send_snapshot_to_devicehub(snapshot, config['token'], config['url']) + send_snapshot_to_devicehub(snapshot, config['token'], config['url'], legacy) logger.info(_("END")) -- 2.30.2 From 71e06b13a41243e62dcb9dafea1e02e9ae5c7b2c Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 7 Nov 2024 17:42:03 +0100 Subject: [PATCH 3/5] fix process for show qr --- workbench-script.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/workbench-script.py b/workbench-script.py index 623edf5..41bf2ed 100644 --- a/workbench-script.py +++ b/workbench-script.py @@ -301,10 +301,6 @@ def send_snapshot_to_devicehub(snapshot, token, url, legacy): components = (url_components.schema, url_components.netloc, ev_path, '', '', '') ev_url = urllib.parse.urlunparse(components) # apt install qrencode - qr = "echo {} | qrencode -t ANSI".format(ev_url) - if not legacy: - print(exec_cmd(qr)) - print(f"url: {ev_url}") headers = { "Authorization": f"Bearer {token}", @@ -331,8 +327,12 @@ def send_snapshot_to_devicehub(snapshot, token, url, legacy): print("dhid: {}".format(response['dhid'])) except Exception: logger.error(response_text) + else: + qr = "echo {} | qrencode -t ANSI".format(ev_url) + print(exec_cmd(qr)) + print(f"url: {ev_url}") else: - logger.error(_("Snapshot cannot sent to '%s'"), url) + logger.error(_("Snapshot %s, cannot sent to '%s'"), snapshot["uuid"], url) except Exception as e: logger.error(_("Snapshot not remotely sent to URL '%s'. Do you have internet? Is your server up & running? Is the url token authorized?\n %s"), url, e) -- 2.30.2 From 8ac0da99fee8f3b4adbd73d14ce1f4eafe8193a5 Mon Sep 17 00:00:00 2001 From: pedro Date: Fri, 8 Nov 2024 11:27:31 +0100 Subject: [PATCH 4/5] wb.py: improved error msgs when sending to URL --- workbench-script.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workbench-script.py b/workbench-script.py index 41bf2ed..2129f42 100644 --- a/workbench-script.py +++ b/workbench-script.py @@ -332,10 +332,10 @@ def send_snapshot_to_devicehub(snapshot, token, url, legacy): print(exec_cmd(qr)) print(f"url: {ev_url}") else: - logger.error(_("Snapshot %s, cannot sent to '%s'"), snapshot["uuid"], url) + logger.error(_("Snapshot %s could not be sent to URL '%s'"), snapshot["uuid"], url) except Exception as e: - logger.error(_("Snapshot not remotely sent to URL '%s'. Do you have internet? Is your server up & running? Is the url token authorized?\n %s"), url, e) + logger.error(_("Snapshot %s not remotely sent to URL '%s'. Do you have internet? Is your server up & running? Is the url token authorized?\n %s"), snapshot["uuid"], url, e) def load_config(config_file="settings.ini"): -- 2.30.2 From c1867d1ce397d9249b09da63133f62d3c06b2da7 Mon Sep 17 00:00:00 2001 From: pedro Date: Fri, 8 Nov 2024 18:26:25 +0100 Subject: [PATCH 5/5] add es translations to new logs --- locale/es/LC_MESSAGES/messages.mo | Bin 2335 -> 2443 bytes locale/es/LC_MESSAGES/messages.po | 44 ++++++++++++++++-------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/locale/es/LC_MESSAGES/messages.mo b/locale/es/LC_MESSAGES/messages.mo index 4ca804c76a942dfcfa18f9f6dc006e31698c281c..3d34e18482d995400f3da9e9f2196d8777939ac3 100644 GIT binary patch delta 500 zcmZwD&o2W(6u|MfwN!(mBt7^wA*&IMM32r64oDD5Ph{yPMD4bAmxItaNGcBEu&yEz z|3IC45PyY(tB8n`yYFndndI$fW_I4po4L(g4%A*VW+b$JVwkumvP9nCL#yK^Uf?Xg z;|dNXL?&<_+wdAkF+vL;aS&gy9lvl2zwr#mNE#QZ$sL_ZCZ2HwKX4gSrpOW&G0UM3 zc+9xTZhC&MLu3Q%sPo^DR7odWg=Vn8cpmkIj*umCh0}P0=bSH3bf`oYI$IU)p)MrC zQ*2-n3n>xmh+m2+=^{vtH>Eb|BXsL-5f{T{rHAMx^egr^EydCGAQckKgZtFrxn Ij-6~8KV^+V5&!@I delta 403 zcmXxgJ!=9%5P;#iczVWfG>{@{p(u!zmUdPtLWHDB3X{eZmckW^pcoJfv9t@MNoA4d zYFmpSLJA8(wDM<&d3VnY%s#Wr?e6T26QA+^E^bbRh>=P1gS=L?!9cX}6+2kM4L)G- zLL`fI^xy!~IK&)&;T8U%7x&o117@(nro2dBMieO)zOjZ&yvG}pM!2krUFHK$QR_#1 z!8@NmKxW7m`9;;>8p~)|?n5fbl04!&KBH=2iv{kN6NPG^;CDN`#V6(qMlv>tZIVC=?F5aSN})&TwG#=45)e4w%?qI(K4K($2OgnH8=hM%PJ){ diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index c19de48..fccf648 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-15 21:15+0200\n" +"POT-Creation-Date: 2024-11-08 18:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,19 +17,19 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: workbench-script.py:48 workbench-script.py:53 +#: workbench-script.py:49 workbench-script.py:54 msgid "Running command `%s`" msgstr "Ejecutando comando `%s`" -#: workbench-script.py:284 +#: workbench-script.py:279 msgid "Created snapshots directory at '%s'" msgstr "Creado directorio de snapshots en '%s'" -#: workbench-script.py:287 +#: workbench-script.py:282 msgid "Snapshot written in path '%s'" msgstr "Snapshot escrito en ruta '%s'" -#: workbench-script.py:290 +#: workbench-script.py:285 msgid "" "Attempting to save file in actual path. Reason: Failed to write in snapshots " "directory:\n" @@ -39,11 +39,11 @@ msgstr "" "escribir en el directorio de snapshots:\n" " %s." -#: workbench-script.py:297 +#: workbench-script.py:292 msgid "Snapshot written in fallback path '%s'" msgstr "Snapshot escrito en ruta alternativa '%s'" -#: workbench-script.py:299 +#: workbench-script.py:294 msgid "" "Could not save snapshot locally. Reason: Failed to write in fallback path:\n" " %s" @@ -52,49 +52,53 @@ msgstr "" "alternativa:\n" " %s" -#: workbench-script.py:316 +#: workbench-script.py:317 msgid "Snapshot successfully sent to '%s'" msgstr "Snapshot enviado con éxito a '%s'" -#: workbench-script.py:331 +#: workbench-script.py:335 +msgid "Snapshot %s could not be sent to URL '%s'" +msgstr "Snapshot %s no se pudo enviar a la URL '%s'" + +#: workbench-script.py:338 msgid "" -"Snapshot not remotely sent to URL '%s'. Do you have internet? Is your server " -"up & running? Is the url token authorized?\n" +"Snapshot %s not remotely sent to URL '%s'. Do you have internet? Is your " +"server up & running? Is the url token authorized?\n" " %s" msgstr "" -"Snapshot no enviado remotamente a la URL '%s'. Tienes internet? Está el " +"Snapshot %s no enviado remotamente a la URL '%s'. Tienes internet? Está el " "servidor en marcha? Está autorizado el url token?\n" " %s" -#: workbench-script.py:342 +#: workbench-script.py:350 msgid "Found config file in path: %s." msgstr "Encontrado fichero de configuración en ruta: %s." -#: workbench-script.py:353 +#: workbench-script.py:361 msgid "Config file '%s' not found. Using default values." msgstr "" "Fichero de configuración '%s' no encontrado. Utilizando valores por defecto." -#: workbench-script.py:373 +#: workbench-script.py:379 msgid "workbench-script.py [-h] [--config CONFIG]" msgstr "" -#: workbench-script.py:374 +#: workbench-script.py:380 msgid "Optional config loader for workbench." msgstr "Cargador opcional de configuración para workbench" -#: workbench-script.py:377 +#: workbench-script.py:383 msgid "" "path to the config file. Defaults to 'settings.ini' in the current directory." msgstr "" "ruta al fichero de configuración. Por defecto es 'settings.ini' en el " "directorio actual" -#: workbench-script.py:410 +#: workbench-script.py:416 msgid "START" msgstr "INICIO" -#: workbench-script.py:423 +#: workbench-script.py:430 msgid "" "This script must be run as root. Collected data will be incomplete or " "unusable" @@ -102,6 +106,6 @@ msgstr "" "Es conveniente que este script sea ejecutado como administrador (root). Los " "datos recopilados serán incompletos o no usables." -#: workbench-script.py:441 +#: workbench-script.py:448 msgid "END" msgstr "FIN" -- 2.30.2