From 3a206f09965817dd1003a2153b5b2adeb1dc9975 Mon Sep 17 00:00:00 2001 From: "Jokob @NetAlertX" <96159884+jokob-sk@users.noreply.github.com> Date: Wed, 17 Jun 2026 06:43:26 +0000 Subject: [PATCH 1/4] Add REST Import plugin and corresponding tests - Implemented the REST Import plugin (rest_import.py) to handle importing data from REST APIs. - Added functionality for configurable HTTP methods, authentication types, and custom headers. - Included error handling for various HTTP response statuses and connection issues. - Created unit tests for the plugin covering header building, path resolution, MAC validation, record mapping, and authentication methods. - Ensured that module-level side effects are patched during tests to prevent live interactions. --- .../skills/plugin-development/plugin-skill.md | 16 + front/css/app.css | 7 + front/js/modal.js | 7 +- front/js/settings_utils.js | 1 + front/php/templates/modals.php | 2 +- front/plugins/rest_import/README.md | 84 + front/plugins/rest_import/config.json | 1459 +++++++++++++++++ front/plugins/rest_import/rest_import.py | 294 ++++ test/plugins/test_rest_import.py | 237 +++ 9 files changed, 2105 insertions(+), 2 deletions(-) create mode 100644 .gemini/skills/plugin-development/plugin-skill.md create mode 100644 front/plugins/rest_import/README.md create mode 100644 front/plugins/rest_import/config.json create mode 100644 front/plugins/rest_import/rest_import.py create mode 100644 test/plugins/test_rest_import.py diff --git a/.gemini/skills/plugin-development/plugin-skill.md b/.gemini/skills/plugin-development/plugin-skill.md new file mode 100644 index 000000000..215d9bf22 --- /dev/null +++ b/.gemini/skills/plugin-development/plugin-skill.md @@ -0,0 +1,16 @@ +# Plugin development skill + +1. Assess requirements +2. Read `docs/PLUGINS_DEV.md` +3. Confirm field mapping +4. Ask clarifying questions +5. code placed in `front/plugins/` + + +Plugin prefix: + +- has to be uppercase letters only (no underscores) +- must be unique +- keep short but readable if possible + + diff --git a/front/css/app.css b/front/css/app.css index 4a5b39fab..333da974e 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -1846,6 +1846,13 @@ textarea[readonly], display: grid; } +@media (min-width: 768px) { + .modal-dialog { + width: 750px; + margin: 30px auto; + } +} + /* ----------------------------------------------------------------- */ /* NETWORK page */ /* ----------------------------------------------------------------- */ diff --git a/front/js/modal.js b/front/js/modal.js index 0c4ec1fb6..b5d6113c0 100755 --- a/front/js/modal.js +++ b/front/js/modal.js @@ -208,7 +208,12 @@ function showModalPopupForm( } } - const fieldOptionsOverride = field.type?.elements[0]?.elementOptions || []; + // For select elements use field.options (the selectable values); for all other + // element types fall back to elementOptions (used for input attributes like placeholder). + const elementType = field.type?.elements[0]?.elementType; + const fieldOptionsOverride = (elementType === 'select' && field.options?.length) + ? field.options + : (field.type?.elements[0]?.elementOptions || []); const setValue = initialValue; const setType = JSON.stringify(field.type); const setEvents = field.events || []; // default to empty array if missing diff --git a/front/js/settings_utils.js b/front/js/settings_utils.js index ec6d00bc1..6cb01e622 100755 --- a/front/js/settings_utils.js +++ b/front/js/settings_utils.js @@ -1175,6 +1175,7 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori // Parse the setType JSON string // console.log(processQuotes(setType)); + console.log(setType); const setTypeObject = JSON.parse(processQuotes(setType)) const dataType = setTypeObject.dataType; diff --git a/front/php/templates/modals.php b/front/php/templates/modals.php index f7432290f..f142d2de3 100755 --- a/front/php/templates/modals.php +++ b/front/php/templates/modals.php @@ -129,7 +129,7 @@
Modal message
- +
diff --git a/front/plugins/rest_import/README.md b/front/plugins/rest_import/README.md new file mode 100644 index 000000000..27610c54c --- /dev/null +++ b/front/plugins/rest_import/README.md @@ -0,0 +1,84 @@ +## Overview + +Import devices from any REST API that returns JSON + +Designed to replace small vendor-specific plugins for systems like OPNsense, RouterOS, asset management tools, and custom inventory APIs. Multiple endpoints can be configured independently in a single plugin instance. + +### Quick setup guide + +Navigate to **Settings** > **REST Import** and click **Add** to create an import definition. + +| Field | Description | +|---|---| +| **Name** | Friendly label shown in logs (e.g. `OPNsense DHCP`) | +| **URL** | Full REST endpoint URL | +| **Method** | `GET` or `POST` | +| **Verify SSL** | Disable for self-signed certificates | +| **Auth Type** | `none`, `basic`, or `bearer` | +| **Username / API Key** | Used with `basic` auth | +| **Password / API Secret** | Used with `basic` auth | +| **Bearer Token** | Used with `bearer` auth | +| **Custom Headers** | Optional. One `Key: Value` per line | +| **POST Body** | Optional JSON body for `POST` requests | +| **Device List Path** | Dot-separated path to the array of records (e.g. `rows`, `data.devices`). Leave blank if the response is already an array | + +### Field mapping + +Map API response fields to NetAlertX scan fields. Leave a mapping blank to skip that field. + +| Popup field | Scan column | +|---|---| +| MAC Address | `scanMac` | +| IP Address | `scanLastIP` | +| Device Name | `scanName` | +| Vendor | `scanVendor` | +| SSID | `scanSSID` | +| Device Type | `scanType` | +| Parent MAC | `scanParentMAC` | +| Parent Port | `scanParentPort` | +| Site | `scanSite` | +| VLAN | `scanVlan` | + +### Fake MAC generation + +Enable **Generate Fake MAC** when the API does not expose MAC addresses (e.g. remote ICMP scans, IP-only inventory systems). A deterministic fake MAC is derived from the IP address using the `fa:ce:` prefix. Requires a valid IP mapping. + +> [!WARNING] +> Fake MACs can cause inconsistencies if IP addresses change between scans. Static IPs are strongly recommended when using this feature. + +### Example: OPNsense Dnsmasq API + +**Response:** +```json +{ + "rows": [ + { + "hwaddr": "94:18:65:de:22:01", + "address": "192.168.1.2", + "hostname": "Orbi-Base-Station", + "mac_info": "NETGEAR" + } + ] +} +``` + +**Configuration:** +``` +Name: OPNsense DHCP +URL: https://firewall/api/dnsmasq/leases/search +Method: GET +Auth Type: basic +Username: admin +Device List Path: rows +MAC Address: hwaddr +IP Address: address +Device Name: hostname +Vendor: mac_info +``` + +### Notes + +- Version: 1.0.0 +- Author: `jokob-sk` +- Records with missing or invalid MAC addresses are skipped unless **Generate Fake MAC** is enabled +- Each import definition executes independently; failed imports do not block others diff --git a/front/plugins/rest_import/config.json b/front/plugins/rest_import/config.json new file mode 100644 index 000000000..5ae42a035 --- /dev/null +++ b/front/plugins/rest_import/config.json @@ -0,0 +1,1459 @@ +{ + "code_name": "rest_import", + "unique_prefix": "RSTIMPRT", + "plugin_type": "device_scanner", + "execution_order": "Layer_0", + "enabled": true, + "data_source": "script", + "mapped_to_table": "CurrentScan", + "data_filters": [ + { + "compare_column": "objectPrimaryId", + "compare_operator": "==", + "compare_field_id": "txtMacFilter", + "compare_js_template": "'{value}'.toString()", + "compare_use_quotes": true + } + ], + "show_ui": true, + "localized": [ + "display_name", + "description", + "icon" + ], + "display_name": [ + { + "language_code": "en_us", + "string": "REST Import" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Import devices from any REST API that returns JSON. Supports GET and POST, Basic and Bearer authentication, and flexible field mapping." + } + ], + "icon": [ + { + "language_code": "en_us", + "string": "" + } + ], + "params": [], + "settings": [ + { + "function": "RUN", + "events": [ + "run" + ], + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "select", + "elementOptions": [], + "transformers": [] + } + ] + }, + "default_value": "disabled", + "options": [ + "disabled", + "once", + "schedule" + ], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "When to run" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "When the plugin should run. Good options are schedule or once." + } + ] + }, + { + "function": "RUN_SCHD", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "span", + "elementOptions": [ + { + "cssClasses": "input-group-addon validityCheck" + }, + { + "getStringKey": "Gen_ValidIcon" + } + ], + "transformers": [] + }, + { + "elementType": "input", + "elementOptions": [ + { + "focusout": "validateRegex(this)" + }, + { + "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldKyg/Oi9bMC05XSspP3xcKi9bMC05XSspKSg/OiwoPzpbMC05XXxbMS01XVswLTldfFswLTldKy1bMC05XSsoPzovWzAtOV0rKT98XCovWzAtOV0rKSkqXHMrKD86XCp8KD86WzAtOV18MVswLTldfDJbMC0zXXxbMC05XSstWzAtOV0rKD86L1swLTldKyk/fFwqL1swLTldKykpKD86LCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldKyg/Oi9bMC05XSspP3xcKi9bMC05XSspKSpccysoPzpcKnwoPzpbMS05XXxbMTJdWzAtOV18M1swMV18WzAtOV0rLVswLTldKyg/Oi9bMC05XSspP3xcKi9bMC05XSspKSg/OiwoPzpbMS05XXxbMTJdWzAtOV18M1swMV18WzAtOV0rLVswLTldKyg/Oi9bMC05XSspP3xcKi9bMC05XSspKSpccysoPzpcKnwoPzpbMS05XXwxWzAtMl18WzAtOV0rLVswLTldKyg/Oi9bMC05XSspP3xcKi9bMC05XSspKSg/OiwoPzpbMS05XXwxWzAtMl18WzAtOV0rLVswLTldKyg/Oi9bMC05XSspP3xcKi9bMC05XSspKSpccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XSg/Oi9bMC05XSspP3xcKi9bMC05XSspKSg/OiwoPzpbMC02XXxbMC02XS1bMC02XSg/Oi9bMC05XSspP3xcKi9bMC02XSspKSok" + } + ], + "transformers": [] + } + ] + }, + "default_value": "*/5 * * * *", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Schedule" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Only used when RSTIMPRT_RUN is set to schedule. Standard cron format (e.g. validate at crontab.guru)." + } + ] + }, + { + "function": "CMD", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "readonly": "true" + } + ], + "transformers": [] + } + ] + }, + "default_value": "python3 /app/front/plugins/rest_import/rest_import.py", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Command" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Command to run. This cannot be changed." + } + ] + }, + { + "function": "RUN_TIMEOUT", + "type": { + "dataType": "integer", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "type": "number" + } + ], + "transformers": [] + } + ] + }, + "default_value": 30, + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Run timeout" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Maximum seconds to wait for all imports to complete before aborting." + } + ] + }, + { + "function": "imports", + "type": { + "dataType": "array", + "elements": [ + { + "elementType": "button", + "elementOptions": [ + { + "sourceSuffixes": [] + }, + { + "separator": "" + }, + { + "cssClasses": "col-xs-12" + }, + { + "onClick": "addViaPopupForm(this)" + }, + { + "getStringKey": "Gen_Add" + } + ], + "transformers": [] + }, + { + "elementType": "select", + "elementHasInputValue": 1, + "elementOptions": [ + { + "multiple": "true" + }, + { + "readonly": "true" + }, + { + "editable": "true" + }, + { + "popupForm": [ + { + "function": "RSTIMPRT_name", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. OPNsense DHCP" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Name" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Friendly name for this import definition. Shown in logs." + } + ] + }, + { + "function": "RSTIMPRT_url", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "https://host/api/endpoint" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "URL" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Full URL of the REST endpoint." + } + ] + }, + { + "function": "RSTIMPRT_method", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "select", + "elementOptions": [ + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "GET", + "options": [ + "GET", + "POST" + ], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Method" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "HTTP method to use when calling the endpoint." + } + ] + }, + { + "function": "RSTIMPRT_verify_ssl", + "type": { + "dataType": "boolean", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "type": "checkbox" + } + ], + "transformers": [] + } + ] + }, + "default_value": 1, + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Verify SSL" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Disable if the endpoint does not have a valid certificate." + } + ] + }, + { + "function": "RSTIMPRT_auth_type", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "select", + "elementOptions": [ + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "none", + "options": [ + "none", + "basic", + "bearer" + ], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Auth Type" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Authentication type. Use basic for username/password, bearer for token." + } + ] + }, + { + "function": "RSTIMPRT_username", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "Username or API Key" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Username / API Key" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Used when Auth Type is basic." + } + ] + }, + { + "function": "RSTIMPRT_password", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "Password or API Secret" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Password / API Secret" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Used when Auth Type is basic." + } + ] + }, + { + "function": "RSTIMPRT_bearer_token", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "Bearer token" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Bearer Token" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Used when Auth Type is bearer." + } + ] + }, + { + "function": "RSTIMPRT_headers", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "Accept: application/json" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Custom Headers" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Optional. One Key: Value pair per line. Sent with every request." + } + ] + }, + { + "function": "RSTIMPRT_post_body", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "Optional JSON body for POST requests" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "POST Body" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Optional JSON body sent with POST requests. Leave blank for no body." + } + ] + }, + { + "function": "RSTIMPRT_device_path", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "rows" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Device List Path" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "Dot-separated path to the array of device records in the JSON response. Example: rows or data.devices. Leave blank if the response is already an array." + } + ] + }, + { + "function": "RSTIMPRT_scanMac", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. hwaddr" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "MAC Address" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "API field containing the MAC address. Required unless Fake MAC is enabled." + } + ] + }, + { + "function": "RSTIMPRT_scanLastIP", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. address" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "IP Address" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "API field containing the IP address." + } + ] + }, + { + "function": "RSTIMPRT_scanName", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. hostname" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Device Name" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "API field containing the device name or hostname." + } + ] + }, + { + "function": "RSTIMPRT_scanVendor", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. mac_info" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Vendor" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "API field containing the device vendor or manufacturer." + } + ] + }, + { + "function": "RSTIMPRT_scanSSID", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. wlan" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "SSID" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "API field containing the wireless SSID." + } + ] + }, + { + "function": "RSTIMPRT_scanType", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. device_type" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Device Type" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "API field containing the device type." + } + ] + }, + { + "function": "RSTIMPRT_scanParentMAC", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. parent_mac" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Parent MAC" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "API field containing the parent device MAC address." + } + ] + }, + { + "function": "RSTIMPRT_scanParentPort", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. port" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Parent Port" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "API field containing the port on the parent device." + } + ] + }, + { + "function": "RSTIMPRT_scanSite", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. site" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Site" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "API field containing the site name." + } + ] + }, + { + "function": "RSTIMPRT_scanVlan", + "type": { + "dataType": "string", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "placeholder": "e.g. vlan" + }, + { + "cssClasses": "col-sm-10" + } + ], + "transformers": [] + } + ] + }, + "default_value": "", + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "VLAN" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "API field containing the VLAN identifier." + } + ] + }, + { + "function": "RSTIMPRT_fake_mac", + "type": { + "dataType": "boolean", + "elements": [ + { + "elementType": "input", + "elementOptions": [ + { + "type": "checkbox" + } + ], + "transformers": [] + } + ] + }, + "default_value": 0, + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Generate Fake MAC" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "When enabled, a deterministic fake MAC is generated from the IP address if the MAC field is missing or invalid. Requires a valid IP mapping." + } + ] + } + ], + "transformers": [] + } + ], + "transformers": [ + "name|base64" + ] + }, + { + "elementType": "button", + "elementOptions": [ + { + "sourceSuffixes": [] + }, + { + "separator": "" + }, + { + "cssClasses": "col-xs-6" + }, + { + "onClick": "removeFromList(this)" + }, + { + "getStringKey": "Gen_Remove_Last" + } + ], + "transformers": [] + }, + { + "elementType": "button", + "elementOptions": [ + { + "sourceSuffixes": [] + }, + { + "separator": "" + }, + { + "cssClasses": "col-xs-6" + }, + { + "onClick": "removeAllOptions(this)" + }, + { + "getStringKey": "Gen_Remove_All" + } + ], + "transformers": [] + } + ] + }, + "default_value": [], + "options": [], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "REST Imports" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "List of REST import definitions. Each entry is one endpoint with its own authentication and field mapping." + } + ] + }, + { + "function": "SET_ALWAYS", + "type": { + "dataType": "array", + "elements": [ + { + "elementType": "select", + "elementOptions": [ + { + "multiple": "true", + "orderable": "true" + } + ], + "transformers": [] + } + ] + }, + "default_value": [ + "devMac", + "devLastIP" + ], + "options": [ + "devMac", + "devLastIP", + "devName", + "devVendor", + "devSite", + "devType", + "devParentMAC", + "devParentPort" + ], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Set always columns" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "These columns are treated as authoritative and will overwrite existing values, including those set by other plugins, unless the current value was explicitly set by the user (Source = USER or Source = LOCKED)." + } + ] + }, + { + "function": "SET_EMPTY", + "type": { + "dataType": "array", + "elements": [ + { + "elementType": "select", + "elementOptions": [ + { + "multiple": "true", + "orderable": "true" + } + ], + "transformers": [] + } + ] + }, + "default_value": [], + "options": [ + "devMac", + "devLastIP", + "devName", + "devVendor", + "devSite", + "devType", + "devParentMAC", + "devParentPort" + ], + "localized": [ + "name", + "description" + ], + "name": [ + { + "language_code": "en_us", + "string": "Set empty columns" + } + ], + "description": [ + { + "language_code": "en_us", + "string": "These columns are only overwritten if they are currently empty (NULL / empty string) or their source is NEWDEV." + } + ] + } + ], + "database_column_definitions": [ + { + "column": "index", + "css_classes": "col-sm-1", + "show": true, + "type": "none", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "Index" + } + ] + }, + { + "column": "objectPrimaryId", + "mapped_to_column": "scanMac", + "css_classes": "col-sm-2", + "show": true, + "type": "device_name_mac", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "MAC" + } + ] + }, + { + "column": "objectSecondaryId", + "mapped_to_column": "scanLastIP", + "css_classes": "col-sm-2", + "show": true, + "type": "device_ip", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "IP" + } + ] + }, + { + "column": "watchedValue1", + "mapped_to_column": "scanName", + "css_classes": "col-sm-2", + "show": true, + "type": "label", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "Name" + } + ] + }, + { + "column": "watchedValue2", + "mapped_to_column": "scanVendor", + "css_classes": "col-sm-2", + "show": true, + "type": "label", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "Vendor" + } + ] + }, + { + "column": "watchedValue3", + "mapped_to_column": "scanSSID", + "css_classes": "col-sm-2", + "show": false, + "type": "label", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "SSID" + } + ] + }, + { + "column": "watchedValue4", + "mapped_to_column": "scanType", + "css_classes": "col-sm-2", + "show": false, + "type": "label", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "Type" + } + ] + }, + { + "column": "helpVal1", + "mapped_to_column": "scanParentMAC", + "css_classes": "col-sm-2", + "show": false, + "type": "label", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "Parent MAC" + } + ] + }, + { + "column": "helpVal2", + "mapped_to_column": "scanParentPort", + "css_classes": "col-sm-2", + "show": false, + "type": "label", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "Parent Port" + } + ] + }, + { + "column": "helpVal3", + "mapped_to_column": "scanSite", + "css_classes": "col-sm-2", + "show": false, + "type": "label", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "Site" + } + ] + }, + { + "column": "helpVal4", + "mapped_to_column": "scanVlan", + "css_classes": "col-sm-2", + "show": false, + "type": "label", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "VLAN" + } + ] + }, + { + "column": "Dummy", + "mapped_to_column": "scanSourcePlugin", + "mapped_to_column_data": { + "value": "RSTIMPRT" + }, + "css_classes": "col-sm-0", + "show": false, + "type": "label", + "default_value": "", + "options": [], + "localized": [ + "name" + ], + "name": [ + { + "language_code": "en_us", + "string": "Source" + } + ] + } + ] +} diff --git a/front/plugins/rest_import/rest_import.py b/front/plugins/rest_import/rest_import.py new file mode 100644 index 000000000..5e90be5a3 --- /dev/null +++ b/front/plugins/rest_import/rest_import.py @@ -0,0 +1,294 @@ +#!/usr/bin/env python + +import os +import sys +import re +import requests +from pytz import timezone + +INSTALL_PATH = os.getenv('NETALERTX_APP', '/app') +sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"]) + +from plugin_helper import Plugin_Objects, decode_settings_base64, normalize_mac # noqa: E402 +from logger import mylog, Logger # noqa: E402 +from helper import get_setting_value # noqa: E402 +from const import logPath # noqa: E402 +from utils.crypto_utils import string_to_fake_mac # noqa: E402 +import conf # noqa: E402 + +conf.tz = timezone(get_setting_value('TIMEZONE')) +Logger(get_setting_value('LOG_LEVEL')) + +pluginName = 'RSTIMPRT' + +LOG_PATH = logPath + '/plugins' +RESULT_FILE = os.path.join(LOG_PATH, f'last_result.{pluginName}.log') + +VALID_METHODS = ('GET', 'POST') +VALID_AUTH_TYPES = ('none', 'basic', 'bearer') + +# Valid normalized MAC: exactly xx:xx:xx:xx:xx:xx with hex digits +_MAC_RE = re.compile(r'^([0-9a-f]{2}:){5}[0-9a-f]{2}$') + +# Ordered scan field keys as they appear in add_object() positional slots +SCAN_FIELD_SLOTS = [ + 'RSTIMPRT_scanName', # watched1 + 'RSTIMPRT_scanVendor', # watched2 + 'RSTIMPRT_scanSSID', # watched3 + 'RSTIMPRT_scanType', # watched4 + 'RSTIMPRT_scanParentMAC', # helpVal1 + 'RSTIMPRT_scanParentPort', # helpVal2 + 'RSTIMPRT_scanSite', # helpVal3 + 'RSTIMPRT_scanVlan', # helpVal4 +] + + +def main(): + mylog('verbose', [f'[{pluginName}] In script']) + + import_configs = get_setting_value('RSTIMPRT_imports') + plugin_objects = Plugin_Objects(RESULT_FILE) + + if not import_configs: + mylog('none', [f'[{pluginName}] No import definitions configured']) + plugin_objects.write_result_file() + return 0 + + mylog('verbose', [f'[{pluginName}] Import definitions: {len(import_configs)}']) + + for raw_config in import_configs: + cfg = decode_settings_base64(raw_config) + process_import(cfg, plugin_objects) + + plugin_objects.write_result_file() + return 0 + + +def process_import(cfg, plugin_objects): + name = cfg.get('RSTIMPRT_name', 'Unnamed') + url = cfg.get('RSTIMPRT_url', '').strip() + method = cfg.get('RSTIMPRT_method', 'GET').strip().upper() + verify_ssl = bool(cfg.get('RSTIMPRT_verify_ssl', True)) + auth_type = cfg.get('RSTIMPRT_auth_type', 'none').strip().lower() + username = cfg.get('RSTIMPRT_username', '') + password = cfg.get('RSTIMPRT_password', '') + bearer_token = cfg.get('RSTIMPRT_bearer_token', '') + raw_headers = cfg.get('RSTIMPRT_headers', '') + post_body = cfg.get('RSTIMPRT_post_body', '') + device_path = cfg.get('RSTIMPRT_device_path', '').strip() + mac_field = cfg.get('RSTIMPRT_scanMac', '').strip() + ip_field = cfg.get('RSTIMPRT_scanLastIP', '').strip() + fake_mac = bool(cfg.get('RSTIMPRT_fake_mac', False)) + + mylog('none', [f'[{pluginName}] {name}']) + + if not url: + mylog('none', [f'[{pluginName}] Skipping "{name}" - URL is empty']) + return + + if method not in VALID_METHODS: + mylog('none', [f'[{pluginName}] Skipping "{name}" - invalid method "{method}"']) + return + + if auth_type not in VALID_AUTH_TYPES: + mylog('none', [f'[{pluginName}] Skipping "{name}" - invalid auth_type "{auth_type}"']) + return + + headers = build_headers(raw_headers) + auth = build_auth(auth_type, username, password, bearer_token, headers) + + response = make_request(name, url, method, verify_ssl, auth, headers, post_body) + if response is None: + return + + try: + data = response.json() + except ValueError: + mylog('none', [f'[{pluginName}] Invalid JSON response from "{name}"']) + return + + records = resolve_path(name, data, device_path) + if records is None: + return + + imported = 0 + skipped = 0 + + for idx, record in enumerate(records): + result = map_record(name, idx, record, cfg, mac_field, ip_field, fake_mac) + if result is None: + skipped += 1 + continue + + plugin_objects.add_object( + primaryId = result['mac'], + secondaryId = result['ip'], + watched1 = result['name'], + watched2 = result['vendor'], + watched3 = result['ssid'], + watched4 = result['dev_type'], + extra = '', + foreignKey = result['mac'], + helpVal1 = result['parent_mac'], + helpVal2 = result['parent_port'], + helpVal3 = result['site'], + helpVal4 = result['vlan'], + ) + imported += 1 + + mylog('none', [f'[{pluginName}] Retrieved {len(records)} records']) + mylog('none', [f'[{pluginName}] Imported {imported} devices']) + if skipped: + mylog('none', [f'[{pluginName}] Skipped {skipped} devices']) + + +def build_headers(raw_headers_str): + headers = {} + if not raw_headers_str: + return headers + for line in raw_headers_str.splitlines(): + line = line.strip() + if not line or ':' not in line: + continue + key, _, value = line.partition(':') + key = key.strip() + value = value.strip() + if key: + headers[key] = value + return headers + + +def build_auth(auth_type, username, password, bearer_token, headers): + if auth_type == 'basic' and username: + return (username, password) + if auth_type == 'bearer' and bearer_token: + headers['Authorization'] = f'Bearer {bearer_token}' + return None + + +def make_request(name, url, method, verify_ssl, auth, headers, post_body): + try: + body_data = None + if method == 'POST' and post_body: + body_data = post_body + + response = requests.request( + method=method, + url=url, + headers=headers, + auth=auth, + data=body_data, + verify=verify_ssl, + timeout=30, + ) + + mylog('verbose', [f'[{pluginName}] {name} HTTP {response.status_code}']) + + if response.status_code == 401: + mylog('none', [f'[{pluginName}] Authentication failed for "{name}"']) + return None + + if not response.ok: + mylog('none', [f'[{pluginName}] HTTP error {response.status_code} for "{name}"']) + return None + + return response + + except requests.exceptions.SSLError: + mylog('none', [f'[{pluginName}] SSL error for "{name}" - try disabling Verify SSL']) + return None + except requests.exceptions.ConnectionError: + mylog('none', [f'[{pluginName}] Connection error for "{name}" - check URL']) + return None + except requests.exceptions.Timeout: + mylog('none', [f'[{pluginName}] Request timed out for "{name}"']) + return None + except requests.exceptions.RequestException as e: + mylog('none', [f'[{pluginName}] Request error for "{name}": {e}']) + return None + + +def resolve_path(name, data, path): + if not path: + if isinstance(data, list): + return data + mylog('none', [f'[{pluginName}] Device path not configured and response is not an array for "{name}"']) + return None + + node = data + for key in path.split('.'): + if not isinstance(node, dict) or key not in node: + mylog('none', [f'[{pluginName}] Device path not found: {path} for "{name}"']) + return None + node = node[key] + + if not isinstance(node, list): + mylog('none', [f'[{pluginName}] Device path "{path}" does not point to an array for "{name}"']) + return None + + return node + + +def map_record(name, idx, record, cfg, mac_field, ip_field, fake_mac): + raw_mac = record.get(mac_field, '') if mac_field else '' + raw_ip = record.get(ip_field, '') if ip_field else '' + + mac = _resolve_mac(name, idx, raw_mac, raw_ip, fake_mac) + if mac is None: + return None + + ip = str(raw_ip).strip() if raw_ip else '' + + return { + 'mac': mac, + 'ip': ip, + 'name': _get_field(record, cfg, 'RSTIMPRT_scanName'), + 'vendor': _get_field(record, cfg, 'RSTIMPRT_scanVendor'), + 'ssid': _get_field(record, cfg, 'RSTIMPRT_scanSSID'), + 'dev_type': _get_field(record, cfg, 'RSTIMPRT_scanType'), + 'parent_mac': _get_field(record, cfg, 'RSTIMPRT_scanParentMAC'), + 'parent_port': _get_field(record, cfg, 'RSTIMPRT_scanParentPort'), + 'site': _get_field(record, cfg, 'RSTIMPRT_scanSite'), + 'vlan': _get_field(record, cfg, 'RSTIMPRT_scanVlan'), + } + + +def _resolve_mac(name, idx, raw_mac, raw_ip, fake_mac): + if raw_mac: + mac = validate_mac(str(raw_mac)) + if mac: + return mac + + if fake_mac: + ip = str(raw_ip).strip() if raw_ip else '' + if ip: + return string_to_fake_mac(ip) + mylog('none', [f'[{pluginName}] Skipped record {idx} - no IP for fake MAC generation for "{name}"']) + return None + + mylog('none', [f'[{pluginName}] Skipped record {idx} - invalid MAC address for "{name}"']) + return None + + +def _get_field(record, cfg, config_key): + api_field = cfg.get(config_key, '').strip() + if not api_field: + return '' + value = record.get(api_field, '') + return str(value).strip() if value is not None else '' + + +def validate_mac(raw): + if not raw: + return None + mac = normalize_mac(raw) + if not mac: + return None + # normalize_mac reformats any string — verify result is actually a MAC + if not _MAC_RE.match(mac.lower()): + return None + return mac + + +if __name__ == '__main__': + main() diff --git a/test/plugins/test_rest_import.py b/test/plugins/test_rest_import.py new file mode 100644 index 000000000..eeef374a3 --- /dev/null +++ b/test/plugins/test_rest_import.py @@ -0,0 +1,237 @@ +""" +Tests for the REST Import plugin (rest_import.py). + +Module-level side effects (get_setting_value, Logger, Plugin_Objects, +conf.tz) are patched before import to prevent live config reads, +log file creation, or network calls during tests. +""" + +import sys +import os +from unittest.mock import patch, MagicMock + +import pytest + +# --------------------------------------------------------------------------- +# Path setup +# --------------------------------------------------------------------------- + +_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')) +_SERVER = os.path.join(_ROOT, 'server') +_PLUGIN_DIR = os.path.join(_ROOT, 'front', 'plugins', 'rest_import') + +for _p in [_ROOT, _SERVER, _PLUGIN_DIR, os.path.join(_ROOT, 'front', 'plugins')]: + if _p not in sys.path: + sys.path.insert(0, _p) + +# --------------------------------------------------------------------------- +# Import module with side effects patched +# --------------------------------------------------------------------------- + +with patch('helper.get_setting_value', return_value='UTC'), \ + patch('logger.Logger'), \ + patch('plugin_helper.Plugin_Objects'): + import rest_import # noqa: E402 + +from utils.crypto_utils import string_to_fake_mac # noqa: E402 + + +# --------------------------------------------------------------------------- +# build_headers +# --------------------------------------------------------------------------- + +class TestBuildHeaders: + def test_empty_string_returns_empty_dict(self): + assert rest_import.build_headers('') == {} + + def test_none_returns_empty_dict(self): + assert rest_import.build_headers(None) == {} + + def test_single_header(self): + result = rest_import.build_headers('Accept: application/json') + assert result == {'Accept': 'application/json'} + + def test_multiple_headers(self): + raw = 'Accept: application/json\nX-API-Key: abc123' + result = rest_import.build_headers(raw) + assert result == {'Accept': 'application/json', 'X-API-Key': 'abc123'} + + def test_value_with_colon_preserved(self): + result = rest_import.build_headers('Authorization: Bearer tok:en') + assert result == {'Authorization': 'Bearer tok:en'} + + def test_malformed_line_without_colon_is_skipped(self): + result = rest_import.build_headers('nocolonhere\nValid: yes') + assert result == {'Valid': 'yes'} + + def test_blank_lines_skipped(self): + result = rest_import.build_headers('\n \nAccept: text/plain\n') + assert result == {'Accept': 'text/plain'} + + +# --------------------------------------------------------------------------- +# resolve_path +# --------------------------------------------------------------------------- + +class TestResolvePath: + def test_empty_path_with_list_response(self): + data = [{'mac': 'AA:BB:CC:DD:EE:FF'}] + result = rest_import.resolve_path('test', data, '') + assert result == data + + def test_flat_key(self): + data = {'rows': [{'mac': 'AA:BB:CC:DD:EE:FF'}]} + result = rest_import.resolve_path('test', data, 'rows') + assert result == data['rows'] + + def test_dot_notation(self): + data = {'data': {'devices': [{'mac': 'AA:BB:CC:DD:EE:FF'}]}} + result = rest_import.resolve_path('test', data, 'data.devices') + assert result == data['data']['devices'] + + def test_missing_path_returns_none(self): + data = {'rows': []} + result = rest_import.resolve_path('test', data, 'missing.key') + assert result is None + + def test_path_points_to_non_list_returns_none(self): + data = {'rows': {'not': 'a list'}} + result = rest_import.resolve_path('test', data, 'rows') + assert result is None + + def test_empty_path_non_list_response_returns_none(self): + result = rest_import.resolve_path('test', {'key': 'value'}, '') + assert result is None + + +# --------------------------------------------------------------------------- +# validate_mac +# --------------------------------------------------------------------------- + +class TestValidateMac: + def test_colon_separated_valid(self): + mac = rest_import.validate_mac('AA:BB:CC:DD:EE:FF') + assert mac is not None + + def test_dash_separated_valid(self): + mac = rest_import.validate_mac('AA-BB-CC-DD-EE-FF') + assert mac is not None + + def test_bare_hex_valid(self): + mac = rest_import.validate_mac('AABBCCDDEEFF') + assert mac is not None + + def test_invalid_string_returns_none(self): + assert rest_import.validate_mac('not-a-mac') is None + + def test_empty_returns_none(self): + assert rest_import.validate_mac('') is None + + def test_placeholder_unknown_returns_none(self): + assert rest_import.validate_mac('unknown') is None + + def test_placeholder_star_returns_none(self): + assert rest_import.validate_mac('*') is None + + def test_null_string_returns_none(self): + assert rest_import.validate_mac('null') is None + + +# --------------------------------------------------------------------------- +# map_record +# --------------------------------------------------------------------------- + +class TestMapRecord: + def _cfg(self, mac_field='hwaddr', ip_field='address', fake_mac=False, **extra): + cfg = { + 'RSTIMPRT_scanMac': mac_field, + 'RSTIMPRT_scanLastIP': ip_field, + 'RSTIMPRT_scanName': 'hostname', + 'RSTIMPRT_scanVendor': '', + 'RSTIMPRT_scanSSID': '', + 'RSTIMPRT_scanType': '', + 'RSTIMPRT_scanParentMAC': '', + 'RSTIMPRT_scanParentPort': '', + 'RSTIMPRT_scanSite': '', + 'RSTIMPRT_scanVlan': '', + 'RSTIMPRT_fake_mac': fake_mac, + } + cfg.update(extra) + return cfg + + def test_valid_record_returns_dict(self): + record = {'hwaddr': 'AA:BB:CC:DD:EE:FF', 'address': '192.168.1.10', 'hostname': 'mydevice'} + cfg = self._cfg() + result = rest_import.map_record('test', 0, record, cfg, 'hwaddr', 'address', False) + assert result is not None + assert result['ip'] == '192.168.1.10' + assert result['name'] == 'mydevice' + + def test_invalid_mac_without_fake_mac_returns_none(self): + record = {'hwaddr': 'not-a-mac', 'address': '192.168.1.10'} + cfg = self._cfg() + result = rest_import.map_record('test', 0, record, cfg, 'hwaddr', 'address', False) + assert result is None + + def test_missing_mac_with_fake_mac_enabled_generates_mac(self): + record = {'address': '192.168.1.50', 'hostname': 'server01'} + cfg = self._cfg(mac_field='', fake_mac=True) + result = rest_import.map_record('test', 0, record, cfg, '', 'address', True) + assert result is not None + expected_mac = string_to_fake_mac('192.168.1.50') + assert result['mac'] == expected_mac + + def test_fake_mac_enabled_but_no_ip_returns_none(self): + record = {'hostname': 'noip'} + cfg = self._cfg(mac_field='', ip_field='', fake_mac=True) + result = rest_import.map_record('test', 0, record, cfg, '', '', True) + assert result is None + + def test_optional_fields_default_to_empty_when_not_configured(self): + record = {'hwaddr': 'AA:BB:CC:DD:EE:FF', 'address': '10.0.0.1'} + cfg = self._cfg() + result = rest_import.map_record('test', 0, record, cfg, 'hwaddr', 'address', False) + assert result is not None + assert result['vendor'] == '' + assert result['ssid'] == '' + assert result['vlan'] == '' + + def test_valid_mac_takes_precedence_over_fake_mac_setting(self): + record = {'hwaddr': 'AA:BB:CC:DD:EE:FF', 'address': '192.168.1.10'} + cfg = self._cfg(fake_mac=True) + result = rest_import.map_record('test', 0, record, cfg, 'hwaddr', 'address', True) + assert result is not None + # Should use the real MAC, not a fake one + assert not result['mac'].startswith('fa:ce:') + + +# --------------------------------------------------------------------------- +# build_auth +# --------------------------------------------------------------------------- + +class TestBuildAuth: + def test_none_auth_returns_none(self): + headers = {} + auth = rest_import.build_auth('none', 'user', 'pass', 'token', headers) + assert auth is None + + def test_basic_auth_returns_tuple(self): + headers = {} + auth = rest_import.build_auth('basic', 'myuser', 'mypass', '', headers) + assert auth == ('myuser', 'mypass') + + def test_bearer_auth_injects_header(self): + headers = {} + auth = rest_import.build_auth('bearer', '', '', 'mytoken', headers) + assert auth is None + assert headers.get('Authorization') == 'Bearer mytoken' + + def test_basic_auth_without_username_returns_none(self): + headers = {} + auth = rest_import.build_auth('basic', '', 'pass', '', headers) + assert auth is None + + def test_bearer_without_token_does_not_inject_header(self): + headers = {} + rest_import.build_auth('bearer', '', '', '', headers) + assert 'Authorization' not in headers From 9c6e6d5f48f5337f9ff9c098ff209046441c5ee3 Mon Sep 17 00:00:00 2001 From: "Jokob @NetAlertX" <96159884+jokob-sk@users.noreply.github.com> Date: Wed, 17 Jun 2026 06:43:45 +0000 Subject: [PATCH 2/4] fix: Correct comment formatting in modals.php --- front/php/templates/modals.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/php/templates/modals.php b/front/php/templates/modals.php index f142d2de3..63f15b94b 100755 --- a/front/php/templates/modals.php +++ b/front/php/templates/modals.php @@ -1,6 +1,6 @@