mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-21 10:15:04 +02:00
fix(auth): allow API keys to delete/edit archives via new can_manage_archives scope (#1888)
DELETE /api/v1/archives/{id} rejected every API key with 403
"API keys cannot be used for administrative operations", regardless of
the print's owner or the key's scopes. ARCHIVES_DELETE_ALL/_OWN (and the
create/update variants) were on the denylist and absent from the scope
allowlist, so require_ownership_permission fell through to the generic
admin-denied 403 — the whole archive-management surface was unreachable
for API keys. Same regression class as the #1832 library/maintenance
carve-outs.
Add a can_manage_archives per-key scope: ARCHIVES_CREATE, ARCHIVES_
UPDATE_OWN/_ALL and ARCHIVES_DELETE_OWN/_ALL move from the denylist to
the allowlist under it (OWN and ALL fold into the same scope, matching
can_manage_library). ARCHIVES_PURGE stays admin-only — it drops the
print's Quick Stats contribution, mirroring LIBRARY_PURGE. Column
defaults TRUE for UI-created keys; existing rows backfill to FALSE so the
upgrade never silently widens scope. Bundled SpoolBuddy kiosk key stays
minimally scoped (False). Migration is dialect-agnostic and verified on
fresh SQLite and Postgres 17.
Adds the Settings API-key toggle + badge (11-locale i18n) and extends the
RBAC scope matrix to cover all five archive-management permissions.
This commit is contained in:
@@ -1049,6 +1049,7 @@ export interface APIKey {
|
||||
can_manage_library: boolean;
|
||||
can_manage_inventory: boolean;
|
||||
can_manage_maintenance: boolean;
|
||||
can_manage_archives: boolean;
|
||||
can_access_cloud: boolean;
|
||||
can_update_energy_cost: boolean;
|
||||
printer_ids: number[] | null;
|
||||
@@ -1066,6 +1067,7 @@ export interface APIKeyCreate {
|
||||
can_manage_library?: boolean;
|
||||
can_manage_inventory?: boolean;
|
||||
can_manage_maintenance?: boolean;
|
||||
can_manage_archives?: boolean;
|
||||
can_access_cloud?: boolean;
|
||||
can_update_energy_cost?: boolean;
|
||||
printer_ids?: number[] | null;
|
||||
@@ -1084,6 +1086,7 @@ export interface APIKeyUpdate {
|
||||
can_manage_library?: boolean;
|
||||
can_manage_inventory?: boolean;
|
||||
can_manage_maintenance?: boolean;
|
||||
can_manage_archives?: boolean;
|
||||
can_access_cloud?: boolean;
|
||||
can_update_energy_cost?: boolean;
|
||||
printer_ids?: number[] | null;
|
||||
|
||||
@@ -1990,7 +1990,10 @@ export default {
|
||||
manageInventoryDescription: 'Spulen und Bestandseinträge anlegen, ändern und löschen. Erforderlich für SpoolBuddy-Kioske (NFC-Scan, Waagenmessungen, Kiosk-Systembefehle).',
|
||||
manageMaintenance: 'Wartung verwalten',
|
||||
manageMaintenanceDescription: 'Abgeschlossene Wartungen protokollieren, Zähler zurücksetzen, Intervalle bearbeiten und den Wartungstyp-Katalog verwalten. Geeignet für Home-Assistant-Automatisierungen, die „Düse gereinigt" protokollieren, ohne umfassendere Druckersteuerung zu gewähren.',
|
||||
manageArchives: 'Archive verwalten',
|
||||
manageArchivesDescription: 'Druckarchive bearbeiten und löschen, einschließlich des Entfernens alter Drucke. Umfasst nicht das Bereinigen ihres Statistikbeitrags. Geeignet für Automatisierungen, die den Druckverlauf ausdünnen.',
|
||||
maintenanceBadge: 'Wartung',
|
||||
archivesBadge: 'Archive',
|
||||
libraryBadge: 'Bibliothek',
|
||||
inventoryBadge: 'Bestand',
|
||||
cloudAccess: 'Cloud-Zugriff erlauben',
|
||||
|
||||
@@ -2009,9 +2009,12 @@ export default {
|
||||
manageInventoryDescription: 'Create, update, and delete spools and inventory records. Required for SpoolBuddy kiosks (NFC scan, scale readings, kiosk system commands).',
|
||||
manageMaintenance: 'Manage Maintenance',
|
||||
manageMaintenanceDescription: 'Log completed maintenance, reset counters, edit intervals, and manage the maintenance-type catalog. Suited to Home Assistant automations that record "I cleaned the nozzle" without granting broader printer control.',
|
||||
manageArchives: 'Manage Archives',
|
||||
manageArchivesDescription: 'Edit and delete print archives, including removing old prints. Does not include purging their statistics contribution. Suited to automations that prune the print history.',
|
||||
libraryBadge: 'Library',
|
||||
inventoryBadge: 'Inventory',
|
||||
maintenanceBadge: 'Maintenance',
|
||||
archivesBadge: 'Archives',
|
||||
cloudAccess: 'Allow cloud access',
|
||||
cloudAccessDescription: 'Read Bambu Cloud presets and filaments on your behalf. Requires you to be signed into Bambu Cloud.',
|
||||
cloudBadge: 'Cloud',
|
||||
|
||||
@@ -1993,7 +1993,10 @@ export default {
|
||||
manageInventoryDescription: 'Crear, actualizar y eliminar bobinas y registros de inventario. Necesario para los quioscos SpoolBuddy (escaneo NFC, lecturas de balanza, comandos del sistema del quiosco).',
|
||||
manageMaintenance: 'Gestionar mantenimiento',
|
||||
manageMaintenanceDescription: 'Registrar mantenimientos completados, restablecer contadores, editar intervalos y gestionar el catálogo de tipos de mantenimiento. Ideal para automatizaciones de Home Assistant que registran "limpié la boquilla" sin conceder un control más amplio de la impresora.',
|
||||
manageArchives: 'Gestionar archivos de impresión',
|
||||
manageArchivesDescription: 'Editar y eliminar archivos de impresión, incluida la eliminación de impresiones antiguas. No incluye la purga de su contribución a las estadísticas. Ideal para automatizaciones que depuran el historial de impresión.',
|
||||
maintenanceBadge: 'Mantenimiento',
|
||||
archivesBadge: 'Archivos',
|
||||
libraryBadge: 'Biblioteca',
|
||||
inventoryBadge: 'Inventario',
|
||||
cloudAccess: 'Permitir el acceso a la nube',
|
||||
|
||||
@@ -1946,7 +1946,10 @@ export default {
|
||||
manageInventoryDescription: 'Créer, modifier et supprimer des bobines et des entrées d\'inventaire. Requis pour les bornes SpoolBuddy (scan NFC, lectures de balance, commandes système de la borne).',
|
||||
manageMaintenance: 'Gérer la maintenance',
|
||||
manageMaintenanceDescription: 'Enregistrer les maintenances effectuées, réinitialiser les compteurs, modifier les intervalles et gérer le catalogue des types de maintenance. Adapté aux automatisations Home Assistant qui consignent "J\'ai nettoyé la buse" sans accorder un contrôle plus large de l\'imprimante.',
|
||||
manageArchives: 'Gérer les archives',
|
||||
manageArchivesDescription: 'Modifier et supprimer les archives d\'impression, y compris la suppression des anciennes impressions. N\'inclut pas la purge de leur contribution aux statistiques. Adapté aux automatisations qui élaguent l\'historique d\'impression.',
|
||||
maintenanceBadge: 'Maintenance',
|
||||
archivesBadge: 'Archives',
|
||||
libraryBadge: 'Bibliothèque',
|
||||
inventoryBadge: 'Inventaire',
|
||||
cloudAccess: 'Autoriser l\'accès cloud',
|
||||
|
||||
@@ -1946,7 +1946,10 @@ export default {
|
||||
manageInventoryDescription: 'Crea, aggiorna ed elimina bobine e voci di inventario. Necessario per i chioschi SpoolBuddy (scansione NFC, letture della bilancia, comandi di sistema del chiosco).',
|
||||
manageMaintenance: 'Gestisci manutenzione',
|
||||
manageMaintenanceDescription: 'Registra le manutenzioni completate, azzera i contatori, modifica gli intervalli e gestisci il catalogo dei tipi di manutenzione. Adatto alle automazioni Home Assistant che registrano "ho pulito l\'ugello" senza concedere un controllo più ampio della stampante.',
|
||||
manageArchives: 'Gestisci archivi',
|
||||
manageArchivesDescription: 'Modifica ed elimina gli archivi di stampa, inclusa la rimozione delle vecchie stampe. Non include l\'eliminazione del loro contributo alle statistiche. Adatto alle automazioni che sfoltiscono la cronologia di stampa.',
|
||||
maintenanceBadge: 'Manutenzione',
|
||||
archivesBadge: 'Archivi',
|
||||
libraryBadge: 'Libreria',
|
||||
inventoryBadge: 'Inventario',
|
||||
cloudAccess: 'Consenti accesso cloud',
|
||||
|
||||
@@ -1989,7 +1989,10 @@ export default {
|
||||
manageInventoryDescription: 'スプールと在庫レコードの作成、更新、削除。SpoolBuddy キオスク(NFC スキャン、はかり読み取り、キオスクのシステムコマンド)に必要です。',
|
||||
manageMaintenance: 'メンテナンスの管理',
|
||||
manageMaintenanceDescription: '完了したメンテナンスの記録、カウンターのリセット、間隔の編集、メンテナンス種類カタログの管理。より広範なプリンター制御を許可することなく「ノズルをクリーニングした」を記録する Home Assistant オートメーションに適しています。',
|
||||
manageArchives: 'アーカイブの管理',
|
||||
manageArchivesDescription: '古い印刷の削除を含む、印刷アーカイブの編集と削除。統計への寄与の削除は含まれません。印刷履歴を整理するオートメーションに適しています。',
|
||||
maintenanceBadge: 'メンテナンス',
|
||||
archivesBadge: 'アーカイブ',
|
||||
libraryBadge: 'ライブラリ',
|
||||
inventoryBadge: '在庫',
|
||||
cloudAccess: 'クラウドアクセスを許可',
|
||||
|
||||
@@ -1875,7 +1875,10 @@ export default {
|
||||
manageInventoryDescription: '스풀 및 재고 레코드 생성, 업데이트 및 삭제. SpoolBuddy 키오스크(NFC 스캔, 저울 측정값, 키오스크 시스템 명령)에 필요합니다.',
|
||||
manageMaintenance: '유지보수 관리',
|
||||
manageMaintenanceDescription: '완료된 유지보수 기록, 카운터 재설정, 주기 편집, 유지보수 유형 카탈로그 관리. 프린터 제어를 더 광범위하게 허용하지 않고 "노즐을 청소했다"를 기록하는 Home Assistant 자동화에 적합합니다.',
|
||||
manageArchives: '아카이브 관리',
|
||||
manageArchivesDescription: '오래된 출력물 제거를 포함하여 출력 아카이브를 편집하고 삭제합니다. 통계 기여 항목의 제거는 포함되지 않습니다. 출력 기록을 정리하는 자동화에 적합합니다.',
|
||||
maintenanceBadge: '유지보수',
|
||||
archivesBadge: '아카이브',
|
||||
libraryBadge: '라이브러리',
|
||||
inventoryBadge: '재고',
|
||||
cloudAccess: '클라우드 접근 허용',
|
||||
|
||||
@@ -1946,7 +1946,10 @@ export default {
|
||||
manageInventoryDescription: 'Criar, atualizar e excluir bobinas e registros de estoque. Necessário para quiosques SpoolBuddy (escaneamento NFC, leituras da balança, comandos de sistema do quiosque).',
|
||||
manageMaintenance: 'Gerenciar manutenção',
|
||||
manageMaintenanceDescription: 'Registrar manutenções concluídas, redefinir contadores, editar intervalos e gerenciar o catálogo de tipos de manutenção. Adequado a automações do Home Assistant que registram "limpei o bico" sem conceder controle mais amplo da impressora.',
|
||||
manageArchives: 'Gerenciar arquivos de impressão',
|
||||
manageArchivesDescription: 'Editar e excluir arquivos de impressão, incluindo a remoção de impressões antigas. Não inclui a limpeza da contribuição deles para as estatísticas. Adequado a automações que reduzem o histórico de impressão.',
|
||||
maintenanceBadge: 'Manutenção',
|
||||
archivesBadge: 'Arquivos',
|
||||
libraryBadge: 'Biblioteca',
|
||||
inventoryBadge: 'Estoque',
|
||||
cloudAccess: 'Permitir acesso à nuvem',
|
||||
|
||||
@@ -1994,7 +1994,10 @@ export default {
|
||||
manageInventoryDescription: 'Makaraları ve envanter kayıtlarını oluştur, güncelle ve sil. SpoolBuddy kiosklar (NFC tarama, tartı okumaları, kiosk sistem komutları) için gereklidir.',
|
||||
manageMaintenance: 'Bakımı yönet',
|
||||
manageMaintenanceDescription: 'Tamamlanan bakımları kaydet, sayaçları sıfırla, aralıkları düzenle ve bakım türü kataloğunu yönet. Daha geniş yazıcı kontrolü vermeden "nozulu temizledim"i kaydeden Home Assistant otomasyonlarına uygundur.',
|
||||
manageArchives: 'Arşivleri yönet',
|
||||
manageArchivesDescription: 'Eski baskıların kaldırılması dahil olmak üzere baskı arşivlerini düzenleyin ve silin. İstatistik katkılarının temizlenmesini içermez. Baskı geçmişini budayan otomasyonlar için uygundur.',
|
||||
maintenanceBadge: 'Bakım',
|
||||
archivesBadge: 'Arşivler',
|
||||
libraryBadge: 'Kütüphane',
|
||||
inventoryBadge: 'Envanter',
|
||||
cloudAccess: 'Bulut erişimine izin ver',
|
||||
|
||||
@@ -1991,7 +1991,10 @@ export default {
|
||||
manageInventoryDescription: '创建、更新和删除耗材盘以及库存记录。SpoolBuddy 终端(NFC 扫描、秤读取、终端系统命令)需要此权限。',
|
||||
manageMaintenance: '管理维护',
|
||||
manageMaintenanceDescription: '记录已完成的维护、重置计数器、编辑间隔并管理维护类型目录。适用于在不授予更广泛打印机控制权限的情况下记录"我清洁了喷嘴"的 Home Assistant 自动化。',
|
||||
manageArchives: '管理打印存档',
|
||||
manageArchivesDescription: '编辑和删除打印存档,包括移除旧的打印。不包括清除其统计数据贡献。适用于精简打印历史的自动化。',
|
||||
maintenanceBadge: '维护',
|
||||
archivesBadge: '存档',
|
||||
libraryBadge: '资料库',
|
||||
inventoryBadge: '库存',
|
||||
cloudAccess: '允许云端访问',
|
||||
|
||||
@@ -1991,7 +1991,10 @@ export default {
|
||||
manageInventoryDescription: '建立、更新與刪除耗材盤與庫存記錄。SpoolBuddy 終端(NFC 掃描、秤讀取、終端系統指令)需要此權限。',
|
||||
manageMaintenance: '管理維護',
|
||||
manageMaintenanceDescription: '記錄已完成的維護、重設計數器、編輯間隔並管理維護類型目錄。適用於在不授予更廣泛印表機控制權限的情況下記錄「我清潔了噴嘴」的 Home Assistant 自動化。',
|
||||
manageArchives: '管理列印封存',
|
||||
manageArchivesDescription: '編輯和刪除列印封存,包括移除舊的列印。不包括清除其統計資料貢獻。適用於精簡列印歷史的自動化。',
|
||||
maintenanceBadge: '維護',
|
||||
archivesBadge: '封存',
|
||||
libraryBadge: '資料庫',
|
||||
inventoryBadge: '庫存',
|
||||
cloudAccess: '允許雲端存取',
|
||||
|
||||
@@ -235,6 +235,7 @@ export function SettingsPage() {
|
||||
can_manage_library: true,
|
||||
can_manage_inventory: true,
|
||||
can_manage_maintenance: true,
|
||||
can_manage_archives: true,
|
||||
can_access_cloud: false,
|
||||
can_update_energy_cost: false,
|
||||
});
|
||||
@@ -394,7 +395,7 @@ export function SettingsPage() {
|
||||
});
|
||||
|
||||
const createAPIKeyMutation = useMutation({
|
||||
mutationFn: (data: { name: string; can_queue: boolean; can_control_printer: boolean; can_read_status: boolean; can_manage_library: boolean; can_manage_inventory: boolean; can_manage_maintenance: boolean; can_access_cloud: boolean }) =>
|
||||
mutationFn: (data: { name: string; can_queue: boolean; can_control_printer: boolean; can_read_status: boolean; can_manage_library: boolean; can_manage_inventory: boolean; can_manage_maintenance: boolean; can_manage_archives: boolean; can_access_cloud: boolean }) =>
|
||||
api.createAPIKey(data),
|
||||
onSuccess: (data) => {
|
||||
setCreatedAPIKey(data.key || null);
|
||||
@@ -3871,6 +3872,18 @@ export function SettingsPage() {
|
||||
<p className="text-xs text-bambu-gray">{t('settings.manageMaintenanceDescription')}</p>
|
||||
</div>
|
||||
</label>
|
||||
<label className="flex items-center gap-3 cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={newAPIKeyPermissions.can_manage_archives}
|
||||
onChange={(e) => setNewAPIKeyPermissions(prev => ({ ...prev, can_manage_archives: e.target.checked }))}
|
||||
className="w-4 h-4 text-bambu-green rounded border-bambu-dark-tertiary bg-bambu-dark focus:ring-bambu-green"
|
||||
/>
|
||||
<div>
|
||||
<span className="text-white">{t('settings.manageArchives')}</span>
|
||||
<p className="text-xs text-bambu-gray">{t('settings.manageArchivesDescription')}</p>
|
||||
</div>
|
||||
</label>
|
||||
<label className="flex items-center gap-3 cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
@@ -3961,6 +3974,9 @@ export function SettingsPage() {
|
||||
{key.can_manage_maintenance && (
|
||||
<span className="px-1.5 py-0.5 bg-teal-500/20 text-teal-400 rounded">{t('settings.maintenanceBadge')}</span>
|
||||
)}
|
||||
{key.can_manage_archives && (
|
||||
<span className="px-1.5 py-0.5 bg-indigo-500/20 text-indigo-400 rounded">{t('settings.archivesBadge')}</span>
|
||||
)}
|
||||
{key.can_access_cloud && (
|
||||
<span className="px-1.5 py-0.5 bg-purple-500/20 text-purple-400 rounded">{t('settings.cloudBadge', 'Cloud')}</span>
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user