starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-18 23:20:02 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

cleanup

Browse Source
This commit is contained in:
Arthur
2026-03-30 17:07:04 -07:00
parent bb99c19342
commit 9954a9e8a9
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
netbox/extras/api/serializers_/scripts.py
View File

@@ -98,19 +98,26 @@ class ScriptModuleSerializer(ValidatedModelSerializer):
self._save_upload(upload_file, validated_data) self._save_upload(upload_file, validated_data)
elif data_file := validated_data.get('data_file'): elif data_file := validated_data.get('data_file'):
self._sync_data_file(data_file, validated_data) self._sync_data_file(data_file, validated_data)
created = False
try: try:
return super().create(validated_data) instance = super().create(validated_data)
created = True
return instance
except IntegrityError: except IntegrityError:
# ManagedFile has a single unique constraint: (file_root, file_path), so an # ManagedFile has a single unique constraint: (file_root, file_path), so an
# IntegrityError here always means a duplicate file name regardless of which # IntegrityError here always means a duplicate file name regardless of which
# path (upload or data_file sync) set validated_data['file_path']. # path (upload or data_file sync) set validated_data['file_path'].
# Clean up the file written to disk before the failed DB insert.
if file_path := validated_data.get('file_path'):
storage = storages.create_storage(storages.backends["scripts"])
storage.delete(file_path)
raise serializers.ValidationError( raise serializers.ValidationError(
_("A script module with this file name already exists.") _("A script module with this file name already exists.")
) )
finally:
# On any failure, remove the file written to disk so no orphans are left behind.
# Uses best-effort deletion (ignores errors) to avoid masking the original exception.
if not created and (file_path := validated_data.get('file_path')):
try:
storages.create_storage(storages.backends["scripts"]).delete(file_path)
except Exception:
pass
class ScriptSerializer(ValidatedModelSerializer): class ScriptSerializer(ValidatedModelSerializer):

6
netbox/netbox/authentication/__init__.py
View File

@@ -142,7 +142,11 @@ class ObjectPermissionMixin:
# Also accept permissions for proxy models whose concrete model matches the object's. # Also accept permissions for proxy models whose concrete model matches the object's.
model = obj._meta.concrete_model model = obj._meta.concrete_model
if model._meta.label_lower != '.'.join((app_label, model_name)): if model._meta.label_lower != '.'.join((app_label, model_name)):
if apps.get_model(app_label, model_name)._meta.concrete_model != model: try:
perm_model = apps.get_model(app_label, model_name)
except LookupError:
perm_model = None
if not perm_model or perm_model._meta.concrete_model != model:
raise ValueError(_("Invalid permission {permission} for model {model}").format( raise ValueError(_("Invalid permission {permission} for model {model}").format(
permission=perm, model=model permission=perm, model=model
)) ))