From 1732cc7a9c570c26225313eeccfc04376673ff53 Mon Sep 17 00:00:00 2001 From: thomas rusiecki Date: Tue, 12 Nov 2024 11:47:32 -0300 Subject: [PATCH 01/20] annotations renaming on views --- device/templates/details.html | 8 ++++---- .../{new_annotation.html => new_user_property.html} | 0 device/urls.py | 2 +- device/views.py | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) rename device/templates/{new_annotation.html => new_user_property.html} (100%) diff --git a/device/templates/details.html b/device/templates/details.html index 137a4f6..3669679 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -15,7 +15,7 @@ {% trans 'General details' %}
  • - {% trans 'User annotations' %} + {% trans 'User properties' %}
  • {% trans 'Documents' %} @@ -102,13 +102,13 @@
    - + - {% trans 'Add new annotation' %} + {% trans 'New user property' %}
    -
    {% trans 'Annotations' %}
    +
    {% trans 'User properties' %}
    diff --git a/device/templates/new_annotation.html b/device/templates/new_user_property.html similarity index 100% rename from device/templates/new_annotation.html rename to device/templates/new_user_property.html diff --git a/device/urls.py b/device/urls.py index a56aa29..05a2988 100644 --- a/device/urls.py +++ b/device/urls.py @@ -7,7 +7,7 @@ urlpatterns = [ path("add/", views.NewDeviceView.as_view(), name="add"), path("edit//", views.EditDeviceView.as_view(), name="edit"), path("/", views.DetailsView.as_view(), name="details"), - path("/annotation/add", views.AddAnnotationView.as_view(), name="add_annotation"), + path("/user_property/add", views.AddUserPropertyView.as_view(), name="add_user_property"), path("/document/add", views.AddDocumentView.as_view(), name="add_document"), path("/public/", views.PublicDeviceWebView.as_view(), name="device_web"), diff --git a/device/views.py b/device/views.py index 319f8cf..ce55c26 100644 --- a/device/views.py +++ b/device/views.py @@ -167,10 +167,10 @@ class PublicDeviceWebView(TemplateView): return JsonResponse(device_data) -class AddAnnotationView(DashboardView, CreateView): - template_name = "new_annotation.html" - title = _("New annotation") - breadcrumb = "Device / New annotation" +class AddUserPropertyView(DashboardView, CreateView): + template_name = "new_user_property.html" + title = _("New User Property") + breadcrumb = "Device / New Property" success_url = reverse_lazy('dashboard:unassigned_devices') model = Annotation fields = ("key", "value") -- 2.30.2 From 41926ea85ad7c246b73b6d99001757f7df75ad5c Mon Sep 17 00:00:00 2001 From: thomas rusiecki Date: Tue, 12 Nov 2024 12:22:09 -0300 Subject: [PATCH 02/20] split into system and user properties --- evidence/models.py | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/evidence/models.py b/evidence/models.py index e9af092..41a1665 100644 --- a/evidence/models.py +++ b/evidence/models.py @@ -3,13 +3,15 @@ import json from dmidecode import DMIParse from django.db import models + +from django.db.models import Q from utils.constants import STR_EXTEND_SIZE, CHASSIS_DH from evidence.xapian import search from evidence.parse_details import ParseSnapshot from user.models import User, Institution - -class Annotation(models.Model): +#TODO: base class is abstract; revise if should be for query efficiency +class Property(models.Model): class Type(models.IntegerChoices): SYSTEM = 0, "System" USER = 1, "User" @@ -30,6 +32,30 @@ class Annotation(models.Model): models.UniqueConstraint( fields=["type", "key", "uuid"], name="unique_type_key_uuid") ] + abstract = True + +class SystemProperty(Property): + + class Meta: + constraints = [ + models.CheckConstraint( + check=~Q(type=1), #Enforce that type is not User + name='property_cannot_be_user' + ), + ] + +class UserProperty(Property): + + type = models.SmallIntegerField(default=Property.Type.USER) + + class Meta: + constraints = [ + models.CheckConstraint( + check=Q(type=1), #Enforce that type is User + name='property_needs_to_be_user' + ), + ] + class Evidence: -- 2.30.2 From 296fab8cf6d7198ef0655da9572e4b858ab5d8a6 Mon Sep 17 00:00:00 2001 From: thomas rusiecki Date: Tue, 12 Nov 2024 14:04:59 -0300 Subject: [PATCH 03/20] variables and function semantic renaming --- api/urls.py | 2 +- api/views.py | 38 +++++++++++++------------- dashboard/mixins.py | 4 +-- dashboard/views.py | 6 ++--- device/forms.py | 2 +- device/models.py | 65 ++++++++++++++++++++++----------------------- device/views.py | 14 +++++----- evidence/forms.py | 14 +++++----- evidence/models.py | 18 ++++++------- evidence/parse.py | 18 ++++++------- evidence/urls.py | 2 +- evidence/views.py | 10 +++---- utils/device.py | 18 ++++++------- 13 files changed, 104 insertions(+), 107 deletions(-) diff --git a/api/urls.py b/api/urls.py index 4fa86d6..a5b157f 100644 --- a/api/urls.py +++ b/api/urls.py @@ -7,7 +7,7 @@ app_name = 'api' urlpatterns = [ path('v1/snapshot/', views.NewSnapshotView.as_view(), name='new_snapshot'), - path('v1/annotation//', views.AddAnnotationView.as_view(), name='new_annotation'), + path('v1/property//', views.AddPropertyView.as_view(), name='new_property'), path('v1/device//', views.DetailsDeviceView.as_view(), name='device'), path('v1/tokens/', views.TokenView.as_view(), name='tokens'), path('v1/tokens/new', views.TokenNewView.as_view(), name='new_token'), diff --git a/api/views.py b/api/views.py index 0de3e5a..be689e6 100644 --- a/api/views.py +++ b/api/views.py @@ -21,7 +21,7 @@ from django.views.generic.edit import ( from utils.save_snapshots import move_json, save_in_disk from django.views.generic.edit import View from dashboard.mixins import DashboardView -from evidence.models import Annotation +from evidence.models import SystemProperty, UserProperty, Property from evidence.parse_details import ParseSnapshot from evidence.parse import Build from device.models import Device @@ -90,11 +90,11 @@ class NewSnapshotView(ApiMixing): logger.error("%s", txt) return JsonResponse({'status': txt}, status=500) - exist_annotation = Annotation.objects.filter( + exist_property = SystemProperty.objects.filter( uuid=data['uuid'] ).first() - if exist_annotation: + if exist_property: txt = "error: the snapshot {} exist".format(data['uuid']) logger.warning("%s", txt) return JsonResponse({'status': txt}, status=500) @@ -111,25 +111,25 @@ class NewSnapshotView(ApiMixing): text = "fail: It is not possible to parse snapshot" return JsonResponse({'status': text}, status=500) - annotation = Annotation.objects.filter( + property = SystemProperty.objects.filter( uuid=data['uuid'], - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, # TODO this is hardcoded, it should select the user preferred algorithm key="hidalgo1", owner=self.tk.owner.institution ).first() - if not annotation: - logger.error("Error: No annotation for uuid: %s", data["uuid"]) + if not property: + logger.error("Error: No property for uuid: %s", data["uuid"]) return JsonResponse({'status': 'fail'}, status=500) - url_args = reverse_lazy("device:details", args=(annotation.value,)) + url_args = reverse_lazy("device:details", args=(property.value,)) url = request.build_absolute_uri(url_args) response = { "status": "success", - "dhid": annotation.value[:6].upper(), + "dhid": property.value[:6].upper(), "url": url, # TODO replace with public_url when available "public_url": url @@ -255,22 +255,21 @@ class DetailsDeviceView(ApiMixing): "components": snapshot.get("components"), }) - uuids = Annotation.objects.filter( + uuids = SystemProperty.objects.filter( owner=self.tk.owner.institution, value=self.pk ).values("uuid") - annotations = Annotation.objects.filter( + properties = UserProperty.objects.filter( uuid__in=uuids, owner=self.tk.owner.institution, - type = Annotation.Type.USER ).values_list("key", "value") - data.update({"annotations": list(annotations)}) + data.update({"properties": list(properties)}) return data -class AddAnnotationView(ApiMixing): +class AddPropertyView(ApiMixing): def post(self, request, *args, **kwargs): response = self.auth() @@ -279,13 +278,13 @@ class AddAnnotationView(ApiMixing): self.pk = kwargs['pk'] institution = self.tk.owner.institution - self.annotation = Annotation.objects.filter( + self.property = SystemProperty.objects.filter( owner=institution, value=self.pk, - type=Annotation.Type.SYSTEM + type=Property.Type.SYSTEM ).first() - if not self.annotation: + if not self.property: return JsonResponse({}, status=404) try: @@ -296,10 +295,9 @@ class AddAnnotationView(ApiMixing): logger.error("Invalid Snapshot of user %s", self.tk.owner) return JsonResponse({'error': 'Invalid JSON'}, status=500) - Annotation.objects.create( - uuid=self.annotation.uuid, + UserProperty.objects.create( + uuid=self.property.uuid, owner=self.tk.owner.institution, - type = Annotation.Type.USER, key = key, value = value ) diff --git a/dashboard/mixins.py b/dashboard/mixins.py index af01a1b..b245c96 100644 --- a/dashboard/mixins.py +++ b/dashboard/mixins.py @@ -6,7 +6,7 @@ from django.core.exceptions import PermissionDenied from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic.base import TemplateView from device.models import Device -from evidence.models import Annotation +from evidence.models import SystemProperty from lot.models import LotTag @@ -49,7 +49,7 @@ class DashboardView(LoginRequiredMixin): dev_ids = self.request.session.pop("devices", []) self._devices = [] - for x in Annotation.objects.filter(value__in=dev_ids).filter( + for x in SystemProperty.objects.filter(value__in=dev_ids).filter( owner=self.request.user.institution ).distinct(): self._devices.append(Device(id=x.value)) diff --git a/dashboard/views.py b/dashboard/views.py index 8d91732..1bc0934 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -6,7 +6,7 @@ from django.shortcuts import Http404 from django.db.models import Q from dashboard.mixins import InventaryMixin, DetailsMixin -from evidence.models import Annotation +from evidence.models import Property from evidence.xapian import search from device.models import Device from lot.models import Lot @@ -74,7 +74,7 @@ class SearchView(InventaryMixin): for x in matches: # devices.append(self.get_annotations(x)) - dev = self.get_annotations(x) + dev = self.get_property(x) if dev.id not in dev_id: devices.append(dev) dev_id.append(dev.id) @@ -83,7 +83,7 @@ class SearchView(InventaryMixin): # TODO fix of pagination, the count is not correct return devices, count - def get_annotations(self, xp): + def get_properties(self, xp): snap = xp.document.get_data() uuid = json.loads(snap).get('uuid') return Device.get_annotation_from_uuid(uuid, self.request.user.institution) diff --git a/device/forms.py b/device/forms.py index 6c4d6e2..b69bc9e 100644 --- a/device/forms.py +++ b/device/forms.py @@ -1,5 +1,5 @@ from django import forms -from utils.device import create_annotation, create_doc, create_index +from utils.device import create_property, create_doc, create_index from utils.save_snapshots import move_json, save_in_disk diff --git a/device/models.py b/device/models.py index 4e0778f..f74f8f6 100644 --- a/device/models.py +++ b/device/models.py @@ -1,7 +1,7 @@ from django.db import models, connection from utils.constants import ALGOS -from evidence.models import Annotation, Evidence +from evidence.models import SystemProperty, UserProperty, Property, Evidence from lot.models import DeviceLot @@ -29,7 +29,7 @@ class Device: self.shortid = self.pk[:6].upper() self.algorithm = None self.owner = None - self.annotations = [] + self.properties = [] self.hids = [] self.uuids = [] self.evidences = [] @@ -38,76 +38,75 @@ class Device: self.get_last_evidence() def initial(self): - self.get_annotations() + self.get_properties() self.get_uuids() self.get_hids() self.get_evidences() self.get_lots() - def get_annotations(self): - if self.annotations: - return self.annotations + def get_properties(self): + if self.properties: + return self.properties - self.annotations = Annotation.objects.filter( - type=Annotation.Type.SYSTEM, + self.properties = SystemProperty.objects.filter( + type=Property.Type.SYSTEM, value=self.id ).order_by("-created") - if self.annotations.count(): - self.algorithm = self.annotations[0].key - self.owner = self.annotations[0].owner + if self.properties.count(): + self.algorithm = self.properties[0].key + self.owner = self.properties[0].owner - return self.annotations + return self.properties - def get_user_annotations(self): + def get_user_properties(self): if not self.uuids: self.get_uuids() - annotations = Annotation.objects.filter( + user_properties = UserProperty.objects.filter( uuid__in=self.uuids, owner=self.owner, - type=Annotation.Type.USER ) - return annotations + return user_properties def get_user_documents(self): if not self.uuids: self.get_uuids() - annotations = Annotation.objects.filter( + properties = SystemProperty.objects.filter( uuid__in=self.uuids, owner=self.owner, - type=Annotation.Type.DOCUMENT + type=Property.Type.DOCUMENT ) - return annotations + return properties def get_uuids(self): - for a in self.get_annotations(): + for a in self.get_properties(): if a.uuid not in self.uuids: self.uuids.append(a.uuid) def get_hids(self): - annotations = self.get_annotations() + properties = self.get_properties() algos = list(ALGOS.keys()) algos.append('CUSTOM_ID') - self.hids = list(set(annotations.filter( - type=Annotation.Type.SYSTEM, + self.hids = list(set(properties.filter( + type=Property.Type.SYSTEM, key__in=algos, ).values_list("value", flat=True))) - def get_evidences(self): + def get_properties(self): if not self.uuids: self.get_uuids() - self.evidences = [Evidence(u) for u in self.uuids] + self.properties = [SystemProperty(u) for u in self.uuids] def get_last_evidence(self): - annotations = self.get_annotations() - if not annotations.count(): + properties = self.get_properties() + if not properties.count(): return - annotation = annotations.first() - self.last_evidence = Evidence(annotation.uuid) + property = property.first() + self.last_evidence = Evidence(property.uuid) def is_eraseserver(self): if not self.uuids: @@ -115,13 +114,13 @@ class Device: if not self.uuids: return False - annotation = Annotation.objects.filter( + property = SystemProperty.objects.filter( uuid__in=self.uuids, owner=self.owner, - type=Annotation.Type.ERASE_SERVER + type=Property.Type.ERASE_SERVER ).first() - if annotation: + if property: return True return False @@ -164,7 +163,7 @@ class Device: row_num = 1 """.format( institution=institution.id, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, ) if limit: sql += " limit {} offset {}".format(int(limit), int(offset)) diff --git a/device/views.py b/device/views.py index ce55c26..9dd5cc0 100644 --- a/device/views.py +++ b/device/views.py @@ -12,7 +12,7 @@ from django.views.generic.edit import ( ) from django.views.generic.base import TemplateView from dashboard.mixins import DashboardView, Http403 -from evidence.models import Annotation +from evidence.models import UserProperty, SystemProperty from lot.models import LotTag from device.models import Device from device.forms import DeviceFormSet @@ -69,7 +69,7 @@ class EditDeviceView(DashboardView, UpdateView): title = _("Update Device") breadcrumb = "Device / Update Device" success_url = reverse_lazy('dashboard:unassigned_devices') - model = Annotation + model = SystemProperty def get_form_kwargs(self): pk = self.kwargs.get('pk') @@ -87,7 +87,7 @@ class DetailsView(DashboardView, TemplateView): template_name = "details.html" title = _("Device") breadcrumb = "Device / Details" - model = Annotation + model = SystemProperty def get(self, request, *args, **kwargs): self.pk = kwargs['pk'] @@ -172,7 +172,7 @@ class AddUserPropertyView(DashboardView, CreateView): title = _("New User Property") breadcrumb = "Device / New Property" success_url = reverse_lazy('dashboard:unassigned_devices') - model = Annotation + model = UserProperty fields = ("key", "value") def form_valid(self, form): @@ -205,21 +205,21 @@ class AddDocumentView(DashboardView, CreateView): title = _("New Document") breadcrumb = "Device / New document" success_url = reverse_lazy('dashboard:unassigned_devices') - model = Annotation + model = SystemProperty fields = ("key", "value") def form_valid(self, form): form.instance.owner = self.request.user.institution form.instance.user = self.request.user form.instance.uuid = self.annotation.uuid - form.instance.type = Annotation.Type.DOCUMENT + form.instance.type = Property.Type.DOCUMENT response = super().form_valid(form) return response def get_form_kwargs(self): pk = self.kwargs.get('pk') institution = self.request.user.institution - self.annotation = Annotation.objects.filter( + self.annotation = SystemProperty.objects.filter( owner=institution, value=pk, type=Annotation.Type.SYSTEM diff --git a/evidence/forms.py b/evidence/forms.py index 83d9e6b..fb9d28d 100644 --- a/evidence/forms.py +++ b/evidence/forms.py @@ -4,11 +4,11 @@ import pandas as pd from django import forms from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ -from utils.device import create_annotation, create_doc, create_index +from utils.device import create_property, create_doc, create_index from utils.forms import MultipleFileField from device.models import Device from evidence.parse import Build -from evidence.models import Annotation +from evidence.models import SystemProperty from utils.save_snapshots import move_json, save_in_disk @@ -30,11 +30,11 @@ class UploadForm(forms.Form): try: file_json = json.loads(file_data) Build(file_json, None, check=True) - exist_annotation = Annotation.objects.filter( + exists_property = SystemProperty.objects.filter( uuid=file_json['uuid'] ).first() - if exist_annotation: + if exists_property: raise ValidationError( _("The snapshot already exists"), code="duplicate_snapshot", @@ -86,7 +86,7 @@ class UserTagForm(forms.Form): if not data: return False self.tag = data - self.instance = Annotation.objects.filter( + self.instance = SystemProperty.objects.filter( uuid=self.uuid, type=Annotation.Type.SYSTEM, key='CUSTOM_ID', @@ -106,9 +106,9 @@ class UserTagForm(forms.Form): self.instance.save() return - Annotation.objects.create( + SystemProperty.objects.create( uuid=self.uuid, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, key='CUSTOM_ID', value=self.tag, owner=self.user.institution, diff --git a/evidence/models.py b/evidence/models.py index 41a1665..6414f72 100644 --- a/evidence/models.py +++ b/evidence/models.py @@ -65,22 +65,22 @@ class Evidence: self.doc = None self.created = None self.dmi = None - self.annotations = [] + self.properties = [] self.components = [] self.default = "n/a" self.get_owner() self.get_time() - def get_annotations(self): - self.annotations = Annotation.objects.filter( + def get_properties(self): + self.properties = SystemProperty.objects.filter( uuid=self.uuid ).order_by("created") def get_owner(self): - if not self.annotations: - self.get_annotations() - a = self.annotations.first() + if not self.properties: + self.get_properties() + a = self.properties.first() if a: self.owner = a.owner @@ -106,7 +106,7 @@ class Evidence: self.created = self.doc.get("endTime") if not self.created: - self.created = self.annotations.last().created + self.created = self.properties.last().created def get_components(self): if self.is_legacy(): @@ -157,9 +157,9 @@ class Evidence: @classmethod def get_all(cls, user): - return Annotation.objects.filter( + return SystemProperty.objects.filter( owner=user.institution, - type=Annotation.Type.SYSTEM, + type=SystemProperty.Type.SYSTEM, key="hidalgo1", ).order_by("-created").values_list("uuid", "created").distinct() diff --git a/evidence/parse.py b/evidence/parse.py index fd68e06..5834e16 100644 --- a/evidence/parse.py +++ b/evidence/parse.py @@ -6,7 +6,7 @@ from dmidecode import DMIParse from json_repair import repair_json from evidence.parse_details import get_lshw_child -from evidence.models import Annotation +from evidence.models import SystemProperty from evidence.xapian import index from utils.constants import CHASSIS_DH @@ -46,7 +46,7 @@ class Build: return self.index() - self.create_annotations() + self.create_properties() def index(self): snap = json.dumps(self.json) @@ -72,24 +72,24 @@ class Build: return hashlib.sha3_256(hid.encode()).hexdigest() - def create_annotations(self): - annotation = Annotation.objects.filter( + def create_properties(self): + property = SystemProperty.objects.filter( uuid=self.uuid, owner=self.user.institution, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, ) - if annotation: - txt = "Warning: Snapshot %s already registered (annotation exists)" + if property: + txt = "Warning: Snapshot %s already registered (property exists)" logger.warning(txt, self.uuid) return for k, v in self.algorithms.items(): - Annotation.objects.create( + SystemProperty.objects.create( uuid=self.uuid, owner=self.user.institution, user=self.user, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, key=k, value=v ) diff --git a/evidence/urls.py b/evidence/urls.py index 9a4e2a2..501e867 100644 --- a/evidence/urls.py +++ b/evidence/urls.py @@ -20,5 +20,5 @@ urlpatterns = [ path("", views.EvidenceView.as_view(), name="details"), path("/eraseserver", views.EraseServerView.as_view(), name="erase_server"), path("/download", views.DownloadEvidenceView.as_view(), name="download"), - path('annotation//del', views.AnnotationDeleteView.as_view(), name='delete_annotation'), + path('user_property//del', views.UserPropertyDeleteView.as_view(), name='delete_user_property'), ] diff --git a/evidence/views.py b/evidence/views.py index dabcd9d..1d39310 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -13,7 +13,7 @@ from django.views.generic.edit import ( ) from dashboard.mixins import DashboardView, Http403 -from evidence.models import Evidence, Annotation +from evidence.models import Property, SystemProperty, UserProperty from evidence.forms import ( UploadForm, UserTagForm, @@ -95,7 +95,7 @@ class EvidenceView(DashboardView, FormView): if self.object.owner != self.request.user.institution: raise Http403 - self.object.get_annotations() + self.object.get_properties() return super().get(request, *args, **kwargs) def get_context_data(self, **kwargs): @@ -141,8 +141,8 @@ class DownloadEvidenceView(DashboardView, TemplateView): return response -class AnnotationDeleteView(DashboardView, DeleteView): - model = Annotation +class UserPropertyDeleteView(DashboardView, DeleteView): + model = UserProperty def get(self, request, *args, **kwargs): self.pk = kwargs['pk'] @@ -182,7 +182,7 @@ class EraseServerView(DashboardView, FormView): if self.object.owner != self.request.user.institution: raise Http403 - self.object.get_annotations() + self.object.get_properties() return super().get(request, *args, **kwargs) def get_context_data(self, **kwargs): diff --git a/utils/device.py b/utils/device.py index beaa4b8..6f246c8 100644 --- a/utils/device.py +++ b/utils/device.py @@ -6,7 +6,7 @@ import logging from django.core.exceptions import ValidationError from evidence.xapian import index -from evidence.models import Annotation +from evidence.models import SystemProperty, Property from device.models import Device @@ -68,7 +68,7 @@ def create_doc(data): return doc -def create_annotation(doc, user, commit=False): +def create_property(doc, user, commit=False): if not doc or not doc.get('uuid') or not doc.get("CUSTOMER_ID"): return [] @@ -81,20 +81,20 @@ def create_annotation(doc, user, commit=False): 'value': doc['CUSTOMER_ID'], } if commit: - annotation = Annotation.objects.filter( + property = SystemProperty.objects.filter( uuid=doc["uuid"], owner=user.institution, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, ) - if annotation: - txt = "Warning: Snapshot %s already registered (annotation exists)" + if property: + txt = "Warning: Snapshot %s already registered (system property exists)" logger.warning(txt, doc["uuid"]) - return annotation + return property - return Annotation.objects.create(**data) + return SystemProperty.objects.create(**data) - return Annotation(**data) + return SystemProperty(**data) def create_index(doc, user): -- 2.30.2 From 4c69906f24ced8e1408aa1c9d7af5b79d90846ac Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Wed, 13 Nov 2024 19:16:33 -0300 Subject: [PATCH 04/20] renaming annotation to variable --- dashboard/views.py | 4 ++-- device/models.py | 38 +++++++++++++++++++------------------- evidence/models.py | 2 +- evidence/views.py | 2 +- utils/device.py | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dashboard/views.py b/dashboard/views.py index 1bc0934..9b1be56 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -86,7 +86,7 @@ class SearchView(InventaryMixin): def get_properties(self, xp): snap = xp.document.get_data() uuid = json.loads(snap).get('uuid') - return Device.get_annotation_from_uuid(uuid, self.request.user.institution) + return Device.get_properties_from_uuid(uuid, self.request.user.institution) def search_hids(self, query, offset, limit): qry = Q() @@ -95,7 +95,7 @@ class SearchView(InventaryMixin): if i: qry |= Q(value__startswith=i) - chids = Annotation.objects.filter( + chids = SystemProperty.objects.filter( type=Annotation.Type.SYSTEM, owner=self.request.user.institution ).filter( diff --git a/device/models.py b/device/models.py index f74f8f6..f848f1d 100644 --- a/device/models.py +++ b/device/models.py @@ -1,7 +1,7 @@ from django.db import models, connection from utils.constants import ALGOS -from evidence.models import SystemProperty, UserProperty, Property, Evidence +from evidence.models import SystemProperty, UserProperty, Property, Evidence from lot.models import DeviceLot @@ -148,8 +148,8 @@ class Device: ELSE 3 END, t1.created DESC - ) AS row_num - FROM evidence_annotation AS t1 + ) AS row_num + FROM evidence_systemproperty AS t1 LEFT JOIN lot_devicelot AS t2 ON t1.value = t2.device_id WHERE t2.device_id IS NULL AND t1.owner_id = {institution} @@ -170,12 +170,12 @@ class Device: sql += ";" - annotations = [] + properties = [] with connection.cursor() as cursor: cursor.execute(sql) - annotations = cursor.fetchall() + properties = cursor.fetchall() - devices = [cls(id=x[0]) for x in annotations] + devices = [cls(id=x[0]) for x in properties] count = cls.get_unassigned_count(institution) return devices, count @@ -183,7 +183,7 @@ class Device: def get_unassigned_count(cls, institution): sql = """ - WITH RankedAnnotations AS ( + WITH RankedProperties AS ( SELECT t1.value, t1.key, @@ -197,30 +197,30 @@ class Device: END, t1.created DESC ) AS row_num - FROM evidence_annotation AS t1 + FROM evidence_systemproperty AS t1 LEFT JOIN lot_devicelot AS t2 ON t1.value = t2.device_id WHERE t2.device_id IS NULL AND t1.owner_id = {institution} - AND t1.type = {type} + And t1.type = '{type}' ) SELECT COUNT(DISTINCT value) FROM - RankedAnnotations + RankedProperties WHERE row_num = 1 """.format( institution=institution.id, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, ) with connection.cursor() as cursor: cursor.execute(sql) return cursor.fetchall()[0][0] @classmethod - def get_annotation_from_uuid(cls, uuid, institution): + def get_properties_from_uuid(cls, uuid, institution): sql = """ - WITH RankedAnnotations AS ( + WITH RankedProperties AS ( SELECT t1.value, t1.key, @@ -234,29 +234,29 @@ class Device: END, t1.created DESC ) AS row_num - FROM evidence_annotation AS t1 + FROM evidence_systemproperty AS t1 LEFT JOIN lot_devicelot AS t2 ON t1.value = t2.device_id WHERE t2.device_id IS NULL AND t1.owner_id = {institution} - AND t1.type = {type} + AND t1.type = '{type}' AND t1.uuid = '{uuid}' ) SELECT DISTINCT value FROM - RankedAnnotations + RankedProperties WHERE row_num = 1; """.format( uuid=uuid.replace("-", ""), institution=institution.id, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, ) - annotations = [] + properties = [] with connection.cursor() as cursor: cursor.execute(sql) - annotations = cursor.fetchall() + properties = cursor.fetchall() return cls(id=annotations[0][0]) diff --git a/evidence/models.py b/evidence/models.py index 6414f72..4074b7c 100644 --- a/evidence/models.py +++ b/evidence/models.py @@ -159,7 +159,7 @@ class Evidence: def get_all(cls, user): return SystemProperty.objects.filter( owner=user.institution, - type=SystemProperty.Type.SYSTEM, + type=Property.Type.SYSTEM, key="hidalgo1", ).order_by("-created").values_list("uuid", "created").distinct() diff --git a/evidence/views.py b/evidence/views.py index 1d39310..39b8d8e 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -13,7 +13,7 @@ from django.views.generic.edit import ( ) from dashboard.mixins import DashboardView, Http403 -from evidence.models import Property, SystemProperty, UserProperty +from evidence.models import Property, SystemProperty, UserProperty, Evidence from evidence.forms import ( UploadForm, UserTagForm, diff --git a/utils/device.py b/utils/device.py index 6f246c8..43d8e1b 100644 --- a/utils/device.py +++ b/utils/device.py @@ -76,7 +76,7 @@ def create_property(doc, user, commit=False): 'uuid': doc['uuid'], 'owner': user.institution, 'user': user, - 'type': Annotation.Type.SYSTEM, + 'type': Property.Type.SYSTEM, 'key': 'CUSTOMER_ID', 'value': doc['CUSTOMER_ID'], } -- 2.30.2 From 9a459888754dc577ef9c92faf92e3a024ac43ffd Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Wed, 13 Nov 2024 20:29:07 -0300 Subject: [PATCH 05/20] fixed self inflicted recursion --- device/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device/models.py b/device/models.py index f848f1d..42f6426 100644 --- a/device/models.py +++ b/device/models.py @@ -95,11 +95,11 @@ class Device: key__in=algos, ).values_list("value", flat=True))) - def get_properties(self): + def get_evidences(self): if not self.uuids: self.get_uuids() - self.properties = [SystemProperty(u) for u in self.uuids] + self.evidences = [Evidence(u) for u in self.uuids] def get_last_evidence(self): properties = self.get_properties() -- 2.30.2 From bfe922bed6ca6265ab0b867c962af51848907764 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Wed, 13 Nov 2024 21:01:00 -0300 Subject: [PATCH 06/20] changed imports --- evidence/management/commands/reindex.py | 2 +- evidence/parse.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evidence/management/commands/reindex.py b/evidence/management/commands/reindex.py index c4238e9..af3e35d 100644 --- a/evidence/management/commands/reindex.py +++ b/evidence/management/commands/reindex.py @@ -5,7 +5,7 @@ import logging from django.core.management.base import BaseCommand from django.conf import settings -from utils.device import create_annotation, create_doc, create_index +from utils.device import create_property, create_doc, create_index from user.models import Institution from evidence.parse import Build diff --git a/evidence/parse.py b/evidence/parse.py index 5834e16..b9c16c8 100644 --- a/evidence/parse.py +++ b/evidence/parse.py @@ -6,7 +6,7 @@ from dmidecode import DMIParse from json_repair import repair_json from evidence.parse_details import get_lshw_child -from evidence.models import SystemProperty +from evidence.models import SystemProperty, Property from evidence.xapian import index from utils.constants import CHASSIS_DH -- 2.30.2 From 2a9eca74ebf229b5229d4bdccd30c402b86c30ae Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Wed, 13 Nov 2024 21:05:54 -0300 Subject: [PATCH 07/20] renaming to property --- dashboard/views.py | 2 +- device/forms.py | 2 +- device/models.py | 9 +++++---- device/views.py | 8 ++++---- evidence/forms.py | 4 ++-- evidence/management/commands/reindex.py | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dashboard/views.py b/dashboard/views.py index 9b1be56..2cf0a62 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -96,7 +96,7 @@ class SearchView(InventaryMixin): qry |= Q(value__startswith=i) chids = SystemProperty.objects.filter( - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, owner=self.request.user.institution ).filter( qry diff --git a/device/forms.py b/device/forms.py index b69bc9e..1fd1f0b 100644 --- a/device/forms.py +++ b/device/forms.py @@ -59,7 +59,7 @@ class BaseDeviceFormSet(forms.BaseFormSet): path_name = save_in_disk(doc, self.user.institution.name, place="placeholder") create_index(doc, self.user) - create_annotation(doc, user, commit=commit) + create_property(doc, user, commit=commit) move_json(path_name, self.user.institution.name, place="placeholder") return doc diff --git a/device/models.py b/device/models.py index 42f6426..717af74 100644 --- a/device/models.py +++ b/device/models.py @@ -105,7 +105,8 @@ class Device: properties = self.get_properties() if not properties.count(): return - property = property.first() + property = properties.first() + self.last_evidence = Evidence(property.uuid) def is_eraseserver(self): @@ -135,7 +136,7 @@ class Device: def get_unassigned(cls, institution, offset=0, limit=None): sql = """ - WITH RankedAnnotations AS ( + WITH RankedProperties AS ( SELECT t1.value, t1.key, @@ -158,7 +159,7 @@ class Device: SELECT DISTINCT value FROM - RankedAnnotations + RankedProperties WHERE row_num = 1 """.format( @@ -258,7 +259,7 @@ class Device: cursor.execute(sql) properties = cursor.fetchall() - return cls(id=annotations[0][0]) + return cls(id=properties[0][0]) @property def is_websnapshot(self): diff --git a/device/views.py b/device/views.py index 9dd5cc0..45ff289 100644 --- a/device/views.py +++ b/device/views.py @@ -179,17 +179,17 @@ class AddUserPropertyView(DashboardView, CreateView): form.instance.owner = self.request.user.institution form.instance.user = self.request.user form.instance.uuid = self.annotation.uuid - form.instance.type = Annotation.Type.USER + form.instance.type = Property.Type.USER response = super().form_valid(form) return response def get_form_kwargs(self): pk = self.kwargs.get('pk') institution = self.request.user.institution - self.annotation = Annotation.objects.filter( + self.annotation = SystemProperty.objects.filter( owner=institution, value=pk, - type=Annotation.Type.SYSTEM + type=Property.Type.SYSTEM ).first() if not self.annotation: @@ -222,7 +222,7 @@ class AddDocumentView(DashboardView, CreateView): self.annotation = SystemProperty.objects.filter( owner=institution, value=pk, - type=Annotation.Type.SYSTEM + type=Property.Type.SYSTEM ).first() if not self.annotation: diff --git a/evidence/forms.py b/evidence/forms.py index fb9d28d..30611c1 100644 --- a/evidence/forms.py +++ b/evidence/forms.py @@ -164,7 +164,7 @@ class ImportForm(forms.Form): table = [] for row in self.rows: doc = create_doc(row) - annotation = create_annotation(doc, self.user) + annotation = create_property(doc, self.user) table.append((doc, annotation)) if commit: @@ -222,7 +222,7 @@ class EraseServerForm(forms.Form): if self.instance: return - Annotation.objects.create( + SystemProperty.objects.create( uuid=self.uuid, type=Annotation.Type.ERASE_SERVER, key='ERASE_SERVER', diff --git a/evidence/management/commands/reindex.py b/evidence/management/commands/reindex.py index af3e35d..bf4a49c 100644 --- a/evidence/management/commands/reindex.py +++ b/evidence/management/commands/reindex.py @@ -70,7 +70,7 @@ class Command(BaseCommand): def build_placeholder(self, s, user, f_path): try: create_index(s, user) - create_annotation(s, user, commit=True) + create_property(s, user, commit=True) except Exception as err: txt = "In placeholder %s \n%s" logger.warning(txt, f_path, err) -- 2.30.2 From 3350966bb3d4b3f0b9ac94f8c035ab612fd7385c Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Wed, 13 Nov 2024 21:14:23 -0300 Subject: [PATCH 08/20] fixed user_properties list not working --- device/templates/details.html | 2 +- device/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device/templates/details.html b/device/templates/details.html index 3669679..34f9edd 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -126,7 +126,7 @@ - {% for a in object.get_user_annotations %} + {% for a in object.get_user_properties %} diff --git a/device/views.py b/device/views.py index 45ff289..80c2e46 100644 --- a/device/views.py +++ b/device/views.py @@ -12,7 +12,7 @@ from django.views.generic.edit import ( ) from django.views.generic.base import TemplateView from dashboard.mixins import DashboardView, Http403 -from evidence.models import UserProperty, SystemProperty +from evidence.models import UserProperty, SystemProperty, Property from lot.models import LotTag from device.models import Device from device.forms import DeviceFormSet -- 2.30.2 From 7d18f4797f40380837587102d96a4020cd1b0426 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Thu, 14 Nov 2024 12:00:03 -0300 Subject: [PATCH 09/20] details view changed to now use properties --- device/templates/details.html | 4 ++-- evidence/templates/ev_details.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device/templates/details.html b/device/templates/details.html index 34f9edd..980b28a 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -15,7 +15,7 @@ {% trans 'General details' %}
  • - {% trans 'User properties' %} + {% trans 'User properties' %}
  • {% trans 'Documents' %} @@ -100,7 +100,7 @@ {% endfor %} -
    • - {% for snap in object.annotations %} + {% for snap in object.properties %} {% if snap.type == 0 %} @@ -94,7 +94,7 @@ {% if form.tag.value %}
    - {% translate "Delete" %} + {% translate "Delete" %}
    {% endif %} -- 2.30.2 From caa2be3a419beb7417d68fede4b2e830c0ef33d9 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Thu, 14 Nov 2024 13:08:37 -0300 Subject: [PATCH 10/20] renaming to new Property tables --- evidence/forms.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/evidence/forms.py b/evidence/forms.py index 30611c1..3de1b6f 100644 --- a/evidence/forms.py +++ b/evidence/forms.py @@ -8,7 +8,7 @@ from utils.device import create_property, create_doc, create_index from utils.forms import MultipleFileField from device.models import Device from evidence.parse import Build -from evidence.models import SystemProperty +from evidence.models import SystemProperty, Property from utils.save_snapshots import move_json, save_in_disk @@ -68,9 +68,9 @@ class UserTagForm(forms.Form): self.pk = None self.uuid = kwargs.pop('uuid', None) self.user = kwargs.pop('user') - instance = Annotation.objects.filter( + instance = SystemProperty.objects.filter( uuid=self.uuid, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, key='CUSTOM_ID', owner=self.user.institution ).first() @@ -88,7 +88,7 @@ class UserTagForm(forms.Form): self.tag = data self.instance = SystemProperty.objects.filter( uuid=self.uuid, - type=Annotation.Type.SYSTEM, + type=Property.Type.SYSTEM, key='CUSTOM_ID', owner=self.user.institution ).first() @@ -186,9 +186,9 @@ class EraseServerForm(forms.Form): self.pk = None self.uuid = kwargs.pop('uuid', None) self.user = kwargs.pop('user') - instance = Annotation.objects.filter( + instance = SystemProperty.objects.filter( uuid=self.uuid, - type=Annotation.Type.ERASE_SERVER, + type=SystemProperty.Type.ERASE_SERVER, key='ERASE_SERVER', owner=self.user.institution ).first() @@ -201,9 +201,9 @@ class EraseServerForm(forms.Form): def clean(self): self.erase_server = self.cleaned_data.get('erase_server', False) - self.instance = Annotation.objects.filter( + self.instance = SystemProperty.objects.filter( uuid=self.uuid, - type=Annotation.Type.ERASE_SERVER, + type=Property.Type.ERASE_SERVER, key='ERASE_SERVER', owner=self.user.institution ).first() @@ -224,7 +224,7 @@ class EraseServerForm(forms.Form): SystemProperty.objects.create( uuid=self.uuid, - type=Annotation.Type.ERASE_SERVER, + type=Property.Type.ERASE_SERVER, key='ERASE_SERVER', value=self.erase_server, owner=self.user.institution, -- 2.30.2 From 10f2f6dc16daa62efbfe0e5a971c48140851bf8a Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Thu, 14 Nov 2024 14:16:45 -0300 Subject: [PATCH 11/20] fixed search and moved delete user property class --- dashboard/views.py | 4 ++-- evidence/views.py | 25 ------------------------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/dashboard/views.py b/dashboard/views.py index 2cf0a62..cb36078 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -6,7 +6,7 @@ from django.shortcuts import Http404 from django.db.models import Q from dashboard.mixins import InventaryMixin, DetailsMixin -from evidence.models import Property +from evidence.models import Property, SystemProperty from evidence.xapian import search from device.models import Device from lot.models import Lot @@ -74,7 +74,7 @@ class SearchView(InventaryMixin): for x in matches: # devices.append(self.get_annotations(x)) - dev = self.get_property(x) + dev = self.get_properties(x) if dev.id not in dev_id: devices.append(dev) dev_id.append(dev.id) diff --git a/evidence/views.py b/evidence/views.py index 39b8d8e..c71ab68 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -141,31 +141,6 @@ class DownloadEvidenceView(DashboardView, TemplateView): return response -class UserPropertyDeleteView(DashboardView, DeleteView): - model = UserProperty - - def get(self, request, *args, **kwargs): - self.pk = kwargs['pk'] - - try: - referer = self.request.META["HTTP_REFERER"] - path_referer = urlparse(referer).path - resolver_match = resolve(path_referer) - url_name = resolver_match.view_name - kwargs_view = resolver_match.kwargs - except: - # if is not possible resolve the reference path return 404 - raise Http404 - - self.object = get_object_or_404( - self.model, - pk=self.pk, - owner=self.request.user.institution - ) - self.object.delete() - - - return redirect(url_name, **kwargs_view) class EraseServerView(DashboardView, FormView): -- 2.30.2 From 04099d31a6eea30e72fdfc5e46a6d80c9b21a3bc Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Fri, 15 Nov 2024 18:15:44 -0300 Subject: [PATCH 12/20] model constraints changed and moved url to /device --- evidence/models.py | 15 +++++++++++---- evidence/urls.py | 1 - 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/evidence/models.py b/evidence/models.py index 4074b7c..4574f64 100644 --- a/evidence/models.py +++ b/evidence/models.py @@ -28,10 +28,7 @@ class Property(models.Model): value = models.CharField(max_length=STR_EXTEND_SIZE) class Meta: - constraints = [ - models.UniqueConstraint( - fields=["type", "key", "uuid"], name="unique_type_key_uuid") - ] + #Only for shared behaviour, it is not a table abstract = True class SystemProperty(Property): @@ -43,6 +40,12 @@ class SystemProperty(Property): name='property_cannot_be_user' ), ] + #Django orm wont inherit constraints to child + #TODO: check if this is needed + constraints = [ + models.UniqueConstraint( + fields=["type", "key", "uuid"], name="system_unique_type_key_uuid") + ] class UserProperty(Property): @@ -55,6 +58,10 @@ class UserProperty(Property): name='property_needs_to_be_user' ), ] + constraints = [ + models.UniqueConstraint( + fields=["type", "key", "uuid"], name="user_unique_type_key_uuid") + ] diff --git a/evidence/urls.py b/evidence/urls.py index 501e867..0d03f61 100644 --- a/evidence/urls.py +++ b/evidence/urls.py @@ -20,5 +20,4 @@ urlpatterns = [ path("", views.EvidenceView.as_view(), name="details"), path("/eraseserver", views.EraseServerView.as_view(), name="erase_server"), path("/download", views.DownloadEvidenceView.as_view(), name="download"), - path('user_property//del', views.UserPropertyDeleteView.as_view(), name='delete_user_property'), ] -- 2.30.2 From ca047f4e8bb1a75118fcd6359a2afbf4f9df5fb7 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Fri, 15 Nov 2024 18:16:45 -0300 Subject: [PATCH 13/20] added user_property --- device/templates/details.html | 40 ++++++++++++++++++++++++++++++++--- device/urls.py | 2 ++ device/views.py | 24 ++++++++++++++++++++- 3 files changed, 62 insertions(+), 4 deletions(-) diff --git a/device/templates/details.html b/device/templates/details.html index 980b28a..c889d45 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -122,7 +122,6 @@ {% trans 'Created on' %} - @@ -131,14 +130,49 @@ - - + {% endfor %}
    {{ a.key }} {{ a.value }}
    {{ a.key }} {{ a.value }} {{ a.created }} +
    + + + + +
    +
    + +{% for a in object.get_user_properties %} + +{% endfor %} + +
    diff --git a/device/urls.py b/device/urls.py index 05a2988..dc7fddc 100644 --- a/device/urls.py +++ b/device/urls.py @@ -8,6 +8,8 @@ urlpatterns = [ path("edit//", views.EditDeviceView.as_view(), name="edit"), path("/", views.DetailsView.as_view(), name="details"), path("/user_property/add", views.AddUserPropertyView.as_view(), name="add_user_property"), + path("user_property//delete", views.DeleteUserPropertyView.as_view(), name="delete_user_property"), + path("user_property//update", views.AddUserPropertyView.as_view(), name="update_user_property"), path("/document/add", views.AddDocumentView.as_view(), name="add_document"), path("/public/", views.PublicDeviceWebView.as_view(), name="device_web"), diff --git a/device/views.py b/device/views.py index 80c2e46..76905f5 100644 --- a/device/views.py +++ b/device/views.py @@ -3,12 +3,14 @@ from django.http import JsonResponse from django.http import Http404 from django.urls import reverse_lazy -from django.shortcuts import get_object_or_404, Http404 +from django.contrib import messages +from django.shortcuts import get_object_or_404, redirect, Http404 from django.utils.translation import gettext_lazy as _ from django.views.generic.edit import ( CreateView, UpdateView, FormView, + DeleteView, ) from django.views.generic.base import TemplateView from dashboard.mixins import DashboardView, Http403 @@ -199,6 +201,26 @@ class AddUserPropertyView(DashboardView, CreateView): kwargs = super().get_form_kwargs() return kwargs +class DeleteUserPropertyView(DashboardView, DeleteView): + model = UserProperty + + def post(self, request, *args, **kwargs): + self.pk = kwargs['pk'] + referer = request.META.get('HTTP_REFERER') + if not referer: + raise Http404("No referer header found") + + self.object = get_object_or_404( + self.model, + pk=self.pk, + owner=self.request.user.institution + ) + self.object.delete() + messages.success(self.request, _("User property deleted successfully.")) + + # Redirect back to the original URL + return redirect(referer) + class AddDocumentView(DashboardView, CreateView): template_name = "new_annotation.html" -- 2.30.2 From 0bd6f8d69f10546da4d05ec53e2b77c73c296ac1 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Fri, 15 Nov 2024 19:11:05 -0300 Subject: [PATCH 14/20] added userproperty update view --- device/urls.py | 2 +- device/views.py | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/device/urls.py b/device/urls.py index dc7fddc..875a21e 100644 --- a/device/urls.py +++ b/device/urls.py @@ -9,7 +9,7 @@ urlpatterns = [ path("/", views.DetailsView.as_view(), name="details"), path("/user_property/add", views.AddUserPropertyView.as_view(), name="add_user_property"), path("user_property//delete", views.DeleteUserPropertyView.as_view(), name="delete_user_property"), - path("user_property//update", views.AddUserPropertyView.as_view(), name="update_user_property"), + path("user_property//update", views.UpdateUserPropertyView.as_view(), name="update_user_property"), path("/document/add", views.AddDocumentView.as_view(), name="add_document"), path("/public/", views.PublicDeviceWebView.as_view(), name="device_web"), diff --git a/device/views.py b/device/views.py index 76905f5..b97c062 100644 --- a/device/views.py +++ b/device/views.py @@ -201,6 +201,45 @@ class AddUserPropertyView(DashboardView, CreateView): kwargs = super().get_form_kwargs() return kwargs +class UpdateUserPropertyView(DashboardView, UpdateView): + template_name = "new_user_property.html" + title = _("Update User Property") + breadcrumb = "Device / Update Property" + model = UserProperty + fields = ("key", "value") + + def form_valid(self, form): + form.instance.owner = self.request.user.institution + form.instance.user = self.request.user + form.instance.type = Property.Type.USER + response = super().form_valid(form) + + messages.success(self.request, _("User property updated successfully.")) + return response + + def get_success_url(self): + referer = self.request.META.get('HTTP_REFERER') + if referer: + return referer + else: + return reverse_lazy('device:details', args=[self.object.device.pk]) + + def get_form_kwargs(self): + pk = self.kwargs.get('pk') + user_property = get_object_or_404(UserProperty, pk=pk, owner=self.request.user.institution) + self.annotation = SystemProperty.objects.filter( + owner=self.request.user.institution, + uuid=user_property.uuid, + type=Property.Type.SYSTEM + ).first() + + if not self.annotation: + raise Http404 + + kwargs = super().get_form_kwargs() + kwargs['instance'] = user_property + return kwargs + class DeleteUserPropertyView(DashboardView, DeleteView): model = UserProperty -- 2.30.2 From e93cccaf2d40ce0d7741b92405c5985ef4ce5ba1 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Fri, 15 Nov 2024 19:38:33 -0300 Subject: [PATCH 15/20] change edit view to modal popup --- device/templates/details.html | 33 ++++++++++++++++++++++++++++++--- device/views.py | 33 +++++++++++++++++---------------- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/device/templates/details.html b/device/templates/details.html index c889d45..82c52ee 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -132,9 +132,9 @@ {{ a.created }}
    - - - + @@ -172,6 +172,33 @@
    {% endfor %} + +{% for a in object.get_user_properties %} + +{% endfor %}
    diff --git a/device/views.py b/device/views.py index b97c062..b00e6fa 100644 --- a/device/views.py +++ b/device/views.py @@ -208,8 +208,24 @@ class UpdateUserPropertyView(DashboardView, UpdateView): model = UserProperty fields = ("key", "value") + def get_form_kwargs(self): + pk = self.kwargs.get('pk') + user_property = get_object_or_404(UserProperty, pk=pk, owner=self.request.user.institution) + self.property = SystemProperty.objects.filter( + owner=self.request.user.institution, + uuid=user_property.uuid, + type=Property.Type.SYSTEM + ).first() + + if not self.property: + raise Http404 + + kwargs = super().get_form_kwargs() + kwargs['instance'] = user_property + return kwargs + def form_valid(self, form): - form.instance.owner = self.request.user.institution + form.instance.owner = self.request .user.institution form.instance.user = self.request.user form.instance.type = Property.Type.USER response = super().form_valid(form) @@ -223,22 +239,7 @@ class UpdateUserPropertyView(DashboardView, UpdateView): return referer else: return reverse_lazy('device:details', args=[self.object.device.pk]) - - def get_form_kwargs(self): - pk = self.kwargs.get('pk') - user_property = get_object_or_404(UserProperty, pk=pk, owner=self.request.user.institution) - self.annotation = SystemProperty.objects.filter( - owner=self.request.user.institution, - uuid=user_property.uuid, - type=Property.Type.SYSTEM - ).first() - if not self.annotation: - raise Http404 - - kwargs = super().get_form_kwargs() - kwargs['instance'] = user_property - return kwargs class DeleteUserPropertyView(DashboardView, DeleteView): model = UserProperty -- 2.30.2 From aff13a04eb90058213843472817639a947d38494 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Fri, 15 Nov 2024 20:13:39 -0300 Subject: [PATCH 16/20] renaming of annotation to property --- device/views.py | 25 ++++++++++--------------- evidence/forms.py | 4 ++-- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/device/views.py b/device/views.py index b00e6fa..c29228d 100644 --- a/device/views.py +++ b/device/views.py @@ -180,7 +180,7 @@ class AddUserPropertyView(DashboardView, CreateView): def form_valid(self, form): form.instance.owner = self.request.user.institution form.instance.user = self.request.user - form.instance.uuid = self.annotation.uuid + form.instance.uuid = self.property.uuid form.instance.type = Property.Type.USER response = super().form_valid(form) return response @@ -188,13 +188,13 @@ class AddUserPropertyView(DashboardView, CreateView): def get_form_kwargs(self): pk = self.kwargs.get('pk') institution = self.request.user.institution - self.annotation = SystemProperty.objects.filter( + self.property = UserProperty.objects.filter( owner=institution, value=pk, type=Property.Type.SYSTEM ).first() - if not self.annotation: + if not self.property: raise Http404 self.success_url = reverse_lazy('device:details', args=[pk]) @@ -211,13 +211,8 @@ class UpdateUserPropertyView(DashboardView, UpdateView): def get_form_kwargs(self): pk = self.kwargs.get('pk') user_property = get_object_or_404(UserProperty, pk=pk, owner=self.request.user.institution) - self.property = SystemProperty.objects.filter( - owner=self.request.user.institution, - uuid=user_property.uuid, - type=Property.Type.SYSTEM - ).first() - - if not self.property: + + if not user_property: raise Http404 kwargs = super().get_form_kwargs() @@ -225,7 +220,7 @@ class UpdateUserPropertyView(DashboardView, UpdateView): return kwargs def form_valid(self, form): - form.instance.owner = self.request .user.institution + form.instance.owner = self.request .user.institution form.instance.user = self.request.user form.instance.type = Property.Type.USER response = super().form_valid(form) @@ -263,7 +258,7 @@ class DeleteUserPropertyView(DashboardView, DeleteView): class AddDocumentView(DashboardView, CreateView): - template_name = "new_annotation.html" + template_name = "new_user_property.html" title = _("New Document") breadcrumb = "Device / New document" success_url = reverse_lazy('dashboard:unassigned_devices') @@ -273,7 +268,7 @@ class AddDocumentView(DashboardView, CreateView): def form_valid(self, form): form.instance.owner = self.request.user.institution form.instance.user = self.request.user - form.instance.uuid = self.annotation.uuid + form.instance.uuid = self.property.uuid form.instance.type = Property.Type.DOCUMENT response = super().form_valid(form) return response @@ -281,13 +276,13 @@ class AddDocumentView(DashboardView, CreateView): def get_form_kwargs(self): pk = self.kwargs.get('pk') institution = self.request.user.institution - self.annotation = SystemProperty.objects.filter( + self.property = SystemProperty.objects.filter( owner=institution, value=pk, type=Property.Type.SYSTEM ).first() - if not self.annotation: + if not self.property: raise Http404 self.success_url = reverse_lazy('device:details', args=[pk]) diff --git a/evidence/forms.py b/evidence/forms.py index 3de1b6f..c802b66 100644 --- a/evidence/forms.py +++ b/evidence/forms.py @@ -164,8 +164,8 @@ class ImportForm(forms.Form): table = [] for row in self.rows: doc = create_doc(row) - annotation = create_property(doc, self.user) - table.append((doc, annotation)) + property = create_property(doc, self.user) + table.append((doc, property)) if commit: for doc, cred in table: -- 2.30.2 From 95fb09bd690c8c4e3b6e60bddbb476157f3ee1c3 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Sat, 16 Nov 2024 12:31:02 -0300 Subject: [PATCH 17/20] renaming lotAnnotations to Lotproperty --- dashboard/templates/unassigned_devices.html | 4 +- lot/models.py | 15 +------ ...{new_annotation.html => new_property.html} | 0 .../{annotations.html => properties.html} | 8 ++-- lot/urls.py | 4 +- lot/views.py | 44 +++++++++---------- 6 files changed, 32 insertions(+), 43 deletions(-) rename lot/templates/{new_annotation.html => new_property.html} (100%) rename lot/templates/{annotations.html => properties.html} (83%) diff --git a/dashboard/templates/unassigned_devices.html b/dashboard/templates/unassigned_devices.html index 369edd2..a8fefd7 100644 --- a/dashboard/templates/unassigned_devices.html +++ b/dashboard/templates/unassigned_devices.html @@ -20,9 +20,9 @@ {% trans 'Exports' %} {% if lot %} - + - {% trans 'Annotations' %} + {% trans 'properties' %} {% endif %}
    diff --git a/lot/models.py b/lot/models.py index 6c81bfd..53f2acd 100644 --- a/lot/models.py +++ b/lot/models.py @@ -7,8 +7,8 @@ from utils.constants import ( ) from user.models import User, Institution +from device.models import Property # from device.models import Device -# from evidence.models import Annotation class LotTag(models.Model): @@ -45,17 +45,6 @@ class Lot(models.Model): for d in DeviceLot.objects.filter(lot=self, device_id=v): d.delete() +class LotProperty (Property): -class LotAnnotation(models.Model): - class Type(models.IntegerChoices): - SYSTEM= 0, "System" - USER = 1, "User" - DOCUMENT = 2, "Document" - - created = models.DateTimeField(auto_now_add=True) lot = models.ForeignKey(Lot, on_delete=models.CASCADE) - owner = models.ForeignKey(Institution, on_delete=models.CASCADE) - user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True) - type = models.SmallIntegerField(choices=Type) - key = models.CharField(max_length=STR_EXTEND_SIZE) - value = models.CharField(max_length=STR_EXTEND_SIZE) diff --git a/lot/templates/new_annotation.html b/lot/templates/new_property.html similarity index 100% rename from lot/templates/new_annotation.html rename to lot/templates/new_property.html diff --git a/lot/templates/annotations.html b/lot/templates/properties.html similarity index 83% rename from lot/templates/annotations.html rename to lot/templates/properties.html index 7e6747e..fec72b4 100644 --- a/lot/templates/annotations.html +++ b/lot/templates/properties.html @@ -11,15 +11,15 @@
    - + - Add new annotation + Add new lot Property
    -
    Annotations
    +
    Properties
    @@ -31,7 +31,7 @@ - {% for a in annotations %} + {% for a in properties %} diff --git a/lot/urls.py b/lot/urls.py index eb863b0..806a311 100644 --- a/lot/urls.py +++ b/lot/urls.py @@ -12,6 +12,6 @@ urlpatterns = [ path("tag//", views.LotsTagsView.as_view(), name="tag"), path("/document/", views.LotDocumentsView.as_view(), name="documents"), path("/document/add", views.LotAddDocumentView.as_view(), name="add_document"), - path("/annotation", views.LotAnnotationsView.as_view(), name="annotations"), - path("/annotation/add", views.LotAddAnnotationView.as_view(), name="add_annotation"), + path("/property", views.LotPropertiesView.as_view(), name="properties"), + path("/property/add", views.LotAddPropertyView.as_view(), name="add_property"), ] diff --git a/lot/views.py b/lot/views.py index 182aade..36f582f 100644 --- a/lot/views.py +++ b/lot/views.py @@ -9,9 +9,9 @@ from django.views.generic.edit import ( FormView, ) from dashboard.mixins import DashboardView -from lot.models import Lot, LotTag, LotAnnotation +from lot.models import Lot, LotTag, LotProperty from lot.forms import LotsForm - +from device.models import Property class NewLotView(DashboardView, CreateView): template_name = "new_lot.html" @@ -143,18 +143,18 @@ class LotsTagsView(DashboardView, TemplateView): class LotAddDocumentView(DashboardView, CreateView): - template_name = "new_annotation.html" + template_name = "new_property.html" title = _("New Document") breadcrumb = "Device / New document" success_url = reverse_lazy('dashboard:unassigned_devices') - model = LotAnnotation + model = LotProperty fields = ("key", "value") def form_valid(self, form): form.instance.owner = self.request.user.institution form.instance.user = self.request.user form.instance.lot = self.lot - form.instance.type = LotAnnotation.Type.DOCUMENT + form.instance.type = Property.Type.DOCUMENT response = super().form_valid(form) return response @@ -169,16 +169,16 @@ class LotAddDocumentView(DashboardView, CreateView): class LotDocumentsView(DashboardView, TemplateView): template_name = "documents.html" title = _("New Document") - breadcrumb = "Device / New document" + breadcrumb = "Devicce / New document" def get_context_data(self, **kwargs): self.pk = kwargs.get('pk') context = super().get_context_data(**kwargs) lot = get_object_or_404(Lot, owner=self.request.user.institution, id=self.pk) - documents = LotAnnotation.objects.filter( + documents = LotProperty.objects.filter( lot=lot, owner=self.request.user.institution, - type=LotAnnotation.Type.DOCUMENT, + type=Property.Type.DOCUMENT, ) context.update({ 'lot': lot, @@ -189,48 +189,48 @@ class LotDocumentsView(DashboardView, TemplateView): return context -class LotAnnotationsView(DashboardView, TemplateView): - template_name = "annotations.html" - title = _("New Annotation") - breadcrumb = "Device / New annotation" +class LotPropertiesView(DashboardView, TemplateView): + template_name = "properties.html" + title = _("New Lot Property") + breadcrumb = "Lot / New property" def get_context_data(self, **kwargs): self.pk = kwargs.get('pk') context = super().get_context_data(**kwargs) lot = get_object_or_404(Lot, owner=self.request.user.institution, id=self.pk) - annotations = LotAnnotation.objects.filter( + properties = LotProperty.objects.filter( lot=lot, owner=self.request.user.institution, - type=LotAnnotation.Type.USER, + type=Property.Type.USER, ) context.update({ 'lot': lot, - 'annotations': annotations, + 'properties': properties, 'title': self.title, 'breadcrumb': self.breadcrumb }) return context -class LotAddAnnotationView(DashboardView, CreateView): - template_name = "new_annotation.html" - title = _("New Annotation") - breadcrumb = "Device / New annotation" +class LotAddPropertyView(DashboardView, CreateView): + template_name = "new_property.html" + title = _("New Lot Property") + breadcrumb = "Device / New property" success_url = reverse_lazy('dashboard:unassigned_devices') - model = LotAnnotation + model = LotProperty fields = ("key", "value") def form_valid(self, form): form.instance.owner = self.request.user.institution form.instance.user = self.request.user form.instance.lot = self.lot - form.instance.type = LotAnnotation.Type.USER + form.instance.type = Property.Type.USER response = super().form_valid(form) return response def get_form_kwargs(self): pk = self.kwargs.get('pk') self.lot = get_object_or_404(Lot, pk=pk, owner=self.request.user.institution) - self.success_url = reverse_lazy('lot:annotations', args=[pk]) + self.success_url = reverse_lazy('lot:properties', args=[pk]) kwargs = super().get_form_kwargs() return kwargs -- 2.30.2 From db1d38c3d1b2d350f201d0eeaaed2b40efda9b72 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Sat, 16 Nov 2024 15:26:45 -0300 Subject: [PATCH 18/20] added logging for device operations --- device/views.py | 25 ++++++++++++++++++------- dhub/settings.py | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/device/views.py b/device/views.py index c29228d..98fcd0f 100644 --- a/device/views.py +++ b/device/views.py @@ -1,4 +1,5 @@ import json +import logging from django.http import JsonResponse from django.http import Http404 @@ -20,6 +21,8 @@ from device.models import Device from device.forms import DeviceFormSet +device_logger = logging.getLogger('device_log') + class NewDeviceView(DashboardView, FormView): template_name = "new_device.html" title = _("New Device") @@ -182,13 +185,15 @@ class AddUserPropertyView(DashboardView, CreateView): form.instance.user = self.request.user form.instance.uuid = self.property.uuid form.instance.type = Property.Type.USER + + messages.success(self.request, _("User property successfully added.")) response = super().form_valid(form) return response def get_form_kwargs(self): pk = self.kwargs.get('pk') institution = self.request.user.institution - self.property = UserProperty.objects.filter( + self.property = SystemProperty.objects.filter( owner=institution, value=pk, type=Property.Type.SYSTEM @@ -220,20 +225,24 @@ class UpdateUserPropertyView(DashboardView, UpdateView): return kwargs def form_valid(self, form): - form.instance.owner = self.request .user.institution + old_key= self.object.key + old_value = self.object.value + new_key = form.cleaned_data['key'] + new_value = form.cleaned_data['value'] + + form.instance.owner = self.request.user.institution form.instance.user = self.request.user form.instance.type = Property.Type.USER response = super().form_valid(form) messages.success(self.request, _("User property updated successfully.")) + device_logger.info( + f"Updated property from (key='{old_key}', value='{old_value}') to (key='{new_key}', value='{new_value}') by user {self.request.user}." + ) return response def get_success_url(self): - referer = self.request.META.get('HTTP_REFERER') - if referer: - return referer - else: - return reverse_lazy('device:details', args=[self.object.device.pk]) + return self.request.META.get('HTTP_REFERER', reverse_lazy('device:details', args=[self.object.pk])) class DeleteUserPropertyView(DashboardView, DeleteView): @@ -250,7 +259,9 @@ class DeleteUserPropertyView(DashboardView, DeleteView): pk=self.pk, owner=self.request.user.institution ) + old_value = self.object.key self.object.delete() + device_logger.info(f"Deleted property with key '{old_value}' by user {self.request.user}.") messages.success(self.request, _("User property deleted successfully.")) # Redirect back to the original URL diff --git a/dhub/settings.py b/dhub/settings.py index 0dc3d84..433c057 100644 --- a/dhub/settings.py +++ b/dhub/settings.py @@ -210,6 +210,10 @@ LOGGING = { '()': CustomFormatter, 'format': '%(levelname)s %(asctime)s %(message)s' }, + 'verbose': { + 'format': '{levelname} {asctime} {module} {message}', + 'style': '{', + }, }, "handlers": { "console": { @@ -217,6 +221,12 @@ LOGGING = { "class": "logging.StreamHandler", "formatter": "colored" }, + 'device_log_file': { + 'level': 'INFO', + 'class': 'logging.FileHandler', + 'filename': '/var/log/device_changes.log', + 'formatter': 'verbose', + }, }, "root": { "handlers": ["console"], @@ -232,7 +242,12 @@ LOGGING = { "handlers": ["console"], "level": "ERROR", "propagate": False, - } + }, + 'device_log': { + 'handlers': ['device_log_file'], + 'level': 'INFO', + 'propagate': False, + }, } } -- 2.30.2 From b77120a4c3e375f683e2f61ef8218f4dea3f7303 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Sat, 16 Nov 2024 15:27:21 -0300 Subject: [PATCH 19/20] disabled lotPoperty field --- lot/models.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lot/models.py b/lot/models.py index 53f2acd..d9ef6ef 100644 --- a/lot/models.py +++ b/lot/models.py @@ -46,5 +46,7 @@ class Lot(models.Model): d.delete() class LotProperty (Property): - + #uuid is not needed for id + uuid = None + #lot foreign key is lot = models.ForeignKey(Lot, on_delete=models.CASCADE) -- 2.30.2 From 18d9eef6ef24ceff1b842c04715db0f15c82b4f5 Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Thu, 21 Nov 2024 10:45:18 -0300 Subject: [PATCH 20/20] centered popup modals --- device/templates/details.html | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/device/templates/details.html b/device/templates/details.html index 82c52ee..0bc6e84 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -149,7 +149,7 @@ {% for a in object.get_user_properties %}
    {{ a.key }} {{ a.value }}