kawaandClaude Opus 5
b397d3dc3d
Session - COOKIE_SECURE=false no longer persists the owner key for ten years. services/session.cookie_kwargs() drops max_age in that mode, so the browser holds the key in memory and the session ends with the window. Everything still persists server-side; only the browser link is temporary. base.html shows a warning banner (FR/EN) and an extra paragraph in the onboarding modal, and the README explains the trade-off and the backup-key escape hatch. - Both cookie writers (middleware, POST /session/restore) go through cookie_kwargs() so the policy cannot drift between them. - The CSRF guard on /session/restore compared request.url.scheme against the Origin header. Behind a TLS-terminating proxy uvicorn sees http while the browser sends https, so every legitimate restore was rejected with 403. It now compares hosts only, including X-Forwarded-Host. - /static/*, /favicon.ico and /robots.txt skip the middleware. Each cookieless hit was inserting an Owner row no browser could ever use. Reliability - Malformed printer-form FK fields no longer escape as HTTP 500: a non-numeric client_id/driver_id raised ValueError and an unknown driver_id hit a FOREIGN KEY constraint. Both are now 400/404 HTMX fragments, and the duplicated field checks moved into _validate_fields(). - Package exports stream. build_intunewin() encrypts the inner ZIP in 1 MB chunks against temp files with a streaming HMAC and SHA256, and both endpoints serve the result with FileResponse plus a background cleanup task. A 100 MB driver used to be held in memory three or four times over per concurrent download. The byte layout is unchanged. - FileResponse also escapes the download filename, which was previously interpolated raw into Content-Disposition. - python-multipart >= 0.0.18 (CVE-2024-53981, reachable from /drivers/upload) and Pillow >= 10.3 (CVE-2024-28219, reachable from icon upload). - icons.py reads cfg.ICONS_DIR instead of re-deriving the path from DATA_DIR, matching the .intunewin export. UI - Sidebar/topbar shell, inline SVG icon macros (partials/icons.html), card and data-table components, grouped printer list, and the dedicated /printers/new page replacing partials/printer_form.html. Tests - 194 pass with a bare `pytest tests/`: tests/conftest.py now forces cfg.COOKIE_SECURE = False like the e2e conftest already did, so the Secure cookie is no longer dropped over http://testserver. - New coverage for the malformed-FK guards, the chunk-boundary cases in the encrypt loop (every residue mod _CHUNK plus a multi-megabyte payload), temp-dir cleanup after both exports, and the whole COOKIE_SECURE matrix. - test_printer_edit.py located the Edit button by its translated label, so it only passed on English-locale machines. It now targets the showModal() hook, which also cuts the e2e run from 84s to 15s. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
92 lines
3.5 KiB
HTML
92 lines
3.5 KiB
HTML
{% extends "base.html" %}
|
|
{% import "partials/icons.html" as ico %}
|
|
|
|
{% block head_title %}Packages · ImpTune{% endblock %}
|
|
{% block page_title %}<span x-data x-text="$store.i18n.t('packages_title')">Packages</span>{% endblock %}
|
|
|
|
{% block content %}
|
|
<p class="page-intro" x-data x-text="$store.i18n.t('packages_description')">Printers with a driver assigned — ready for export.</p>
|
|
|
|
{% if printers %}
|
|
<div class="card-grid">
|
|
<div class="card">
|
|
<div class="card-head">
|
|
{{ ico.i('package') }}
|
|
<h2 class="mono">.intunewin</h2>
|
|
</div>
|
|
<div class="card-body">
|
|
<p class="dim" x-data x-text="$store.i18n.t('hint_intunewin')">.intunewin — upload to Intune as a Win32 app.</p>
|
|
</div>
|
|
</div>
|
|
<div class="card">
|
|
<div class="card-head">
|
|
{{ ico.i('script') }}
|
|
<h2 class="mono">.zip</h2>
|
|
</div>
|
|
<div class="card-body">
|
|
<p class="dim" x-data x-text="$store.i18n.t('hint_ninja')">ZIP — plain scripts for NinjaRMM or a manual run.</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card card-flush">
|
|
<div class="table-scroll">
|
|
<table class="data-table">
|
|
<thead>
|
|
<tr>
|
|
<th scope="col" x-data x-text="$store.i18n.t('printer_col')">Printer</th>
|
|
<th scope="col" x-data x-text="$store.i18n.t('driver_col')">Driver</th>
|
|
<th scope="col" x-data x-text="$store.i18n.t('icon_section')">Icon</th>
|
|
<th scope="col" x-data x-text="$store.i18n.t('downloads_col')">Downloads</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{% for printer in printers %}
|
|
<tr>
|
|
<td>
|
|
<a class="cell-name" href="/printers/{{ printer.id }}">{{ printer.name }}</a>
|
|
<span class="cell-sub">{% if printer.client_id %}{{ printer.client.name }}{% else %}—{% endif %}</span>
|
|
</td>
|
|
<td>
|
|
<span class="mono">{{ printer.driver.original_filename }}</span>
|
|
{% if printer.driver.architecture %}<span class="cell-sub">{{ printer.driver.architecture }}</span>{% endif %}
|
|
</td>
|
|
<td>
|
|
{% if printer.id in icon_printer_ids %}
|
|
<img src="/printers/{{ printer.id }}/icon" width="28" height="28" alt=""
|
|
style="border-radius:5px;vertical-align:middle">
|
|
{% else %}
|
|
<span class="faint">—</span>
|
|
{% endif %}
|
|
</td>
|
|
<td class="actions">
|
|
<span class="btn-row">
|
|
<a class="btn ghost sm" href="/printers/{{ printer.id }}/packages/intunewin">{{ ico.i('download', 13) }}<span class="mono">.intunewin</span></a>
|
|
<a class="btn ghost sm" href="/printers/{{ printer.id }}/packages/ninja">{{ ico.i('download', 13) }}<span class="mono">.zip</span></a>
|
|
</span>
|
|
</td>
|
|
</tr>
|
|
{% endfor %}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
|
|
{% if pending_count %}
|
|
<p class="hint" style="margin-top:.9rem" x-data>
|
|
<a href="/printers">{{ pending_count }} <span x-text="$store.i18n.t('pending_printers')">printers still need a driver</span></a>
|
|
</p>
|
|
{% endif %}
|
|
|
|
{% else %}
|
|
<div class="card">
|
|
<div class="empty">
|
|
<span class="empty-ico">{{ ico.i('package', 18) }}</span>
|
|
<strong x-data x-text="$store.i18n.t('no_packages_ready')">No printer is ready yet. Assign a driver to enable export.</strong>
|
|
<p x-data x-text="$store.i18n.t('step_package_desc')">.intunewin for Intune, ZIP for NinjaRMM. Scripts included.</p>
|
|
<a href="/printers" class="btn sm" x-data>{{ ico.i('printer', 14) }}<span x-text="$store.i18n.t('printers')">Printers</span></a>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
{% endblock %}
|