From 9cdea3c45f9c2cfd295194c06d6019616b0150aa Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Sat, 13 Jul 2024 15:27:26 +0200 Subject: [PATCH 01/26] upload form --- snapshot/views.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/snapshot/views.py b/snapshot/views.py index 8202bc3..8a84d7c 100644 --- a/snapshot/views.py +++ b/snapshot/views.py @@ -1,7 +1,11 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic.base import TemplateView +from django.views.generic.edit import FormView +from django.urls import reverse_lazy + from dashboard.mixins import DashboardView from snapshot.models import Snapshot +from snapshot.forms import UploadForm # from django.shortcuts import render # from rest_framework import viewsets # from snapshot.serializers import SnapshotSerializer @@ -25,3 +29,12 @@ class ListSnapshotsView(DashboardView, TemplateView): 'snapshots': snapshots, }) return context + + +class UploadView(DashboardView, FormView): + template_name = "upload.html" + section = "snapshots" + title = _("Upload Snapshot") + breadcrumb = "Snapshots / Upload" + success_url = reverse_lazy('snashot:list') + form_class = UploadForm -- 2.30.2 From 12baa6f5386c69d1b639dad8cf9dda37d52891e7 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Sat, 13 Jul 2024 15:27:36 +0200 Subject: [PATCH 02/26] upload form --- snapshot/forms.py | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 snapshot/forms.py diff --git a/snapshot/forms.py b/snapshot/forms.py new file mode 100644 index 0000000..063c115 --- /dev/null +++ b/snapshot/forms.py @@ -0,0 +1,8 @@ + + + +class UploadForm(forms.Form): + snapshot_file = forms.FileField(label=_("File")) + + def clean(self): + data = self.cleaned_data -- 2.30.2 From e135fd9d288e1d786d9b6286e67a47e7170f6a35 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 15 Jul 2024 16:23:14 +0200 Subject: [PATCH 03/26] new version with xapian --- dashboard/mixins.py | 4 +- dashboard/templates/unassigned_devices.html | 4 +- dashboard/views.py | 30 +- device/templates/details.html | 21 +- device/urls.py | 6 +- device/views.py | 30 +- dhub/settings.py | 5 +- snapshot/migrations/0004_anotation.py | 41 ++ .../0005_annotation_delete_anotation.py | 44 ++ snapshot/models.py | 10 +- snapshot/parse.py | 677 +----------------- snapshot/views.py | 16 +- snapshot/xapian.py | 22 + utils/constants.py | 1 + 14 files changed, 233 insertions(+), 678 deletions(-) create mode 100644 snapshot/migrations/0004_anotation.py create mode 100644 snapshot/migrations/0005_annotation_delete_anotation.py create mode 100644 snapshot/xapian.py diff --git a/dashboard/mixins.py b/dashboard/mixins.py index a6c372c..df9d6d1 100644 --- a/dashboard/mixins.py +++ b/dashboard/mixins.py @@ -61,7 +61,7 @@ class DetailsMixin(DashboardView, TemplateView): }) return context - + class InventaryMixin(DashboardView, TemplateView): def post(self, request, *args, **kwargs): @@ -76,5 +76,3 @@ class InventaryMixin(DashboardView, TemplateView): except Exception: pass return super().get(request, *args, **kwargs) - - diff --git a/dashboard/templates/unassigned_devices.html b/dashboard/templates/unassigned_devices.html index bc1365f..df71266 100644 --- a/dashboard/templates/unassigned_devices.html +++ b/dashboard/templates/unassigned_devices.html @@ -44,7 +44,9 @@ - {{ dev.type }} {{ dev.manufacturer }} {{ dev.model }} + + {{ dev.type }} {{ dev.manufacturer }} {{ dev.model }} + diff --git a/dashboard/views.py b/dashboard/views.py index 16c34b1..c42d997 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -1,7 +1,11 @@ +import json + from django.utils.translation import gettext_lazy as _ from django.db.models import Count from dashboard.mixins import InventaryMixin, DetailsMixin from device.models import Device +from snapshot.xapian import search +from snapshot.models import Annotation from lot.models import Lot @@ -13,11 +17,29 @@ class UnassignedDevicesView(InventaryMixin): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - devices = Device.objects.filter( - owner=self.request.user - ).annotate(num_lots=Count('lot')).filter(num_lots=0) + annotations = Annotation.objects.filter( + owner=self.request.user).filter( + key="hidalgo1").order_by('created') + # 'created').distinct('value') + # ).annotate(num_lots=Count('lot')).filter(num_lots=0) + + hids = {} + ids = [] + for x in annotations: + if not hids.get(x.key): + hids[x.key] = x.uuid + ids.append(str(x.uuid)) + + devices = [] + for xa in search(ids): + # import pdb; pdb.set_trace() + snap = json.loads(xa.document.get_data()) + dev = snap.get("device", {}) + dev["id"] = snap["uuid"] + devices.append(dev) + context.update({ - 'devices': devices, + 'devices': devices }) return context diff --git a/device/templates/details.html b/device/templates/details.html index f5d484d..28261a8 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -4,7 +4,7 @@ {% block content %}
-

{{ object.pk }}

+

{{ object.uuid }}

@@ -45,16 +45,16 @@
Details
- (Edit Device) + (Edit Device)
- {%if object.hid %}Snapshot{% else %}Placeholder{% endif %} + {% if object.hid %}Snapshot{% else %}Placeholder{% endif %}
Phid
-
{{ object.id }}
+
{{ object.uuid }}
@@ -69,22 +69,17 @@
Manufacturer
-
{{ object.manufacturer|default:"" }}
+
{{ object.device.manufacturer|default:"" }}
Model
-
{{ object.model|default:"" }}
-
- -
-
Part Number
-
{{ object.part_number|default:"" }}
+
{{ object.device.model|default:"" }}
Serial Number
-
{{ object.serial_number|default:"" }}
+
{{ object.device.serialNumber|default:"" }}
@@ -92,7 +87,7 @@
Physical Properties
- (Edit Physical Properties) + (Edit Physical Properties)
diff --git a/device/urls.py b/device/urls.py index 8445449..33260e9 100644 --- a/device/urls.py +++ b/device/urls.py @@ -5,7 +5,7 @@ app_name = 'device' 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("physical//", views.PhysicalView.as_view(), name="physical_edit"), + path("edit//", views.EditDeviceView.as_view(), name="edit"), + path("/", views.DetailsView.as_view(), name="details"), + path("physical//", views.PhysicalView.as_view(), name="physical_edit"), ] diff --git a/device/views.py b/device/views.py index 249ee1e..0285529 100644 --- a/device/views.py +++ b/device/views.py @@ -1,3 +1,5 @@ +import json + from django.urls import reverse_lazy from django.shortcuts import get_object_or_404 from django.utils.translation import gettext_lazy as _ @@ -5,7 +7,10 @@ from django.views.generic.edit import ( CreateView, UpdateView, ) +from django.views.generic.base import TemplateView from dashboard.mixins import DashboardView, DetailsMixin +from snapshot.models import Annotation +from snapshot.xapian import search from device.models import Device, PhysicalProperties @@ -64,12 +69,35 @@ class EditDeviceView(DashboardView, UpdateView): return kwargs -class DetailsView(DetailsMixin): +class DetailsView2(DetailsMixin): template_name = "details.html" title = _("Device") breadcrumb = "Device / Details" model = Device +class DetailsView(DashboardView, TemplateView): + template_name = "details.html" + title = _("Device") + breadcrumb = "Device / Details" + + def get(self, request, *args, **kwargs): + # import pdb; pdb.set_trace() + self.pk = kwargs['pk'] + annotation = get_object_or_404(Annotation, owner=self.request.user, uuid=self.pk) + for xa in search([str(self.pk)]): + self.object = json.loads(xa.document.get_data()) + return super().get(request, *args, **kwargs) + + return super().get(request, *args, **kwargs) + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({ + 'object': self.object, + }) + return context + + class PhysicalView(DashboardView, UpdateView): template_name = "physical_properties.html" diff --git a/dhub/settings.py b/dhub/settings.py index 0dc2788..6444f43 100644 --- a/dhub/settings.py +++ b/dhub/settings.py @@ -10,6 +10,8 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/5.0/ref/settings/ """ +import xapian + from pathlib import Path from django.contrib.messages import constants as messages from decouple import config, Csv @@ -92,11 +94,10 @@ WSGI_APPLICATION = "dhub.wsgi.application" DATABASES = { "default": { "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", + "NAME": BASE_DIR / "db/db.sqlite3", } } - # Password validation # https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators diff --git a/snapshot/migrations/0004_anotation.py b/snapshot/migrations/0004_anotation.py new file mode 100644 index 0000000..f2e6887 --- /dev/null +++ b/snapshot/migrations/0004_anotation.py @@ -0,0 +1,41 @@ +# Generated by Django 5.0.6 on 2024-07-15 09:20 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("snapshot", "0003_remove_snapshot_start_time"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name="anotation", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("created", models.DateTimeField(auto_now_add=True)), + ("uuid", models.UUIDField(unique=True)), + ("key", models.CharField(max_length=256)), + ("value", models.CharField(max_length=256)), + ( + "owner", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + ), + ), + ], + ), + ] diff --git a/snapshot/migrations/0005_annotation_delete_anotation.py b/snapshot/migrations/0005_annotation_delete_anotation.py new file mode 100644 index 0000000..10c2ded --- /dev/null +++ b/snapshot/migrations/0005_annotation_delete_anotation.py @@ -0,0 +1,44 @@ +# Generated by Django 5.0.6 on 2024-07-15 09:21 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("snapshot", "0004_anotation"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name="Annotation", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("created", models.DateTimeField(auto_now_add=True)), + ("uuid", models.UUIDField(unique=True)), + ("key", models.CharField(max_length=256)), + ("value", models.CharField(max_length=256)), + ( + "owner", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + ), + ), + ], + ), + migrations.DeleteModel( + name="anotation", + ), + ] diff --git a/snapshot/models.py b/snapshot/models.py index 72919ee..868b25a 100644 --- a/snapshot/models.py +++ b/snapshot/models.py @@ -1,5 +1,5 @@ from django.db import models -from utils.constants import STR_SM_SIZE +from utils.constants import STR_SM_SIZE, STR_EXTEND_SIZE from user.models import User from device.models import Computer, Component @@ -29,3 +29,11 @@ class Snapshot(models.Model): computer = models.ForeignKey(Computer, on_delete=models.CASCADE) components = models.ManyToManyField(Component) + +class Annotation(models.Model): + created = models.DateTimeField(auto_now_add=True) + uuid = models.UUIDField(unique=True) + owner = models.ForeignKey(User, on_delete=models.CASCADE) + key = models.CharField(max_length=STR_EXTEND_SIZE) + value = models.CharField(max_length=STR_EXTEND_SIZE) + diff --git a/snapshot/parse.py b/snapshot/parse.py index b09c5fa..f6ce559 100644 --- a/snapshot/parse.py +++ b/snapshot/parse.py @@ -1,15 +1,15 @@ import os import json import shutil +import xapian import hashlib from datetime import datetime -from django.conf import settings -from device.models import Device, Computer -from snapshot.models import Snapshot +from snapshot.models import Snapshot, Annotation +from snapshot.xapian import search, indexer, database -HID = [ +HID_ALGO1 = [ "manufacturer", "model", "chassis", @@ -23,651 +23,44 @@ class Build: self.json = snapshot_json self.user = user self.hid = None - self.result = False - self.save_disk() - self.json_device = self.json["device"] - self.json_components = self.json["components"] - self.uuid = self.json["uuid"] - self.get_hid() - self.gen_computer() - self.gen_components() - self.gen_actions() - self.gen_snapshot() + self.index() + self.create_annotation() - self.result = True - self.move_json() - - def save_disk(self): - snapshot_path = settings.SNAPSHOT_PATH - user = self.user.email - uuid = self.json.get("uuid", "") - now = datetime.now().strftime("%Y-%m-%d-%H-%M") - filename = f"{now}_{user}_{uuid}.json" - path_dir_base = os.path.join(snapshot_path, user) - path_upload = os.path.join(path_dir_base, 'upload') - path_name = os.path.join(path_upload, filename) - self.filename = path_name - self.path_dir_base = path_dir_base - - if not os.path.isdir(path_dir_base): - os.system(f'mkdir -p {path_upload}') - - with open(path_name, 'w') as file: - file.write(json.dumps(self.json)) - - def move_json(self): - if not self.result: + def index(self): + matches = search(self.json['uuid'], limit=1) + if matches.size() > 0: return - shutil.copy(self.filename, self.path_dir_base) - os.remove(self.filename) + snap = json.dumps(self.json) + doc = xapian.Document() + doc.set_data(snap) - def get_hid(self): - hid = "" - for f in HID: - hid += "-" + self.json_device[f] - self.hid = hid + indexer.set_document(doc) + indexer.index_text(snap) - def gen_computer(self): - self.device = Device.objects.filter( - hid=self.hid, - active=True, - reliable=True, - owner=self.user - ).first() + # Add the document to the database. + database.add_document(doc) - if self.device: - return + def get_hid_14(self): + device = self.json['device'] + manufacturer = device.get("manufacturer", '') + model = device.get("model", '') + chassis = device.get("chassis", '') + serial_number = device.get("serialNumber", '') + sku = device.get("sku", '') + hid = f"{manufacturer}{model}{chassis}{serial_number}{sku}" + return hashlib.sha3_256(hid.encode()).hexdigest() - chid = hashlib.sha3_256(self.hid.encode()).hexdigest() - self.device = Device.objects.create( - serial_number=self.json_device["serialNumber"], - manufacturer=self.json_device["manufacturer"], - version=self.json_device["version"], - model=self.json_device["model"], - type=self.json_device["type"], - hid=self.hid, - chid=chid, - owner=self.user + def create_annotation(self): + uuid = self.json['uuid'] + owner = self.user + key = 'hidalgo1' + value = self.get_hid_14() + Annotation.objects.create( + uuid=uuid, + owner=owner, + key=key, + value=value ) - Computer.objects.create( - device=self.device, - sku=self.json_device["sku"], - chassis=self.json_device["chassis"] - ) - - def gen_snapshot(self): - self.snapshot = Snapshot.objects.create( - uuid = self.uuid, - version = self.json["version"], - computer = self.device.computer, - sid = self.json.get("sid", ""), - settings_version = self.json.get("settings_version", ""), - end_time = self.json.get("endTime"), - owner=self.user - ) - - def gen_components(self): - pass - - def gen_actions(self): - pass - - -# class ParseSnapshot: -# def __init__(self, snapshot, default="n/a"): -# self.default = default -# self.dmidecode_raw = snapshot["hwmd"]["dmidecode"] -# self.smart_raw = snapshot["hwmd"]["smart"] -# self.hwinfo_raw = snapshot["hwmd"]["hwinfo"] -# self.lshw_raw = snapshot["hwmd"]["lshw"] -# self.lscpi_raw = snapshot["hwmd"]["lspci"] -# self.sanitize_raw = snapshot.get("sanitize", []) -# self.device = {"actions": []} -# self.components = [] -# self.monitors = [] - -# self.dmi = DMIParse(self.dmidecode_raw) -# self.smart = self.loads(self.smart_raw) -# self.lshw = self.loads(self.lshw_raw) -# self.hwinfo = self.parse_hwinfo() - -# self.set_computer() -# self.get_hwinfo_monitors() -# self.set_components() -# self.snapshot_json = { -# "type": "Snapshot", -# "device": self.device, -# "software": "Workbench", -# # "software": snapshot["software"], -# "components": self.components, -# "uuid": snapshot['uuid'], -# "version": "15.0.0", -# # "version": snapshot['version'], -# "settings_version": snapshot['settings_version'], -# "endTime": snapshot["timestamp"], -# "elapsed": 1, -# "sid": snapshot["sid"], -# } - -# def get_snapshot(self): -# return Snapshot().load(self.snapshot_json) - -# def set_computer(self): -# self.device['manufacturer'] = self.dmi.manufacturer().strip() -# self.device['model'] = self.dmi.model().strip() -# self.device['serialNumber'] = self.dmi.serial_number() -# self.device['type'] = self.get_type() -# self.device['sku'] = self.get_sku() -# self.device['version'] = self.get_version() -# self.device['system_uuid'] = self.get_uuid() -# self.device['family'] = self.get_family() -# self.device['chassis'] = self.get_chassis_dh() - -# def set_components(self): -# self.get_cpu() -# self.get_ram() -# self.get_mother_board() -# self.get_graphic() -# self.get_data_storage() -# self.get_display() -# self.get_sound_card() -# self.get_networks() - -# def get_cpu(self): -# for cpu in self.dmi.get('Processor'): -# serial = cpu.get('Serial Number') -# if serial == 'Not Specified' or not serial: -# serial = cpu.get('ID').replace(' ', '') -# self.components.append( -# { -# "actions": [], -# "type": "Processor", -# "speed": self.get_cpu_speed(cpu), -# "cores": int(cpu.get('Core Count', 1)), -# "model": cpu.get('Version'), -# "threads": int(cpu.get('Thread Count', 1)), -# "manufacturer": cpu.get('Manufacturer'), -# "serialNumber": serial, -# "generation": None, -# "brand": cpu.get('Family'), -# "address": self.get_cpu_address(cpu), -# } -# ) - -# def get_ram(self): -# for ram in self.dmi.get("Memory Device"): -# if ram.get('size') == 'No Module Installed': -# continue -# if not ram.get("Speed"): -# continue - -# self.components.append( -# { -# "actions": [], -# "type": "RamModule", -# "size": self.get_ram_size(ram), -# "speed": self.get_ram_speed(ram), -# "manufacturer": ram.get("Manufacturer", self.default), -# "serialNumber": ram.get("Serial Number", self.default), -# "interface": ram.get("Type", "DDR"), -# "format": ram.get("Form Factor", "DIMM"), -# "model": ram.get("Part Number", self.default), -# } -# ) - -# def get_mother_board(self): -# for moder_board in self.dmi.get("Baseboard"): -# self.components.append( -# { -# "actions": [], -# "type": "Motherboard", -# "version": moder_board.get("Version"), -# "serialNumber": moder_board.get("Serial Number", "").strip(), -# "manufacturer": moder_board.get("Manufacturer", "").strip(), -# "biosDate": self.get_bios_date(), -# "ramMaxSize": self.get_max_ram_size(), -# "ramSlots": len(self.dmi.get("Memory Device")), -# "slots": self.get_ram_slots(), -# "model": moder_board.get("Product Name", "").strip(), -# "firewire": self.get_firmware_num(), -# "pcmcia": self.get_pcmcia_num(), -# "serial": self.get_serial_num(), -# "usb": self.get_usb_num(), -# } -# ) - -# def get_graphic(self): -# nodes = get_nested_dicts_with_key_value(self.lshw, 'class', 'display') -# for c in nodes: -# if not c['configuration'].get('driver', None): -# continue - -# self.components.append( -# { -# "actions": [], -# "type": "GraphicCard", -# "memory": self.get_memory_video(c), -# "manufacturer": c.get("vendor", self.default), -# "model": c.get("product", self.default), -# "serialNumber": c.get("serial", self.default), -# } -# ) - -# def get_memory_video(self, c): -# # get info of lspci -# # pci_id = c['businfo'].split('@')[1] -# # lspci.get(pci_id) | grep size -# # lspci -v -s 00:02.0 -# return None - -# def get_data_storage(self): -# for sm in self.smart: -# if sm.get('smartctl', {}).get('exit_status') == 1: -# continue -# model = sm.get('model_name') -# manufacturer = None -# if model and len(model.split(" ")) > 1: -# mm = model.split(" ") -# model = mm[-1] -# manufacturer = " ".join(mm[:-1]) - -# self.components.append( -# { -# "actions": self.sanitize(sm), -# "type": self.get_data_storage_type(sm), -# "model": model, -# "manufacturer": manufacturer, -# "serialNumber": sm.get('serial_number'), -# "size": self.get_data_storage_size(sm), -# "variant": sm.get("firmware_version"), -# "interface": self.get_data_storage_interface(sm), -# } -# ) - -# def sanitize(self, disk): -# disk_sanitize = None -# for d in self.sanitize_raw: -# s = d.get('device_info', {}).get('export_data', {}) -# s = s.get('block', {}).get('serial') -# if s == disk.get('serial_number'): -# disk_sanitize = d -# break -# if not disk_sanitize: -# return [] - -# steps = [] -# step_type = 'EraseBasic' -# if d.get("method", {}).get('name') == 'Baseline Cryptographic': -# step_type = 'EraseCrypto' - -# if disk.get('type') == 'EraseCrypto': -# step_type = 'EraseCrypto' - -# erase = { -# 'type': step_type, -# 'severity': "Info", -# 'steps': steps, -# 'startTime': None, -# 'endTime': None, -# } -# severities = [] - -# for step in disk_sanitize.get('steps', []): -# severity = "Info" -# if not step['success']: -# severity = "Error" - -# steps.append( -# { -# 'severity': severity, -# 'startTime': unix_isoformat(step['start_time']), -# 'endTime': unix_isoformat(step['end_time']), -# 'type': 'StepRandom', -# } -# ) -# severities.append(severity) - -# erase['endTime'] = unix_isoformat(step['end_time']) -# if not erase['startTime']: -# erase['startTime'] = unix_isoformat(step['start_time']) - -# if "Error" in severities: -# erase['severity'] = "Error" - -# return [erase] - -# def get_networks(self): -# nodes = get_nested_dicts_with_key_value(self.lshw, 'class', 'network') -# for c in nodes: -# capacity = c.get('capacity') -# units = c.get('units') -# speed = None -# if capacity and units: -# speed = unit.Quantity(capacity, units).to('Mbit/s').m -# wireless = bool(c.get('configuration', {}).get('wireless', False)) -# self.components.append( -# { -# "actions": [], -# "type": "NetworkAdapter", -# "model": c.get('product'), -# "manufacturer": c.get('vendor'), -# "serialNumber": c.get('serial'), -# "speed": speed, -# "variant": c.get('version', 1), -# "wireless": wireless, -# } -# ) - -# def get_sound_card(self): -# nodes = get_nested_dicts_with_key_value(self.lshw, 'class', 'multimedia') -# for c in nodes: -# self.components.append( -# { -# "actions": [], -# "type": "SoundCard", -# "model": c.get('product'), -# "manufacturer": c.get('vendor'), -# "serialNumber": c.get('serial'), -# } -# ) - -# def get_display(self): # noqa: C901 -# TECHS = 'CRT', 'TFT', 'LED', 'PDP', 'LCD', 'OLED', 'AMOLED' - -# for c in self.monitors: -# resolution_width, resolution_height = (None,) * 2 -# refresh, serial, model, manufacturer, size = (None,) * 5 -# year, week, production_date = (None,) * 3 - -# for x in c: -# if "Vendor: " in x: -# manufacturer = x.split('Vendor: ')[-1].strip() -# if "Model: " in x: -# model = x.split('Model: ')[-1].strip() -# if "Serial ID: " in x: -# serial = x.split('Serial ID: ')[-1].strip() -# if " Resolution: " in x: -# rs = x.split(' Resolution: ')[-1].strip() -# if 'x' in rs: -# resolution_width, resolution_height = [ -# int(r) for r in rs.split('x') -# ] -# if "Frequencies: " in x: -# try: -# refresh = int(float(x.split(',')[-1].strip()[:-3])) -# except Exception: -# pass -# if 'Year of Manufacture' in x: -# year = x.split(': ')[1] - -# if 'Week of Manufacture' in x: -# week = x.split(': ')[1] - -# if "Size: " in x: -# size = self.get_size_monitor(x) -# technology = next((t for t in TECHS if t in c[0]), None) - -# if year and week: -# d = '{} {} 0'.format(year, week) -# production_date = datetime.strptime(d, '%Y %W %w').isoformat() - -# self.components.append( -# { -# "actions": [], -# "type": "Display", -# "model": model, -# "manufacturer": manufacturer, -# "serialNumber": serial, -# 'size': size, -# 'resolutionWidth': resolution_width, -# 'resolutionHeight': resolution_height, -# "productionDate": production_date, -# 'technology': technology, -# 'refreshRate': refresh, -# } -# ) - -# def get_hwinfo_monitors(self): -# for c in self.hwinfo: -# monitor = None -# external = None -# for x in c: -# if 'Hardware Class: monitor' in x: -# monitor = c -# if 'Driver Info' in x: -# external = c - -# if monitor and not external: -# self.monitors.append(c) - -# def get_size_monitor(self, x): -# i = 1 / 25.4 -# t = x.split('Size: ')[-1].strip() -# tt = t.split('mm') -# if not tt: -# return 0 -# sizes = tt[0].strip() -# if 'x' not in sizes: -# return 0 -# w, h = [int(x) for x in sizes.split('x')] -# return numpy.sqrt(w**2 + h**2) * i - -# def get_cpu_address(self, cpu): -# default = 64 -# for ch in self.lshw.get('children', []): -# for c in ch.get('children', []): -# if c['class'] == 'processor': -# return c.get('width', default) -# return default - -# def get_usb_num(self): -# return len( -# [ -# u -# for u in self.dmi.get("Port Connector") -# if "USB" in u.get("Port Type", "").upper() -# ] -# ) - -# def get_serial_num(self): -# return len( -# [ -# u -# for u in self.dmi.get("Port Connector") -# if "SERIAL" in u.get("Port Type", "").upper() -# ] -# ) - -# def get_firmware_num(self): -# return len( -# [ -# u -# for u in self.dmi.get("Port Connector") -# if "FIRMWARE" in u.get("Port Type", "").upper() -# ] -# ) - -# def get_pcmcia_num(self): -# return len( -# [ -# u -# for u in self.dmi.get("Port Connector") -# if "PCMCIA" in u.get("Port Type", "").upper() -# ] -# ) - -# def get_bios_date(self): -# return self.dmi.get("BIOS")[0].get("Release Date", self.default) - -# def get_firmware(self): -# return self.dmi.get("BIOS")[0].get("Firmware Revision", '1') - -# def get_max_ram_size(self): -# size = 0 -# for slot in self.dmi.get("Physical Memory Array"): -# capacity = slot.get("Maximum Capacity", '0').split(" ")[0] -# size += int(capacity) - -# return size - -# def get_ram_slots(self): -# slots = 0 -# for x in self.dmi.get("Physical Memory Array"): -# slots += int(x.get("Number Of Devices", 0)) -# return slots - -# def get_ram_size(self, ram): -# try: -# memory = ram.get("Size", "0") -# memory = memory.split(' ') -# if len(memory) > 1: -# size = int(memory[0]) -# units = memory[1] -# return base2.Quantity(size, units).to('MiB').m -# return int(size.split(" ")[0]) -# except Exception as err: -# logger.error("get_ram_size error: {}".format(err)) -# return 0 - -# def get_ram_speed(self, ram): -# size = ram.get("Speed", "0") -# return int(size.split(" ")[0]) - -# def get_cpu_speed(self, cpu): -# speed = cpu.get('Max Speed', "0") -# return float(speed.split(" ")[0]) / 1024 - -# def get_sku(self): -# return self.dmi.get("System")[0].get("SKU Number", self.default).strip() - -# def get_version(self): -# return self.dmi.get("System")[0].get("Version", self.default).strip() - -# def get_uuid(self): -# return self.dmi.get("System")[0].get("UUID", '').strip() - -# def get_family(self): -# return self.dmi.get("System")[0].get("Family", '') - -# def get_chassis(self): -# return self.dmi.get("Chassis")[0].get("Type", '_virtual') - -# def get_type(self): -# chassis_type = self.get_chassis() -# return self.translation_to_devicehub(chassis_type) - -# def translation_to_devicehub(self, original_type): -# lower_type = original_type.lower() -# CHASSIS_TYPE = { -# 'Desktop': [ -# 'desktop', -# 'low-profile', -# 'tower', -# 'docking', -# 'all-in-one', -# 'pizzabox', -# 'mini-tower', -# 'space-saving', -# 'lunchbox', -# 'mini', -# 'stick', -# ], -# 'Laptop': [ -# 'portable', -# 'laptop', -# 'convertible', -# 'tablet', -# 'detachable', -# 'notebook', -# 'handheld', -# 'sub-notebook', -# ], -# 'Server': ['server'], -# 'Computer': ['_virtual'], -# } -# for k, v in CHASSIS_TYPE.items(): -# if lower_type in v: -# return k -# return self.default - -# def get_chassis_dh(self): -# CHASSIS_DH = { -# 'Tower': {'desktop', 'low-profile', 'tower', 'server'}, -# 'Docking': {'docking'}, -# 'AllInOne': {'all-in-one'}, -# 'Microtower': {'mini-tower', 'space-saving', 'mini'}, -# 'PizzaBox': {'pizzabox'}, -# 'Lunchbox': {'lunchbox'}, -# 'Stick': {'stick'}, -# 'Netbook': {'notebook', 'sub-notebook'}, -# 'Handheld': {'handheld'}, -# 'Laptop': {'portable', 'laptop'}, -# 'Convertible': {'convertible'}, -# 'Detachable': {'detachable'}, -# 'Tablet': {'tablet'}, -# 'Virtual': {'_virtual'}, -# } - -# chassis = self.get_chassis() -# lower_type = chassis.lower() -# for k, v in CHASSIS_DH.items(): -# if lower_type in v: -# return k -# return self.default - -# def get_data_storage_type(self, x): -# # TODO @cayop add more SSDS types -# SSDS = ["nvme"] -# SSD = 'SolidStateDrive' -# HDD = 'HardDrive' -# type_dev = x.get('device', {}).get('type') -# trim = x.get('trim', {}).get("supported") in [True, "true"] -# return SSD if type_dev in SSDS or trim else HDD - -# def get_data_storage_interface(self, x): -# interface = x.get('device', {}).get('protocol', 'ATA') -# try: -# DataStorageInterface(interface.upper()) -# except ValueError as err: -# txt = "Sid: {}, interface {} is not in DataStorageInterface Enum".format( -# self.sid, interface -# ) -# self.errors("{}".format(err)) -# self.errors(txt, severity=Severity.Warning) -# return "ATA" - -# def get_data_storage_size(self, x): -# total_capacity = x.get('user_capacity', {}).get('bytes') -# if not total_capacity: -# return 1 -# # convert bytes to Mb -# return total_capacity / 1024**2 - -# def parse_hwinfo(self): -# hw_blocks = self.hwinfo_raw.split("\n\n") -# return [x.split("\n") for x in hw_blocks] - -# def loads(self, x): -# if isinstance(x, str): -# return json.loads(x) -# return x - -# def errors(self, txt=None, severity=Severity.Error): -# if not txt: -# return self._errors - -# logger.error(txt) -# self._errors.append(txt) -# error = SnapshotsLog( -# description=txt, -# snapshot_uuid=self.uuid, -# severity=severity, -# sid=self.sid, -# version=self.version, -# ) -# error.save() - - diff --git a/snapshot/views.py b/snapshot/views.py index 8a84d7c..0b143a9 100644 --- a/snapshot/views.py +++ b/snapshot/views.py @@ -5,7 +5,7 @@ from django.urls import reverse_lazy from dashboard.mixins import DashboardView from snapshot.models import Snapshot -from snapshot.forms import UploadForm +# from snapshot.forms import UploadForm # from django.shortcuts import render # from rest_framework import viewsets # from snapshot.serializers import SnapshotSerializer @@ -31,10 +31,10 @@ class ListSnapshotsView(DashboardView, TemplateView): return context -class UploadView(DashboardView, FormView): - template_name = "upload.html" - section = "snapshots" - title = _("Upload Snapshot") - breadcrumb = "Snapshots / Upload" - success_url = reverse_lazy('snashot:list') - form_class = UploadForm +# class UploadView(DashboardView, FormView): +# template_name = "upload.html" +# section = "snapshots" +# title = _("Upload Snapshot") +# breadcrumb = "Snapshots / Upload" +# success_url = reverse_lazy('snashot:list') +# form_class = UploadForm diff --git a/snapshot/xapian.py b/snapshot/xapian.py new file mode 100644 index 0000000..8ed6261 --- /dev/null +++ b/snapshot/xapian.py @@ -0,0 +1,22 @@ +import xapian + +database = xapian.WritableDatabase("db", xapian.DB_CREATE_OR_OPEN) + +indexer = xapian.TermGenerator() +stemmer = xapian.Stem("english") +indexer.set_stemmer(stemmer) + + +def search(qs, offset=0, limit=10): + query_string = str.join(' ', qs) + + qp = xapian.QueryParser() + qp.set_stemmer(stemmer) + qp.set_database(database) + qp.set_stemming_strategy(xapian.QueryParser.STEM_SOME) + query = qp.parse_query(query_string) + enquire = xapian.Enquire(database) + enquire.set_query(query) + matches = enquire.get_mset(offset, limit) + return matches + diff --git a/utils/constants.py b/utils/constants.py index d51519d..210b1c2 100644 --- a/utils/constants.py +++ b/utils/constants.py @@ -5,3 +5,4 @@ STR_XSM_SIZE = 16 STR_SM_SIZE = 32 STR_SIZE = 64 STR_BIG_SIZE = 128 +STR_EXTEND_SIZE = 256 -- 2.30.2 From b1440fddfa97bba7fda60ede3f3322e00ba744a0 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 18 Jul 2024 17:21:22 +0200 Subject: [PATCH 04/26] new structure --- dashboard/mixins.py | 2 + dashboard/templates/base.html | 16 +- dashboard/views.py | 28 +- device/migrations/0001_initial.py | 369 +----------------- ...rand_alter_device_devicehub_id_and_more.py | 33 -- device/migrations/0002_device_model.py | 18 + device/migrations/0003_device_manufacturer.py | 18 + ...nent_type_remove_computer_type_and_more.py | 73 ---- ..._dhid_bk_remove_device_phid_bk_and_more.py | 46 --- device/models.py | 192 +++------ device/templates/details.html | 198 ++++------ device/urls.py | 6 +- device/views.py | 108 ++--- example/snapshot1.json | 1 + lot/migrations/0001_initial.py | 44 ++- lot/models.py | 40 +- lot/templates/list_lots.html | 35 +- lot/urls.py | 4 +- lot/views.py | 38 +- reset.sh | 4 + snapshot/migrations/0001_initial.py | 44 +-- .../migrations/0002_alter_snapshot_uuid.py | 18 - .../0003_remove_snapshot_start_time.py | 17 - snapshot/migrations/0004_anotation.py | 41 -- .../0005_annotation_delete_anotation.py | 44 --- snapshot/models.py | 85 ++-- snapshot/parse.py | 71 ++-- snapshot/views.py | 9 +- snapshot/xapian.py | 43 +- user/management/commands/add_user.py | 20 +- user/migrations/0001_initial.py | 2 +- utils/constants.py | 14 + 32 files changed, 471 insertions(+), 1210 deletions(-) delete mode 100644 device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py create mode 100644 device/migrations/0002_device_model.py create mode 100644 device/migrations/0003_device_manufacturer.py delete mode 100644 device/migrations/0003_remove_component_type_remove_computer_type_and_more.py delete mode 100644 device/migrations/0004_remove_device_dhid_bk_remove_device_phid_bk_and_more.py create mode 100644 example/snapshot1.json create mode 100644 reset.sh delete mode 100644 snapshot/migrations/0002_alter_snapshot_uuid.py delete mode 100644 snapshot/migrations/0003_remove_snapshot_start_time.py delete mode 100644 snapshot/migrations/0004_anotation.py delete mode 100644 snapshot/migrations/0005_annotation_delete_anotation.py diff --git a/dashboard/mixins.py b/dashboard/mixins.py index df9d6d1..bd93513 100644 --- a/dashboard/mixins.py +++ b/dashboard/mixins.py @@ -5,6 +5,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 lot.models import LotTag class Http403(PermissionDenied): @@ -37,6 +38,7 @@ class DashboardView(LoginRequiredMixin): 'section': self.section, 'path': resolve(self.request.path).url_name, 'user': self.request.user, + 'lot_tags': LotTag.objects.filter(owner=self.request.user) }) return context diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html index 8134c90..296dd35 100644 --- a/dashboard/templates/base.html +++ b/dashboard/templates/base.html @@ -103,21 +103,13 @@ {% trans 'Lots' %}
  • diff --git a/dashboard/views.py b/dashboard/views.py index c42d997..96db513 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -6,7 +6,7 @@ from dashboard.mixins import InventaryMixin, DetailsMixin from device.models import Device from snapshot.xapian import search from snapshot.models import Annotation -from lot.models import Lot +from lot.models import Lot, LotTag class UnassignedDevicesView(InventaryMixin): @@ -17,30 +17,14 @@ class UnassignedDevicesView(InventaryMixin): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - annotations = Annotation.objects.filter( - owner=self.request.user).filter( - key="hidalgo1").order_by('created') - # 'created').distinct('value') - # ).annotate(num_lots=Count('lot')).filter(num_lots=0) - - hids = {} - ids = [] - for x in annotations: - if not hids.get(x.key): - hids[x.key] = x.uuid - ids.append(str(x.uuid)) - - devices = [] - for xa in search(ids): - # import pdb; pdb.set_trace() - snap = json.loads(xa.document.get_data()) - dev = snap.get("device", {}) - dev["id"] = snap["uuid"] - devices.append(dev) + devices = Device.objects.filter( + owner=self.request.user + ).annotate(num_lots=Count('lot')).filter(num_lots=0) context.update({ - 'devices': devices + 'devices': devices, }) + return context diff --git a/device/migrations/0001_initial.py b/device/migrations/0001_initial.py index 22d9017..ed68a41 100644 --- a/device/migrations/0001_initial.py +++ b/device/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.6 on 2024-06-11 09:20 +# Generated by Django 5.0.6 on 2024-07-17 14:57 import django.db.models.deletion from django.conf import settings @@ -26,31 +26,7 @@ class Migration(migrations.Migration): verbose_name="ID", ), ), - ("created", models.DateTimeField(auto_now_add=True)), - ("updated", models.DateTimeField(auto_now=True)), - ("type", models.CharField(max_length=32)), - ("model", models.CharField(blank=True, max_length=64, null=True)), - ( - "manufacturer", - models.CharField(blank=True, max_length=64, null=True), - ), - ( - "serial_number", - models.CharField(blank=True, max_length=64, null=True), - ), - ("part_number", models.CharField(blank=True, max_length=64, null=True)), - ("brand", models.TextField(blank=True, null=True)), - ("generation", models.SmallIntegerField(blank=True, null=True)), - ("version", models.TextField(blank=True, null=True)), - ("production_date", models.DateTimeField(blank=True, null=True)), - ("variant", models.TextField(blank=True, null=True)), - ("devicehub_id", models.TextField(blank=True, null=True, unique=True)), - ("dhid_bk", models.CharField(blank=True, max_length=64, null=True)), - ("phid_bk", models.CharField(blank=True, max_length=64, null=True)), - ("family", models.CharField(blank=True, max_length=64, null=True)), - ("hid", models.CharField(blank=True, max_length=64, null=True)), - ("chid", models.CharField(blank=True, max_length=64, null=True)), - ("active", models.BooleanField(default=True)), + ("type", models.CharField(blank=True, max_length=64, null=True)), ( "owner", models.ForeignKey( @@ -60,345 +36,4 @@ class Migration(migrations.Migration): ), ], ), - migrations.CreateModel( - name="Component", - fields=[ - ( - "device", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - primary_key=True, - serialize=False, - to="device.device", - ), - ), - ( - "type", - models.CharField( - choices=[ - ("GraphicCard", "Graphiccard"), - ("DataStorage", "Datastorage"), - ("Motherboard", "Motherboard"), - ("NetworkAdapter", "Networkadapter"), - ("Processor", "Processor"), - ("RamModule", "Rammodule"), - ("SoundCard", "Soundcard"), - ("Display", "Display"), - ("Battery", "Battery"), - ("Camera", "Camera"), - ], - max_length=32, - ), - ), - ], - ), - migrations.CreateModel( - name="Computer", - fields=[ - ( - "device", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - primary_key=True, - serialize=False, - to="device.device", - ), - ), - ("chassis", models.TextField(blank=True, null=True)), - ("system_uuid", models.UUIDField()), - ("sku", models.TextField(blank=True, null=True)), - ( - "type", - models.CharField( - choices=[ - ("Desktop", "Desktop"), - ("Laptop", "Laptop"), - ("Server", "Server"), - ], - default="Laptop", - max_length=32, - ), - ), - ], - ), - migrations.CreateModel( - name="PhysicalProperties", - fields=[ - ( - "device", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - primary_key=True, - serialize=False, - to="device.device", - ), - ), - ("weight", models.FloatField(blank=True, null=True)), - ("width", models.FloatField(blank=True, null=True)), - ("height", models.FloatField(blank=True, null=True)), - ("depth", models.FloatField(blank=True, null=True)), - ("color", models.CharField(blank=True, max_length=20, null=True)), - ("image", models.CharField(blank=True, max_length=64, null=True)), - ], - ), - migrations.CreateModel( - name="SoundCard", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="RamModule", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("size", models.IntegerField(blank=True, null=True)), - ("speed", models.SmallIntegerField(blank=True, null=True)), - ( - "interface", - models.CharField( - choices=[ - ("SDRAM", "Sdram"), - ("DDR SDRAM", "Ddr"), - ("DDR2 SDRAM", "Ddr2"), - ("DDR3 SDRAM", "Ddr3"), - ("DDR4 SDRAM", "Ddr4"), - ("DDR5 SDRAM", "Ddr5"), - ("DDR6 SDRAM", "Ddr6"), - ("LPDDR3", "Lpddr3"), - ], - max_length=32, - ), - ), - ( - "format", - models.CharField( - choices=[("DIMM", "Dimm"), ("SODIMM", "Sodimm")], max_length=32 - ), - ), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="Processor", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("speed", models.FloatField(blank=True, null=True)), - ("cores", models.SmallIntegerField(blank=True, null=True)), - ("threads", models.SmallIntegerField(blank=True, null=True)), - ("address", models.SmallIntegerField(blank=True, null=True)), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="NetworkAdapter", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("speed", models.IntegerField(blank=True, null=True)), - ("wireless", models.BooleanField(default=False)), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="Motherboard", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("slots", models.SmallIntegerField(blank=True, null=True)), - ("usb", models.SmallIntegerField(blank=True, null=True)), - ("firewire", models.SmallIntegerField(blank=True, null=True)), - ("serial", models.SmallIntegerField(blank=True, null=True)), - ("pcmcia", models.SmallIntegerField(blank=True, null=True)), - ("bios_date", models.DateTimeField()), - ("ram_slots", models.SmallIntegerField(blank=True, null=True)), - ("ram_max_size", models.IntegerField(blank=True, null=True)), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="GraphicCard", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("memory", models.IntegerField(blank=True, null=True)), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="Display", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="DataStorage", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("size", models.IntegerField(blank=True, null=True)), - ( - "interface", - models.CharField( - choices=[ - ("ATA", "Ata"), - ("USB", "Usb"), - ("PCI", "Pci"), - ("NVME", "Nvme"), - ], - max_length=32, - ), - ), - ( - "type", - models.CharField( - choices=[ - ("HardDrive", "Harddrive"), - ("SolidStateDrive", "Solidstatedrive"), - ], - max_length=32, - ), - ), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="Battery", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.AddField( - model_name="component", - name="computer", - field=models.OneToOneField( - null=True, - on_delete=django.db.models.deletion.CASCADE, - to="device.computer", - ), - ), ] diff --git a/device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py b/device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py deleted file mode 100644 index 1d02fb7..0000000 --- a/device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-03 11:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("device", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="device", - name="brand", - field=models.CharField(blank=True, max_length=64, null=True), - ), - migrations.AlterField( - model_name="device", - name="devicehub_id", - field=models.CharField(blank=True, max_length=64, null=True, unique=True), - ), - migrations.AlterField( - model_name="device", - name="variant", - field=models.CharField(blank=True, max_length=64, null=True), - ), - migrations.AlterField( - model_name="device", - name="version", - field=models.CharField(blank=True, max_length=64, null=True), - ), - ] diff --git a/device/migrations/0002_device_model.py b/device/migrations/0002_device_model.py new file mode 100644 index 0000000..0d02c3d --- /dev/null +++ b/device/migrations/0002_device_model.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0.6 on 2024-07-18 09:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("device", "0001_initial"), + ] + + operations = [ + migrations.AddField( + model_name="device", + name="model", + field=models.CharField(blank=True, max_length=256, null=True), + ), + ] diff --git a/device/migrations/0003_device_manufacturer.py b/device/migrations/0003_device_manufacturer.py new file mode 100644 index 0000000..511b7c1 --- /dev/null +++ b/device/migrations/0003_device_manufacturer.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0.6 on 2024-07-18 09:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("device", "0002_device_model"), + ] + + operations = [ + migrations.AddField( + model_name="device", + name="manufacturer", + field=models.CharField(blank=True, max_length=256, null=True), + ), + ] diff --git a/device/migrations/0003_remove_component_type_remove_computer_type_and_more.py b/device/migrations/0003_remove_component_type_remove_computer_type_and_more.py deleted file mode 100644 index d57d6bc..0000000 --- a/device/migrations/0003_remove_component_type_remove_computer_type_and_more.py +++ /dev/null @@ -1,73 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-03 12:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("device", "0002_alter_device_brand_alter_device_devicehub_id_and_more"), - ] - - operations = [ - migrations.RemoveField( - model_name="component", - name="type", - ), - migrations.RemoveField( - model_name="computer", - name="type", - ), - migrations.RemoveField( - model_name="datastorage", - name="type", - ), - migrations.AlterField( - model_name="computer", - name="chassis", - field=models.CharField( - blank=True, - choices=[ - ("Tower", "Tower"), - ("All in one", "Allinone"), - ("Microtower", "Microtower"), - ("Netbook", "Netbook"), - ("Laptop", "Laptop"), - ("Tablet", "Tabler"), - ("Server", "Server"), - ("Non-physical device", "Virtual"), - ], - max_length=32, - null=True, - ), - ), - migrations.AlterField( - model_name="computer", - name="sku", - field=models.CharField(blank=True, max_length=32, null=True), - ), - migrations.AlterField( - model_name="device", - name="type", - field=models.CharField( - choices=[ - ("Desktop", "Desktop"), - ("Laptop", "Laptop"), - ("Server", "Server"), - ("GraphicCard", "Graphiccard"), - ("HardDrive", "Harddrive"), - ("SolidStateDrive", "Solidstatedrive"), - ("Motherboard", "Motherboard"), - ("NetworkAdapter", "Networkadapter"), - ("Processor", "Processor"), - ("RamModule", "Rammodule"), - ("SoundCard", "Soundcard"), - ("Display", "Display"), - ("Battery", "Battery"), - ("Camera", "Camera"), - ], - default="Laptop", - max_length=32, - ), - ), - ] diff --git a/device/migrations/0004_remove_device_dhid_bk_remove_device_phid_bk_and_more.py b/device/migrations/0004_remove_device_dhid_bk_remove_device_phid_bk_and_more.py deleted file mode 100644 index fefff1d..0000000 --- a/device/migrations/0004_remove_device_dhid_bk_remove_device_phid_bk_and_more.py +++ /dev/null @@ -1,46 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-11 13:58 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("device", "0003_remove_component_type_remove_computer_type_and_more"), - ] - - operations = [ - migrations.RemoveField( - model_name="device", - name="dhid_bk", - ), - migrations.RemoveField( - model_name="device", - name="phid_bk", - ), - migrations.AddField( - model_name="computer", - name="erasure_server", - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name="device", - name="reliable", - field=models.BooleanField(default=True), - ), - migrations.AlterField( - model_name="component", - name="computer", - field=models.ForeignKey( - null=True, - on_delete=django.db.models.deletion.CASCADE, - to="device.computer", - ), - ), - migrations.AlterField( - model_name="computer", - name="system_uuid", - field=models.UUIDField(blank=True, null=True), - ), - ] diff --git a/device/models.py b/device/models.py index 3b87247..65a1e6b 100644 --- a/device/models.py +++ b/device/models.py @@ -1,6 +1,8 @@ from django.db import models + +from utils.constants import STR_SM_SIZE, STR_SIZE, STR_EXTEND_SIZE, ALGOS +from snapshot.models import Annotation, Snapshot from user.models import User -from utils.constants import STR_SM_SIZE, STR_SIZE class Device(models.Model): @@ -20,155 +22,59 @@ class Device(models.Model): BATTERY = "Battery" CAMERA = "Camera" - created = models.DateTimeField(auto_now_add=True) - updated = models.DateTimeField(auto_now=True) - type = models.CharField(max_length=STR_SM_SIZE, choices=Types, default=Types.LAPTOP) - model = models.CharField(max_length=STR_SIZE, blank=True, null=True) - manufacturer = models.CharField(max_length=STR_SIZE, blank=True, null=True) - serial_number = models.CharField(max_length=STR_SIZE, blank=True, null=True) - part_number = models.CharField(max_length=STR_SIZE, blank=True, null=True) - brand = models.CharField(max_length=STR_SIZE, blank=True, null=True) - generation = models.SmallIntegerField(blank=True, null=True) - version = models.CharField(max_length=STR_SIZE, blank=True, null=True) - production_date = models.DateTimeField(blank=True, null=True) - variant = models.CharField(max_length=STR_SIZE, blank=True, null=True) - devicehub_id = models.CharField(max_length=STR_SIZE, unique=True, blank=True, null=True) - family = models.CharField(max_length=STR_SIZE, blank=True, null=True) - hid = models.CharField(max_length=STR_SIZE, blank=True, null=True) - chid = models.CharField(max_length=STR_SIZE, blank=True, null=True) - active = models.BooleanField(default=True) - reliable = models.BooleanField(default=True) owner = models.ForeignKey(User, on_delete=models.CASCADE) + type = models.CharField(max_length=STR_SIZE, blank=True, null=True) + manufacturer = models.CharField(max_length=STR_EXTEND_SIZE, blank=True, null=True) + model = models.CharField(max_length=STR_EXTEND_SIZE, blank=True, null=True) - def has_physical_properties(self): - try: - if self.physicalproperties: - return True - else: - return False - except Exception: - return False + def __init__(self, *args, **kwargs): + self.annotations = [] + self.hids = [] + self.uuids = [] + self.snapshots = [] + super().__init__(*args, **kwargs) + def initial(self): + self.get_annotations() + self.get_uuids() + self.get_hids() + self.get_snapshots() + + def get_annotations(self): + self.annotations = Annotation.objects.filter( + device=self, + owner=self.owner + ).order_by("-created") + + def get_uuids(self): + for a in self.annotations: + if not a.uuid in self.uuids: + self.uuids.append(a.uuid) -class PhysicalProperties(models.Model): - device = models.OneToOneField(Device, models.CASCADE, primary_key=True) - weight = models.FloatField(blank=True, null=True) - width = models.FloatField(blank=True, null=True) - height = models.FloatField(blank=True, null=True) - depth = models.FloatField(blank=True, null=True) - color = models.CharField(max_length=20, blank=True, null=True) - image = models.CharField(max_length=STR_SIZE, blank=True, null=True) + def get_hids(self): + if not self.annotations: + self.get_annotations() + self.hids = self.annotations.filter( + type=Annotation.Type.SYSTEM, + key__in=ALGOS.keys(), + ).values_list("value", flat=True) -class Computer(models.Model): - class Chassis(models.TextChoices): - TOWER = 'Tower' - ALLINONE = 'All in one' - MICROTOWER = 'Microtower' - NETBOOK = 'Netbook' - LAPTOP = 'Laptop' - TABLER = 'Tablet' - SERVER = "Server" - VIRTUAL = 'Non-physical device' + def get_snapshots(self): + if not self.uuids: + self.get_uuids() + self.snapshots = [Snapshot(u) for u in self.uuids] - device = models.OneToOneField(Device, models.CASCADE, primary_key=True) - chassis = models.CharField( - blank=True, - null=True, - max_length=STR_SM_SIZE, - choices=Chassis - ) - system_uuid = models.UUIDField(blank=True, null=True) - sku = models.CharField(max_length=STR_SM_SIZE, blank=True, null=True) - erasure_server = models.BooleanField(default=False) + def get_last_snapshot(self): + if not self.snapshots: + self.get_snapshots() + if self.snapshots: + return self.snapshots[0] -class Component(models.Model): - device = models.OneToOneField(Device, models.CASCADE, primary_key=True) - computer = models.ForeignKey(Computer, on_delete=models.CASCADE, null=True) - - -class GraphicCard(models.Model): - component = models.OneToOneField(Component, models.CASCADE) - memory = models.IntegerField(blank=True, null=True) - - -class DataStorage(models.Model): - class Interface(models.TextChoices): - ATA = 'ATA' - USB = 'USB' - PCI = 'PCI' - NVME = 'NVME' - - size = models.IntegerField(blank=True, null=True) - interface = models.CharField(max_length=STR_SM_SIZE, choices=Interface) - component = models.OneToOneField(Component, models.CASCADE) - - -class Motherboard(models.Model): - component = models.OneToOneField(Component, models.CASCADE) - slots = models.SmallIntegerField(blank=True, null=True) - usb = models.SmallIntegerField(blank=True, null=True) - firewire = models.SmallIntegerField(blank=True, null=True) - serial = models.SmallIntegerField(blank=True, null=True) - pcmcia = models.SmallIntegerField(blank=True, null=True) - bios_date = models.DateTimeField() - ram_slots = models.SmallIntegerField(blank=True, null=True) - ram_max_size = models.IntegerField(blank=True, null=True) - - -class NetworkAdapter(models.Model): - component = models.OneToOneField(Component, models.CASCADE) - speed = models.IntegerField(blank=True, null=True) - wireless = models.BooleanField(default=False) - - def __format__(self, format_spec): - v = super().__format__(format_spec) - if 's' in format_spec: - v += ' – {} Mbps'.format(self.speed) - return v - - -class Processor(models.Model): - component = models.OneToOneField(Component, models.CASCADE) - speed = models.FloatField(blank=True, null=True) - cores = models.SmallIntegerField(blank=True, null=True) - threads = models.SmallIntegerField(blank=True, null=True) - address = models.SmallIntegerField(blank=True, null=True) - - -class RamModule(models.Model): - class Interface(models.TextChoices): - SDRAM = 'SDRAM' - DDR = 'DDR SDRAM' - DDR2 = 'DDR2 SDRAM' - DDR3 = 'DDR3 SDRAM' - DDR4 = 'DDR4 SDRAM' - DDR5 = 'DDR5 SDRAM' - DDR6 = 'DDR6 SDRAM' - LPDDR3 = 'LPDDR3' - - class Format(models.TextChoices): - DIMM = 'DIMM' - SODIMM = 'SODIMM' - - component = models.OneToOneField(Component, models.CASCADE) - size = models.IntegerField(blank=True, null=True) - interface = models.CharField(max_length=STR_SM_SIZE, choices=Interface) - speed = models.SmallIntegerField(blank=True, null=True) - interface = models.CharField(max_length=STR_SM_SIZE, choices=Interface) - format = models.CharField(max_length=STR_SM_SIZE, choices=Format) - - -class SoundCard(models.Model): - component = models.OneToOneField(Component, models.CASCADE) - - -class Display(models.Model): - component = models.OneToOneField(Component, models.CASCADE) - - -class Battery(models.Model): - component = models.OneToOneField(Component, models.CASCADE) - + @classmethod + def get_unassigned(cls, user): + return cls.objects.filter( + owner=user + ).annotate(num_lots=models.Count('lot')).filter(num_lots=0) diff --git a/device/templates/details.html b/device/templates/details.html index 28261a8..dd05dfd 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -4,18 +4,18 @@ {% block content %}
    -

    {{ object.uuid }}

    +

    {{ object.id }}

    -
    +
    • - +
    • @@ -23,20 +23,19 @@
      • -
    • - -
      • +
    • + +
    • Web
      • - -
    +
    @@ -45,7 +44,7 @@
    Details
    - (Edit Device) + (Edit Device)
    {% if object.hid %}Snapshot{% else %}Placeholder{% endif %} @@ -54,7 +53,7 @@
    Phid
    -
    {{ object.uuid }}
    +
    {{ object.id }}
    @@ -64,101 +63,85 @@
    Type
    -
    {{ object.type }}
    +
    {{ snapshot.doc.device.type }}
    Manufacturer
    -
    {{ object.device.manufacturer|default:"" }}
    +
    {{ snapshot.doc.device.manufacturer|default:"" }}
    Model
    -
    {{ object.device.model|default:"" }}
    +
    {{ snapshot.doc.device.model|default:"" }}
    Serial Number
    -
    {{ object.device.serialNumber|default:"" }}
    +
    {{ snapshot.doc.device.serialNumber|default:"" }}
    +
    +
    Identifiers
    +
    + {% for chid in object.hids %} +
    +
    {{ chid |default:"" }}
    +
    + {% endfor %}
    -
    -
    Physical Properties
    -
    -
    - (Edit Physical Properties) -
    -
    - - {% if object.has_physical_properties %} -
    -
    - Weight: -
    -
    - {{ object.physicalproperties.weight }} -
    +
    +
    + + + Add new annotation + +
    -
    -
    width:
    -
    - {{ object.physicalproperties.width }} -
    -
    - -
    -
    height:
    -
    - {{ object.physicalproperties.height }} -
    -
    - -
    -
    depth:
    -
    - {{ object.physicalproperties.depth }} -
    -
    - -
    -
    color:
    -
    - {{ object.physicalproperties.color }} -
    -
    - -
    -
    image:
    -
    - {% if object.physicalproperties.image %} - - {% endif %} -
    -
    - {% endif %} +
    Annotations
    + + + + + + + + + + + + {% for a in object.annotations %} + {% if a.is_user_annotation %} + + + + + + + + {% endif %} + {% endfor %} + + +
    KeyValueCreated on
    {{ a.key }}{{ a.value }}{{ a.created }}
    -
    Incoming Lots
    + {% for tag in lot_tags %} +
    {{ tag }}
    + {% for lot in object.lot_set.filter %} + {% if lot.type == tag %}
    - -
    - -
    Outgoing Lots
    - -
    - -
    - -
    Temporary Lots
    - -
    - +
    + {{ lot.name }} +
    + {% endif %} + {% endfor %} + {% endfor %}
    @@ -188,28 +171,6 @@
    -
    -
    Status Details
    -
    -
    Physical State
    -
    - -
    -
    -
    -
    Lifecycle State
    -
    - -
    -
    -
    -
    Allocated State
    -
    - -
    -
    -
    -
    Traceability log Details
    @@ -233,35 +194,42 @@
    -
    Components Snapshot
    +
    Components last snapshot
    - + {% for c in snapshot.components %}
    -
    Motherboard
    - 14:07 23-06-2024 +
    {{ c.type }}
    + {{ snapshot.created }}

    - hp
    - 890e
    + {{ c.manufacturer }}
    + {{ c.model }}
    + {{ c.serialNumber }}

    - + {% endfor %} +
    +
    + +
    +
    List of snapshots
    +
    + {% for snap in object.snapshots %}
    -
    NetworkAdapter
    - 14:07 23-06-2024 +
    + {{ snap.created }}

    - realtek semiconductor co., ltd.
    - rtl8852ae 802.11ax pcie wireless network adapter
    + {{ snap.uuid }}

    - + {% endfor %}
    diff --git a/device/urls.py b/device/urls.py index 33260e9..7fc0e96 100644 --- a/device/urls.py +++ b/device/urls.py @@ -5,7 +5,7 @@ app_name = 'device' 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("physical//", views.PhysicalView.as_view(), name="physical_edit"), + 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"), ] diff --git a/device/views.py b/device/views.py index 0285529..00255dd 100644 --- a/device/views.py +++ b/device/views.py @@ -11,7 +11,8 @@ from django.views.generic.base import TemplateView from dashboard.mixins import DashboardView, DetailsMixin from snapshot.models import Annotation from snapshot.xapian import search -from device.models import Device, PhysicalProperties +from lot.models import LotTag +from device.models import Device class NewDeviceView(DashboardView, CreateView): @@ -20,26 +21,12 @@ class NewDeviceView(DashboardView, CreateView): breadcrumb = "Device / New Device" success_url = reverse_lazy('dashboard:unassigned_devices') model = Device - fields = ( - 'type', - "model", - "manufacturer", - "serial_number", - "part_number", - "brand", - "generation", - "version", - "production_date", - "variant", - "family", - ) def form_valid(self, form): form.instance.owner = self.request.user response = super().form_valid(form) - PhysicalProperties.objects.create(device=form.instance) return response - + class EditDeviceView(DashboardView, UpdateView): template_name = "new_device.html" @@ -47,19 +34,6 @@ class EditDeviceView(DashboardView, UpdateView): breadcrumb = "Device / Update Device" success_url = reverse_lazy('dashboard:unassigned_devices') model = Device - fields = ( - 'type', - "model", - "manufacturer", - "serial_number", - "part_number", - "brand", - "generation", - "version", - "production_date", - "variant", - "family", - ) def get_form_kwargs(self): pk = self.kwargs.get('pk') @@ -67,73 +41,53 @@ class EditDeviceView(DashboardView, UpdateView): self.success_url = reverse_lazy('device:details', args=[pk]) kwargs = super().get_form_kwargs() return kwargs - -class DetailsView2(DetailsMixin): + +class DetailsView(DetailsMixin): template_name = "details.html" title = _("Device") breadcrumb = "Device / Details" model = Device -class DetailsView(DashboardView, TemplateView): - template_name = "details.html" - title = _("Device") - breadcrumb = "Device / Details" - - def get(self, request, *args, **kwargs): - # import pdb; pdb.set_trace() - self.pk = kwargs['pk'] - annotation = get_object_or_404(Annotation, owner=self.request.user, uuid=self.pk) - for xa in search([str(self.pk)]): - self.object = json.loads(xa.document.get_data()) - return super().get(request, *args, **kwargs) - - return super().get(request, *args, **kwargs) - def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + self.object.initial() + lot_tags = LotTag.objects.filter(owner=self.request.user) context.update({ - 'object': self.object, + 'snapshot': self.object.get_last_snapshot(), + 'lot_tags': lot_tags, }) return context - -class PhysicalView(DashboardView, UpdateView): - template_name = "physical_properties.html" - title = _("Physical Properties") - breadcrumb = "Device / Physical properties" +class AddAnnotationView(DashboardView, CreateView): + template_name = "new_device.html" + title = _("New annotation") + breadcrumb = "Device / New annotation" success_url = reverse_lazy('dashboard:unassigned_devices') - model = PhysicalProperties - fields = ( - "weight", - "width", - "height", - "depth", - "color", - "image", - ) + model = Annotation + fields = ("key", "value") - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context.update({ - 'device': self.device, - }) - return context + def form_valid(self, form): + self.device.get_annotations() + self.device.get_uuids() + form.instance.owner = self.request.user + form.instance.device = self.device + form.instance.uuid = self.device.uuids[0] + form.instance.type = Annotation.Type.USER + response = super().form_valid(form) + return response def get_form_kwargs(self): pk = self.kwargs.get('pk') self.device = get_object_or_404(Device, pk=pk) - try: - self.object = self.device.physicalproperties - except Exception: - self.object = PhysicalProperties.objects.create(device=self.device) + self.success_url = reverse_lazy('device:details', args=[pk]) kwargs = super().get_form_kwargs() return kwargs - - def form_valid(self, form): - self.success_url = reverse_lazy('device:details', args=[self.device.id]) - response = super().form_valid(form) - return response - + + def get_success_url(self): + url = super().get_success_url() + import pdb; pdb.set_trace() + return url + diff --git a/example/snapshot1.json b/example/snapshot1.json new file mode 100644 index 0000000..bc49da5 --- /dev/null +++ b/example/snapshot1.json @@ -0,0 +1 @@ +{"type": "Snapshot", "components": [{"type": "SoundCard", "model": "Xeon E3-1200 V3/4th Gen Core Processor Hd Audio Controller", "manufacturer": "Intel Corporation"}, {"type": "SoundCard", "model": "Hp Hd Webcam", "manufacturer": "Chicony Electronics Co.,ltd.", "serialNumber": "200901010001"}, {"type": "SoundCard", "model": "8 Series/c220 Series Chipset High Definition Audio Controller", "manufacturer": "Intel Corporation"}, {"type": "RamModule", "model": "M471b5273ch0-Yk0", "manufacturer": "Samsung", "serialNumber": "96C0FA89", "size": 4096, "speed": 1600, "interface": "DDR3", "format": "SODIMM"}, {"type": "Processor", "actions": [{"type": "BenchmarkProcessor", "elapsed": 0, "rate": 19951.48}, {"type": "BenchmarkProcessorSysbench", "elapsed": 15, "rate": 14.6652}], "model": "Intel Core I5-4200m Cpu @ 2.50ghz", "manufacturer": "Intel Corp.", "brand": "Core i5", "generation": 4, "speed": 2.524414, "cores": 2, "threads": 4, "address": 64}, {"type": "NetworkAdapter", "model": "Ethernet Connection I217-V", "manufacturer": "Intel Corporation", "serialNumber": "FC:15:B4:E7:5D:D7", "variant": "04", "speed": 1000, "wireless": false}, {"type": "NetworkAdapter", "model": "Bcm43228 802.11a/b/g/n", "manufacturer": "Broadcom Inc. and Subsidiaries", "variant": "00", "wireless": false}, {"type": "SolidStateDrive", "actions": [{"type": "BenchmarkDataStorage", "elapsed": 2, "readSpeed": 487, "writeSpeed": 179}], "model": "Emtec X150 120gb", "serialNumber": "LDS645R002202", "variant": "5.0", "size": 120034.123776, "interface": "ATA"}, {"type": "Display", "model": "Lcd Monitor", "manufacturer": "Auo", "productionDate": "2012-01-01T00:00:00", "size": 15.529237982414482, "technology": "LCD", "resolutionWidth": 1366, "resolutionHeight": 768, "refreshRate": 60}, {"type": "GraphicCard", "model": "4th Gen Core Processor Integrated Graphics Controller", "manufacturer": "Intel Corporation"}, {"type": "Motherboard", "model": "1993", "manufacturer": "Hewlett-Packard", "serialNumber": "PEBJK001X5ZI3Z", "version": "L77 Ver. 01.05", "slots": 2, "usb": 3, "firewire": 0, "serial": 1, "pcmcia": 0, "biosDate": "2014-04-28T22:00:00.000Z", "ramSlots": 2, "ramMaxSize": 16}], "device": {"type": "Laptop", "actions": [{"type": "BenchmarkRamSysbench", "elapsed": 1, "rate": 0.731}], "model": "Hp Probook 650 G1", "manufacturer": "Hewlett-Packard", "serialNumber": "CNU406CLGR", "version": "A3009DD10303", "sku": "H5G75EA#ABE", "chassis": "Netbook"}, "closed": true, "endTime": "2022-06-09T12:10:50.809Z", "uuid": "7928afeb-e6a4-464a-a842-0c3de0d01677", "software": "Workbench", "version": "12.0b0", "elapsed": 34} diff --git a/lot/migrations/0001_initial.py b/lot/migrations/0001_initial.py index 35ca297..cb398b2 100644 --- a/lot/migrations/0001_initial.py +++ b/lot/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.6 on 2024-07-08 13:55 +# Generated by Django 5.0.6 on 2024-07-17 14:57 import django.db.models.deletion from django.conf import settings @@ -10,11 +10,33 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("device", "0003_remove_component_type_remove_computer_type_and_more"), + ("device", "0001_initial"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ + migrations.CreateModel( + name="LotTag", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=64)), + ( + "owner", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + ), + ), + ], + ), migrations.CreateModel( name="Lot", fields=[ @@ -29,18 +51,6 @@ class Migration(migrations.Migration): ), ("created", models.DateTimeField(auto_now_add=True)), ("updated", models.DateTimeField(auto_now=True)), - ( - "type", - models.CharField( - choices=[ - ("Incoming", "Incoming"), - ("Outgoing", "Outgoing"), - ("Temporal", "Temporal"), - ], - default="Temporal", - max_length=32, - ), - ), ("name", models.CharField(blank=True, max_length=64, null=True)), ("code", models.CharField(blank=True, max_length=64, null=True)), ("description", models.CharField(blank=True, max_length=64, null=True)), @@ -53,6 +63,12 @@ class Migration(migrations.Migration): to=settings.AUTH_USER_MODEL, ), ), + ( + "type", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="lot.lottag" + ), + ), ], ), ] diff --git a/lot/models.py b/lot/models.py index 860bdbf..fb34778 100644 --- a/lot/models.py +++ b/lot/models.py @@ -1,41 +1,31 @@ from django.db import models from django.utils.translation import gettext_lazy as _ -from utils.constants import STR_SM_SIZE, STR_SIZE +from utils.constants import ( + STR_SM_SIZE, + STR_SIZE, + STR_EXTEND_SIZE, +) from user.models import User from device.models import Device +from snapshot.models import Annotation + + +class LotTag(models.Model): + name = models.CharField(max_length=STR_SIZE, blank=False, null=False) + owner = models.ForeignKey(User, on_delete=models.CASCADE) + + def __str__(self): + return self.name class Lot(models.Model): - class Types(models.TextChoices): - INCOMING = "Incoming" - OUTGOING = "Outgoing" - TEMPORAL = "Temporal" - created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) - type = models.CharField(max_length=STR_SM_SIZE, choices=Types, default=Types.TEMPORAL) name = models.CharField(max_length=STR_SIZE, blank=True, null=True) code = models.CharField(max_length=STR_SIZE, blank=True, null=True) description = models.CharField(max_length=STR_SIZE, blank=True, null=True) closed = models.BooleanField(default=True) owner = models.ForeignKey(User, on_delete=models.CASCADE) + type = models.ForeignKey(LotTag, on_delete=models.CASCADE) devices = models.ManyToManyField(Device) - - @property - def is_incoming(self): - if self.type == self.Types.INCOMING: - return True - return False - - @property - def is_outgoing(self): - if self.type == self.Types.OUTGOING: - return True - return False - - @property - def is_temporal(self): - if self.type == self.Types.TEMPORAL: - return True - return False diff --git a/lot/templates/list_lots.html b/lot/templates/list_lots.html index 126e7bb..d11fb3c 100644 --- a/lot/templates/list_lots.html +++ b/lot/templates/list_lots.html @@ -11,50 +11,21 @@
    {% csrf_token %} -{% if incoming %} +{% for tag in lot_tags %}
    -
    Incoming Lots
    +
    {{ tag }}
    {% for lot in lots %} -{% if lot.is_incoming %} +{% if lot.type == tag %}
    {{ lot.name }}
    {% endif %} {% endfor %} -{% endif %} - -{% if outgoing %} -
    -
    Outgoing Lots
    -
    - -{% for lot in lots %} -{% if lot.is_outgoing %} -
    -
    -
    {{ lot.name }}
    -
    -{% endif %} {% endfor %} -{% endif %} -{% if temporal %} -
    -
    Temporary Lots
    -
    - -{% for lot in lots %} -{% if lot.is_temporal %} -
    -
    -
    {{ lot.name }}
    -
    -{% endif %} -{% endfor %} -{% endif %}
    diff --git a/lot/urls.py b/lot/urls.py index 25f89ef..691e592 100644 --- a/lot/urls.py +++ b/lot/urls.py @@ -9,7 +9,5 @@ urlpatterns = [ path("edit//", views.EditLotView.as_view(), name="edit"), path("add/devices/", views.AddToLotView.as_view(), name="add_devices"), path("del/devices/", views.DelToLotView.as_view(), name="del_devices"), - path("temporal/", views.LotsTemporalView.as_view(), name="lots_temporal"), - path("outgoing/", views.LotsOutgoingView.as_view(), name="lots_outgoing"), - path("incoming/", views.LotsIncomingView.as_view(), name="lots_incoming"), + path("tag//", views.LotsTagsView.as_view(), name="tag"), ] diff --git a/lot/views.py b/lot/views.py index 59c46f2..44d7266 100644 --- a/lot/views.py +++ b/lot/views.py @@ -9,7 +9,7 @@ from django.views.generic.edit import ( FormView ) from dashboard.mixins import DashboardView -from lot.models import Lot +from lot.models import Lot, LotTag from lot.forms import LotsForm @@ -84,20 +84,15 @@ class AddToLotView(DashboardView, FormView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) lots = Lot.objects.filter(owner=self.request.user) - lots_incoming = lots.filter(type=Lot.Types.INCOMING).exists() - lots_outgoing = lots.filter(type=Lot.Types.OUTGOING).exists() - lots_temporal = lots.filter(type=Lot.Types.TEMPORAL).exists() + lot_tags = LotTag.objects.filter(owner=self.request.user) context.update({ 'lots': lots, - 'incoming': lots_incoming, - 'outgoing': lots_outgoing, - 'temporal': lots_temporal + 'lot_tags':lot_tags, }) return context def get_form(self): form = super().get_form() - # import pdb; pdb.set_trace() form.fields["lots"].queryset = Lot.objects.filter(owner=self.request.user) return form @@ -119,28 +114,23 @@ class DelToLotView(AddToLotView): return response -class LotsTemporalView(DashboardView, TemplateView): +class LotsTagsView(DashboardView, TemplateView): template_name = "lots.html" - title = _("Temporal lots") - breadcrumb = "lot / temporal lots" + title = _("lots") + breadcrumb = _("lots") + " /" success_url = reverse_lazy('dashboard:unassigned_devices') - lot_type = Lot.Types.TEMPORAL def get_context_data(self, **kwargs): + self.pk = kwargs.get('pk') context = super().get_context_data(**kwargs) - lots = Lot.objects.filter(owner=self.request.user) + tag = get_object_or_404(LotTag, owner=self.request.user, id=self.pk) + self.title += " {}".format(tag.name) + self.breadcrumb += " {}".format(tag.name) + lots = Lot.objects.filter(owner=self.request.user).filter(type=tag) context.update({ - 'lots': lots.filter(type=self.lot_type), + 'lots': lots, + 'title': self.title, + 'breadcrumb': self.breadcrumb }) return context -class LotsOutgoingView(LotsTemporalView): - title = _("Outgoing lots") - breadcrumb = "lot / outging lots" - lot_type = Lot.Types.OUTGOING - - -class LotsIncomingView(LotsTemporalView): - title = _("Incoming lots") - breadcrumb = "lot / Incoming lots" - lot_type = Lot.Types.INCOMING diff --git a/reset.sh b/reset.sh new file mode 100644 index 0000000..a3bd06b --- /dev/null +++ b/reset.sh @@ -0,0 +1,4 @@ +rm db/* +./manage.py migrate +./manage.py add_user user@example.org 1234 +./manage.py up_snapshots example/ user@example.org diff --git a/snapshot/migrations/0001_initial.py b/snapshot/migrations/0001_initial.py index 8fce7e2..206cc8a 100644 --- a/snapshot/migrations/0001_initial.py +++ b/snapshot/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.6 on 2024-06-11 09:20 +# Generated by Django 5.0.6 on 2024-07-17 14:57 import django.db.models.deletion from django.conf import settings @@ -16,7 +16,7 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name="Snapshot", + name="Annotation", fields=[ ( "id", @@ -28,39 +28,17 @@ class Migration(migrations.Migration): ), ), ("created", models.DateTimeField(auto_now_add=True)), - ( - "software", - models.CharField( - choices=[("Workbench", "Workbench")], - default="Workbench", - max_length=32, - ), - ), ("uuid", models.UUIDField()), - ("version", models.CharField(max_length=32)), - ("sid", models.CharField(max_length=32)), - ("settings_version", models.CharField(max_length=32)), - ("is_server_erase", models.BooleanField(default=False)), ( - "severity", - models.SmallIntegerField( - choices=[ - (0, "Info"), - (1, "Notice"), - (2, "Warning"), - (3, "Error"), - ], - default=0, - ), + "type", + models.SmallIntegerField(choices=[(0, "System"), (1, "User")]), ), - ("start_time", models.DateTimeField()), - ("end_time", models.DateTimeField()), - ("components", models.ManyToManyField(to="device.component")), + ("key", models.CharField(max_length=256)), + ("value", models.CharField(max_length=256)), ( - "computer", + "device", models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to="device.computer", + on_delete=django.db.models.deletion.CASCADE, to="device.device" ), ), ( @@ -72,4 +50,10 @@ class Migration(migrations.Migration): ), ], ), + migrations.AddConstraint( + model_name="annotation", + constraint=models.UniqueConstraint( + fields=("type", "key", "uuid"), name="unique_type_key_uuid" + ), + ), ] diff --git a/snapshot/migrations/0002_alter_snapshot_uuid.py b/snapshot/migrations/0002_alter_snapshot_uuid.py deleted file mode 100644 index e833d88..0000000 --- a/snapshot/migrations/0002_alter_snapshot_uuid.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-11 14:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("snapshot", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="snapshot", - name="uuid", - field=models.UUIDField(unique=True), - ), - ] diff --git a/snapshot/migrations/0003_remove_snapshot_start_time.py b/snapshot/migrations/0003_remove_snapshot_start_time.py deleted file mode 100644 index cedcccc..0000000 --- a/snapshot/migrations/0003_remove_snapshot_start_time.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-11 14:18 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("snapshot", "0002_alter_snapshot_uuid"), - ] - - operations = [ - migrations.RemoveField( - model_name="snapshot", - name="start_time", - ), - ] diff --git a/snapshot/migrations/0004_anotation.py b/snapshot/migrations/0004_anotation.py deleted file mode 100644 index f2e6887..0000000 --- a/snapshot/migrations/0004_anotation.py +++ /dev/null @@ -1,41 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-15 09:20 - -import django.db.models.deletion -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("snapshot", "0003_remove_snapshot_start_time"), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name="anotation", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("created", models.DateTimeField(auto_now_add=True)), - ("uuid", models.UUIDField(unique=True)), - ("key", models.CharField(max_length=256)), - ("value", models.CharField(max_length=256)), - ( - "owner", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - ), - ), - ], - ), - ] diff --git a/snapshot/migrations/0005_annotation_delete_anotation.py b/snapshot/migrations/0005_annotation_delete_anotation.py deleted file mode 100644 index 10c2ded..0000000 --- a/snapshot/migrations/0005_annotation_delete_anotation.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-15 09:21 - -import django.db.models.deletion -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("snapshot", "0004_anotation"), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name="Annotation", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("created", models.DateTimeField(auto_now_add=True)), - ("uuid", models.UUIDField(unique=True)), - ("key", models.CharField(max_length=256)), - ("value", models.CharField(max_length=256)), - ( - "owner", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - ), - ), - ], - ), - migrations.DeleteModel( - name="anotation", - ), - ] diff --git a/snapshot/models.py b/snapshot/models.py index 868b25a..bb6e40e 100644 --- a/snapshot/models.py +++ b/snapshot/models.py @@ -1,39 +1,76 @@ +import json + from django.db import models + from utils.constants import STR_SM_SIZE, STR_EXTEND_SIZE +from snapshot.xapian import search from user.models import User -from device.models import Computer, Component - -# Create your models here. -class Snapshot(models.Model): - class SoftWare(models.TextChoices): - WORKBENCH= "Workbench" +class Snapshot: + def __init__(self, uuid): + self.uuid = uuid + self.owner = None + self.doc = None + self.created = None + self.annotations = [] - class Severity(models.IntegerChoices): - Info = 0, "Info" - Notice = 1, "Notice" - Warning = 2, "Warning" - Error = 3, "Error" + self.get_owner() + self.get_time() - created = models.DateTimeField(auto_now_add=True) - software = models.CharField(max_length=STR_SM_SIZE, choices=SoftWare, default=SoftWare.WORKBENCH) - uuid = models.UUIDField(unique=True) - version = models.CharField(max_length=STR_SM_SIZE) - sid = models.CharField(max_length=STR_SM_SIZE) - settings_version = models.CharField(max_length=STR_SM_SIZE) - is_server_erase = models.BooleanField(default=False) - severity = models.SmallIntegerField(choices=Severity, default=Severity.Info) - end_time = models.DateTimeField() - owner = models.ForeignKey(User, on_delete=models.CASCADE) - computer = models.ForeignKey(Computer, on_delete=models.CASCADE) - components = models.ManyToManyField(Component) + def get_annotations(self): + self.annotations = Annotation.objects.filter( + uuid=self.uuid + ).order_by("created") + + def get_owner(self): + if not self.annotations: + self.get_annotations() + a = self.annotations.first() + if a: + self.owner = a.owner + + def get_doc(self): + self.doc = {} + qry = 'uuid:"{}"'.format(self.uuid) + matches = search(qry, limit=1) + if matches.size() < 0: + return + + for xa in matches: + self.doc = json.loads(xa.document.get_data()) + + def get_time(self): + if not self.doc: + self.get_doc() + self.created = self.doc.get("endTime") + + if not self.created: + self.created = self.annotations.last().created + + def components(self): + return self.doc.get('components', []) class Annotation(models.Model): + class Type(models.IntegerChoices): + SYSTEM= 0, "System" + USER = 1, "User" + created = models.DateTimeField(auto_now_add=True) - uuid = models.UUIDField(unique=True) + uuid = models.UUIDField() owner = models.ForeignKey(User, on_delete=models.CASCADE) + type = models.SmallIntegerField(choices=Type) key = models.CharField(max_length=STR_EXTEND_SIZE) value = models.CharField(max_length=STR_EXTEND_SIZE) + device = models.ForeignKey('device.Device', on_delete=models.CASCADE) + class Meta: + constraints = [ + models.UniqueConstraint(fields=["type", "key", "uuid"], name="unique_type_key_uuid") + ] + + def is_user_annotation(self): + if self.type == self.Type.USER: + return True + return False diff --git a/snapshot/parse.py b/snapshot/parse.py index f6ce559..ea7e0a5 100644 --- a/snapshot/parse.py +++ b/snapshot/parse.py @@ -5,42 +5,25 @@ import xapian import hashlib from datetime import datetime +from snapshot.xapian import search, index from snapshot.models import Snapshot, Annotation -from snapshot.xapian import search, indexer, database - - -HID_ALGO1 = [ - "manufacturer", - "model", - "chassis", - "serialNumber", - "sku" -] +from device.models import Device +from utils.constants import ALGOS class Build: def __init__(self, snapshot_json, user): self.json = snapshot_json + self.uuid = self.json['uuid'] self.user = user self.hid = None self.index() - self.create_annotation() + self.create_annotations() def index(self): - matches = search(self.json['uuid'], limit=1) - if matches.size() > 0: - return - snap = json.dumps(self.json) - doc = xapian.Document() - doc.set_data(snap) - - indexer.set_document(doc) - indexer.index_text(snap) - - # Add the document to the database. - database.add_document(doc) + index(self.uuid, snap) def get_hid_14(self): device = self.json['device'] @@ -52,15 +35,35 @@ class Build: hid = f"{manufacturer}{model}{chassis}{serial_number}{sku}" return hashlib.sha3_256(hid.encode()).hexdigest() - def create_annotation(self): - uuid = self.json['uuid'] - owner = self.user - key = 'hidalgo1' - value = self.get_hid_14() - Annotation.objects.create( - uuid=uuid, - owner=owner, - key=key, - value=value - ) + def create_annotations(self): + algorithms = { + 'hidalgo1': self.get_hid_14(), + } + + annotation = Annotation.objects.filter( + owner=self.user, + type=Annotation.Type.SYSTEM, + key='hidalgo1', + value = algorithms['hidalgo1'] + ).first() + + if annotation: + device = annotation.device + else: + device = Device.objects.create( + type=self.json["device"]["type"], + manufacturer=self.json["device"]["manufacturer"], + model=self.json["device"]["model"], + owner=self.user + ) + + for k, v in algorithms.items(): + Annotation.objects.create( + uuid=self.uuid, + owner=self.user, + device=device, + type=Annotation.Type.SYSTEM, + key=k, + value=v + ) diff --git a/snapshot/views.py b/snapshot/views.py index 0b143a9..b49615c 100644 --- a/snapshot/views.py +++ b/snapshot/views.py @@ -2,9 +2,13 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic.base import TemplateView from django.views.generic.edit import FormView from django.urls import reverse_lazy +from django.views.generic.edit import ( + CreateView, + UpdateView, +) from dashboard.mixins import DashboardView -from snapshot.models import Snapshot +from snapshot.models import Snapshot, Annotation # from snapshot.forms import UploadForm # from django.shortcuts import render # from rest_framework import viewsets @@ -24,7 +28,8 @@ class ListSnapshotsView(DashboardView, TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - snapshots = Snapshot.objects.filter(owner=self.request.user) + # snapshots = Snapshot.objects.filter(owner=self.request.user) + snapshots = [] context.update({ 'snapshots': snapshots, }) diff --git a/snapshot/xapian.py b/snapshot/xapian.py index 8ed6261..222afe3 100644 --- a/snapshot/xapian.py +++ b/snapshot/xapian.py @@ -1,22 +1,51 @@ import xapian -database = xapian.WritableDatabase("db", xapian.DB_CREATE_OR_OPEN) +# database = xapian.WritableDatabase("db", xapian.DB_CREATE_OR_OPEN) -indexer = xapian.TermGenerator() -stemmer = xapian.Stem("english") -indexer.set_stemmer(stemmer) +# Read Only +# database = xapian.Database("db") + +# indexer = xapian.TermGenerator() +# stemmer = xapian.Stem("english") +# indexer.set_stemmer(stemmer) def search(qs, offset=0, limit=10): - query_string = str.join(' ', qs) + database = xapian.Database("db") qp = xapian.QueryParser() - qp.set_stemmer(stemmer) qp.set_database(database) + qp.set_stemmer(xapian.Stem("english")) qp.set_stemming_strategy(xapian.QueryParser.STEM_SOME) - query = qp.parse_query(query_string) + qp.add_prefix("uuid", "uuid") + # qp.add_prefix("snapshot", "snapshot") + query = qp.parse_query(qs) enquire = xapian.Enquire(database) enquire.set_query(query) matches = enquire.get_mset(offset, limit) return matches + +def index(uuid, snap): + uuid = 'uuid:"{}"'.format(uuid) + try: + matches = search(uuid, limit=1) + if matches.size() > 0: + return + except xapian.DatabaseNotFoundError: + pass + + database = xapian.WritableDatabase("db", xapian.DB_CREATE_OR_OPEN) + indexer = xapian.TermGenerator() + stemmer = xapian.Stem("english") + indexer.set_stemmer(stemmer) + + doc = xapian.Document() + doc.set_data(snap) + + indexer.set_document(doc) + indexer.index_text(snap) + indexer.index_text(uuid, 10, "uuid") + # indexer.index_text(snap, 1, "snapshot") + + database.add_document(doc) diff --git a/user/management/commands/add_user.py b/user/management/commands/add_user.py index 5e3222c..d9bb0a4 100644 --- a/user/management/commands/add_user.py +++ b/user/management/commands/add_user.py @@ -1,5 +1,6 @@ from django.core.management.base import BaseCommand from django.contrib.auth import get_user_model +from lot.models import LotTag User = get_user_model() @@ -16,8 +17,21 @@ class Command(BaseCommand): email = kwargs['email'] password = kwargs['password'] self.create_user(email, password) + self.create_lot_tags() def create_user(self, email, password): - u = User.objects.create(email=email, password=password) - u.set_password(password) - u.save() + self.u = User.objects.create(email=email, password=password) + self.u.set_password(password) + self.u.save() + + def create_lot_tags(self): + tags = [ + "Entrada", + "Salida", + "Temporal" + ] + for tag in tags: + LotTag.objects.create( + name=tag, + owner=self.u + ) diff --git a/user/migrations/0001_initial.py b/user/migrations/0001_initial.py index aa08fe8..7faf363 100644 --- a/user/migrations/0001_initial.py +++ b/user/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.6 on 2024-06-11 09:19 +# Generated by Django 5.0.6 on 2024-07-17 14:57 from django.db import migrations, models diff --git a/utils/constants.py b/utils/constants.py index 210b1c2..2fd9a13 100644 --- a/utils/constants.py +++ b/utils/constants.py @@ -6,3 +6,17 @@ STR_SM_SIZE = 32 STR_SIZE = 64 STR_BIG_SIZE = 128 STR_EXTEND_SIZE = 256 + + +# Algorithms for build hids +HID_ALGO1 = [ + "manufacturer", + "model", + "chassis", + "serialNumber", + "sku" +] + +ALGOS = { + "hidalgo1": HID_ALGO1, +} -- 2.30.2 From 0cffa5a9513c2f8a6fc09f80219b99ad496f27ca Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 19 Jul 2024 17:40:01 +0200 Subject: [PATCH 05/26] new structure --- dashboard/mixins.py | 8 +- dashboard/templates/base.html | 5 -- dashboard/urls.py | 1 - dashboard/views.py | 29 ++----- device/forms.py | 14 ++++ device/migrations/0004_delete_device.py | 18 ++++ device/models.py | 83 ++++++++++++++----- device/templates/details.html | 43 ++-------- device/templates/new_device.html | 25 +++++- device/urls.py | 6 +- device/views.py | 49 +++++++++-- lot/forms.py | 5 +- .../0002_remove_lot_devices_devicelot.py | 39 +++++++++ lot/models.py | 18 +++- lot/views.py | 2 +- .../0002_remove_annotation_device.py | 17 ++++ snapshot/models.py | 1 - snapshot/parse.py | 12 --- snapshot/views.py | 2 +- 19 files changed, 262 insertions(+), 115 deletions(-) create mode 100644 device/migrations/0004_delete_device.py create mode 100644 lot/migrations/0002_remove_lot_devices_devicelot.py create mode 100644 snapshot/migrations/0002_remove_annotation_device.py diff --git a/dashboard/mixins.py b/dashboard/mixins.py index bd93513..470bf0d 100644 --- a/dashboard/mixins.py +++ b/dashboard/mixins.py @@ -5,6 +5,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 snapshot.models import Annotation from lot.models import LotTag @@ -45,7 +46,10 @@ class DashboardView(LoginRequiredMixin): def get_session_devices(self): # import pdb; pdb.set_trace() dev_ids = self.request.session.pop("devices", []) - self._devices = Device.objects.filter(id__in=dev_ids).filter(owner=self.request.user) + + self._devices = [] + for x in Annotation.objects.filter(value__in=dev_ids).filter(owner=self.request.user).distinct(): + self._devices.append(Device(id=x.value)) return self._devices @@ -53,7 +57,7 @@ class DetailsMixin(DashboardView, TemplateView): def get(self, request, *args, **kwargs): self.pk = kwargs['pk'] - self.object = get_object_or_404(self.model, pk=self.pk) + self.object = get_object_or_404(self.model, pk=self.pk, owner=self.request.user) return super().get(request, *args, **kwargs) def get_context_data(self, **kwargs): diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html index 296dd35..be20573 100644 --- a/dashboard/templates/base.html +++ b/dashboard/templates/base.html @@ -90,11 +90,6 @@ {% trans 'Unassigned devices' %}
    • -
  • - - {% trans 'All devices' %} - -
  • diff --git a/dashboard/urls.py b/dashboard/urls.py index 78aadfa..681b73e 100644 --- a/dashboard/urls.py +++ b/dashboard/urls.py @@ -5,6 +5,5 @@ app_name = 'dashboard' urlpatterns = [ path("", views.UnassignedDevicesView.as_view(), name="unassigned_devices"), - path("all/", views.AllDevicesView.as_view(), name="all_devices"), path("/", views.LotDashboardView.as_view(), name="lot"), ] diff --git a/dashboard/views.py b/dashboard/views.py index 96db513..030ed81 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -17,9 +17,7 @@ class UnassignedDevicesView(InventaryMixin): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - devices = Device.objects.filter( - owner=self.request.user - ).annotate(num_lots=Count('lot')).filter(num_lots=0) + devices = Device.get_unassigned(self.request.user) context.update({ 'devices': devices, @@ -28,32 +26,21 @@ class UnassignedDevicesView(InventaryMixin): return context -class AllDevicesView(InventaryMixin): - template_name = "unassigned_devices.html" - section = "All" - title = _("All Devices") - breadcrumb = "Devices / All Devices" - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - devices = Device.objects.filter(owner=self.request.user) - context.update({ - 'devices': devices, - }) - return context - - class LotDashboardView(InventaryMixin, DetailsMixin): template_name = "unassigned_devices.html" - section = "Unassigned" + section = "dashboard_lot" title = _("Lot Devices") - breadcrumb = "Devices / Lot Devices" + breadcrumb = "Lot / Devices" model = Lot def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - devices = self.object.devices.filter(owner=self.request.user) + devices = self.get_devices() context.update({ 'devices': devices, }) return context + + def get_devices(self): + chids = self.object.devicelot_set.all().values_list("device_id", flat=True).distinct() + return [Device(id=x) for x in chids] diff --git a/device/forms.py b/device/forms.py index 32d64dc..b74d29b 100644 --- a/device/forms.py +++ b/device/forms.py @@ -1,3 +1,17 @@ from django import forms +from snapshot.models import Annotation +class DeviceForm2(forms.ModelForm): + class Meta: + model = Annotation + fields = ['key', 'value'] + + +class DeviceForm(forms.Form): + name = forms.CharField() + value = forms.CharField() + + +DeviceFormSet = forms.formset_factory(form=DeviceForm, extra=1) + diff --git a/device/migrations/0004_delete_device.py b/device/migrations/0004_delete_device.py new file mode 100644 index 0000000..10cbd01 --- /dev/null +++ b/device/migrations/0004_delete_device.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0.6 on 2024-07-18 17:30 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("device", "0003_device_manufacturer"), + ("lot", "0002_remove_lot_devices_devicelot"), + ("snapshot", "0002_remove_annotation_device"), + ] + + operations = [ + migrations.DeleteModel( + name="Device", + ), + ] diff --git a/device/models.py b/device/models.py index 65a1e6b..f0ff3bc 100644 --- a/device/models.py +++ b/device/models.py @@ -3,9 +3,10 @@ from django.db import models from utils.constants import STR_SM_SIZE, STR_SIZE, STR_EXTEND_SIZE, ALGOS from snapshot.models import Annotation, Snapshot from user.models import User +from lot.models import DeviceLot -class Device(models.Model): +class Device: class Types(models.TextChoices): DESKTOP = "Desktop" LAPTOP = "Laptop" @@ -22,17 +23,18 @@ class Device(models.Model): BATTERY = "Battery" CAMERA = "Camera" - owner = models.ForeignKey(User, on_delete=models.CASCADE) - type = models.CharField(max_length=STR_SIZE, blank=True, null=True) - manufacturer = models.CharField(max_length=STR_EXTEND_SIZE, blank=True, null=True) - model = models.CharField(max_length=STR_EXTEND_SIZE, blank=True, null=True) - def __init__(self, *args, **kwargs): + # the id is the chid of the device + self.id = kwargs["id"] + self.pk = self.id + self.algorithm = None + self.owner = None self.annotations = [] self.hids = [] self.uuids = [] self.snapshots = [] - super().__init__(*args, **kwargs) + self.last_snapshot = None + self.get_last_snapshot() def initial(self): self.get_annotations() @@ -41,21 +43,29 @@ class Device(models.Model): self.get_snapshots() def get_annotations(self): + if self.annotations: + return self.annotations + self.annotations = Annotation.objects.filter( - device=self, - owner=self.owner + type=Annotation.Type.SYSTEM, + value=self.id ).order_by("-created") + + if self.annotations.count(): + self.algorithm = self.annotations[0].key + self.owner = self.annotations[0].owner + + return self.annotations def get_uuids(self): - for a in self.annotations: + for a in self.get_annotations(): if not a.uuid in self.uuids: self.uuids.append(a.uuid) def get_hids(self): - if not self.annotations: - self.get_annotations() + annotations = self.get_annotations() - self.hids = self.annotations.filter( + self.hids = annotations.filter( type=Annotation.Type.SYSTEM, key__in=ALGOS.keys(), ).values_list("value", flat=True) @@ -67,14 +77,47 @@ class Device(models.Model): self.snapshots = [Snapshot(u) for u in self.uuids] def get_last_snapshot(self): - if not self.snapshots: - self.get_snapshots() + annotations = self.get_annotations() + if annotations: + annotation = annotations.first() + self.last_snapshot = Snapshot(annotation.uuid) - if self.snapshots: - return self.snapshots[0] + def last_uuid(self): + return self.uuids[0] @classmethod def get_unassigned(cls, user): - return cls.objects.filter( - owner=user - ).annotate(num_lots=models.Count('lot')).filter(num_lots=0) + chids = DeviceLot.objects.filter(lot__owner=user).values_list("device_id", flat=True).distinct() + annotations = Annotation.objects.filter( + owner=user, + type=Annotation.Type.SYSTEM, + ).exclude(value__in=chids).values_list("value", flat=True).distinct() + return [cls(id=x) for x in annotations] + + # return cls.objects.filter( + # owner=user + # ).annotate(num_lots=models.Count('lot')).filter(num_lots=0) + + @property + def manufacturer(self): + if not self.last_snapshot: + self.get_last_snapshot() + return self.last_snapshot.doc['device']['manufacturer'] + + @property + def type(self): + if not self.last_snapshot: + self.get_last_snapshot() + return self.last_snapshot.doc['device']['type'] + + @property + def model(self): + if not self.last_snapshot: + self.get_last_snapshot() + return self.last_snapshot.doc['device']['model'] + + @property + def type(self): + if not self.last_snapshot: + self.get_last_snapshot() + return self.last_snapshot.doc['device']['type'] diff --git a/device/templates/details.html b/device/templates/details.html index dd05dfd..1140dcb 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -26,9 +26,6 @@
    • -
  • - -
    • @@ -47,7 +44,6 @@ (Edit Device)
    - {% if object.hid %}Snapshot{% else %}Placeholder{% endif %}
    @@ -56,29 +52,24 @@
    {{ object.id }}
    -
    -
    Id device internal
    -
    -
    -
    Type
    -
    {{ snapshot.doc.device.type }}
    +
    {{ object.type }}
    Manufacturer
    -
    {{ snapshot.doc.device.manufacturer|default:"" }}
    +
    {{ object.manufacturer|default:"" }}
    Model
    -
    {{ snapshot.doc.device.model|default:"" }}
    +
    {{ object.model|default:"" }}
    Serial Number
    -
    {{ snapshot.doc.device.serialNumber|default:"" }}
    +
    {{ object.last_snapshot.doc.device.serialNumber|default:"" }}
    Identifiers
    @@ -132,7 +123,7 @@ {% for tag in lot_tags %}
    {{ tag }}
    - {% for lot in object.lot_set.filter %} + {% for lot in tag.lot_set.filter %} {% if lot.type == tag %}
    @@ -171,32 +162,10 @@
    -
    -
    Traceability log Details
    -
    - -
    - Snapshot ✓ - 14:07 23-06-2024 -
    - -
    - EraseCrypto ✓ - 14:07 23-06-2024 -
    - -
    - EraseCrypto ✓ - 14:07 23-06-2024 -
    - -
    -
    -
    Components last snapshot
    - {% for c in snapshot.components %} + {% for c in object.last_snapshot.doc.components %}
    {{ c.type }}
    diff --git a/device/templates/new_device.html b/device/templates/new_device.html index 8f2df37..8907ef0 100644 --- a/device/templates/new_device.html +++ b/device/templates/new_device.html @@ -22,11 +22,34 @@
    {% endif %} -{% bootstrap_form form %} +{# bootstrap_form form #}
    {% translate "Cancel" %}
    + + + +
    + {% csrf_token %} +
    + {% for f in form %} +
    + {{ f.as_p }} +
    + {% endfor %} +
    + +
    {% endblock %} diff --git a/device/urls.py b/device/urls.py index 7fc0e96..3d0b368 100644 --- a/device/urls.py +++ b/device/urls.py @@ -5,7 +5,7 @@ app_name = 'device' 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("edit//", views.EditDeviceView.as_view(), name="edit"), + path("/", views.DetailsView.as_view(), name="details"), + path("/annotation/add", views.AddAnnotationView.as_view(), name="add_annotation"), ] diff --git a/device/views.py b/device/views.py index 00255dd..012c878 100644 --- a/device/views.py +++ b/device/views.py @@ -6,21 +6,23 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic.edit import ( CreateView, UpdateView, + FormView, ) from django.views.generic.base import TemplateView -from dashboard.mixins import DashboardView, DetailsMixin +from dashboard.mixins import DashboardView from snapshot.models import Annotation from snapshot.xapian import search from lot.models import LotTag from device.models import Device +from device.forms import DeviceFormSet -class NewDeviceView(DashboardView, CreateView): +class NewDeviceView(DashboardView, FormView): template_name = "new_device.html" title = _("New Device") breadcrumb = "Device / New Device" success_url = reverse_lazy('dashboard:unassigned_devices') - model = Device + form_class = DeviceFormSet def form_valid(self, form): form.instance.owner = self.request.user @@ -28,12 +30,41 @@ class NewDeviceView(DashboardView, CreateView): return response +# class AddToLotView(DashboardView, FormView): +# template_name = "list_lots.html" +# title = _("Add to lots") +# breadcrumb = "lot / add to lots" +# success_url = reverse_lazy('dashboard:unassigned_devices') +# form_class = LotsForm + +# def get_context_data(self, **kwargs): +# context = super().get_context_data(**kwargs) +# lots = Lot.objects.filter(owner=self.request.user) +# lot_tags = LotTag.objects.filter(owner=self.request.user) +# context.update({ +# 'lots': lots, +# 'lot_tags':lot_tags, +# }) +# return context + +# def get_form(self): +# form = super().get_form() +# form.fields["lots"].queryset = Lot.objects.filter(owner=self.request.user) +# return form + +# def form_valid(self, form): +# form.devices = self.get_session_devices() +# form.save() +# response = super().form_valid(form) +# return response + + class EditDeviceView(DashboardView, UpdateView): template_name = "new_device.html" title = _("Update Device") breadcrumb = "Device / Update Device" success_url = reverse_lazy('dashboard:unassigned_devices') - model = Device + model = Annotation def get_form_kwargs(self): pk = self.kwargs.get('pk') @@ -43,17 +74,23 @@ class EditDeviceView(DashboardView, UpdateView): return kwargs -class DetailsView(DetailsMixin): +class DetailsView(DashboardView, TemplateView): template_name = "details.html" title = _("Device") breadcrumb = "Device / Details" - model = Device + model = Annotation + + def get(self, request, *args, **kwargs): + self.pk = kwargs['pk'] + self.object = Device(id=self.pk) + return super().get(request, *args, **kwargs) def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) self.object.initial() lot_tags = LotTag.objects.filter(owner=self.request.user) context.update({ + 'object': self.object, 'snapshot': self.object.get_last_snapshot(), 'lot_tags': lot_tags, }) diff --git a/lot/forms.py b/lot/forms.py index 0065960..7b809fd 100644 --- a/lot/forms.py +++ b/lot/forms.py @@ -15,13 +15,14 @@ class LotsForm(forms.Form): def save(self, commit=True): if not commit: return + for dev in self.devices: for lot in self._lots: - lot.devices.add(dev.id) + lot.add(dev.id) return def remove(self): for dev in self.devices: for lot in self._lots: - lot.devices.remove(dev.id) + lot.remove(dev.id) return diff --git a/lot/migrations/0002_remove_lot_devices_devicelot.py b/lot/migrations/0002_remove_lot_devices_devicelot.py new file mode 100644 index 0000000..8496dea --- /dev/null +++ b/lot/migrations/0002_remove_lot_devices_devicelot.py @@ -0,0 +1,39 @@ +# Generated by Django 5.0.6 on 2024-07-18 17:30 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("lot", "0001_initial"), + ] + + operations = [ + migrations.RemoveField( + model_name="lot", + name="devices", + ), + migrations.CreateModel( + name="DeviceLot", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("device_id", models.CharField(max_length=256)), + ( + "lot", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="lot.lot" + ), + ), + ], + ), + ] diff --git a/lot/models.py b/lot/models.py index fb34778..9237a27 100644 --- a/lot/models.py +++ b/lot/models.py @@ -7,7 +7,7 @@ from utils.constants import ( ) from user.models import User -from device.models import Device +# from device.models import Device from snapshot.models import Annotation @@ -19,6 +19,11 @@ class LotTag(models.Model): return self.name +class DeviceLot(models.Model): + lot = models.ForeignKey("Lot", on_delete=models.CASCADE) + device_id = models.CharField(max_length=STR_EXTEND_SIZE, blank=False, null=False) + + class Lot(models.Model): created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) @@ -28,4 +33,13 @@ class Lot(models.Model): closed = models.BooleanField(default=True) owner = models.ForeignKey(User, on_delete=models.CASCADE) type = models.ForeignKey(LotTag, on_delete=models.CASCADE) - devices = models.ManyToManyField(Device) + + def add(self, v): + if DeviceLot.objects.filter(lot=self, device_id=v).exists(): + return + DeviceLot.objects.create(lot=self, device_id=v) + + def remove(self, v): + for d in DeviceLot.objects.filter(lot=self, device_id=v): + d.delete() + diff --git a/lot/views.py b/lot/views.py index 44d7266..9549076 100644 --- a/lot/views.py +++ b/lot/views.py @@ -6,7 +6,7 @@ from django.views.generic.edit import ( CreateView, DeleteView, UpdateView, - FormView + FormView, ) from dashboard.mixins import DashboardView from lot.models import Lot, LotTag diff --git a/snapshot/migrations/0002_remove_annotation_device.py b/snapshot/migrations/0002_remove_annotation_device.py new file mode 100644 index 0000000..326eca2 --- /dev/null +++ b/snapshot/migrations/0002_remove_annotation_device.py @@ -0,0 +1,17 @@ +# Generated by Django 5.0.6 on 2024-07-18 17:30 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("snapshot", "0001_initial"), + ] + + operations = [ + migrations.RemoveField( + model_name="annotation", + name="device", + ), + ] diff --git a/snapshot/models.py b/snapshot/models.py index bb6e40e..7c1a942 100644 --- a/snapshot/models.py +++ b/snapshot/models.py @@ -63,7 +63,6 @@ class Annotation(models.Model): type = models.SmallIntegerField(choices=Type) key = models.CharField(max_length=STR_EXTEND_SIZE) value = models.CharField(max_length=STR_EXTEND_SIZE) - device = models.ForeignKey('device.Device', on_delete=models.CASCADE) class Meta: constraints = [ diff --git a/snapshot/parse.py b/snapshot/parse.py index ea7e0a5..8137a86 100644 --- a/snapshot/parse.py +++ b/snapshot/parse.py @@ -7,7 +7,6 @@ import hashlib from datetime import datetime from snapshot.xapian import search, index from snapshot.models import Snapshot, Annotation -from device.models import Device from utils.constants import ALGOS @@ -47,21 +46,10 @@ class Build: value = algorithms['hidalgo1'] ).first() - if annotation: - device = annotation.device - else: - device = Device.objects.create( - type=self.json["device"]["type"], - manufacturer=self.json["device"]["manufacturer"], - model=self.json["device"]["model"], - owner=self.user - ) - for k, v in algorithms.items(): Annotation.objects.create( uuid=self.uuid, owner=self.user, - device=device, type=Annotation.Type.SYSTEM, key=k, value=v diff --git a/snapshot/views.py b/snapshot/views.py index b49615c..6a7f98b 100644 --- a/snapshot/views.py +++ b/snapshot/views.py @@ -1,10 +1,10 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic.base import TemplateView -from django.views.generic.edit import FormView from django.urls import reverse_lazy from django.views.generic.edit import ( CreateView, UpdateView, + FormView, ) from dashboard.mixins import DashboardView -- 2.30.2 From 45ebb6f169c75b213c75b59d6afe0e5732dc3fef Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 22 Jul 2024 13:48:10 +0200 Subject: [PATCH 06/26] managment formset for new device --- device/templates/new_device.html | 76 ++++++++++++++++++-------------- device/views.py | 11 ++++- 2 files changed, 52 insertions(+), 35 deletions(-) diff --git a/device/templates/new_device.html b/device/templates/new_device.html index 8907ef0..870bf79 100644 --- a/device/templates/new_device.html +++ b/device/templates/new_device.html @@ -8,48 +8,58 @@
    -{% load django_bootstrap5 %} -
    -{% csrf_token %} -{% if form.errors %} - -{% endif %} -{# bootstrap_form form #} -
    - {% translate "Cancel" %} - -
    - -
    -
    - {% csrf_token %} -
    - {% for f in form %} -
    - {{ f.as_p }} -
    - {% endfor %} +{% load django_bootstrap5 %} + + {% csrf_token %} + {% if form.errors %} + + {% endif %} + {{ form.management_form }} +
    +
    +
    +
    + + + {% trans 'Add' %} + +
    +
    + {% for f in form %} +
    +
    + {% bootstrap_field f.name %} +
    +
    + {% bootstrap_field f.value %} +
    +
    + {% endfor %} +
    +
    + {% translate "Cancel" %} + +
    + + {% endblock %} diff --git a/device/views.py b/device/views.py index 012c878..1a1f4a8 100644 --- a/device/views.py +++ b/device/views.py @@ -21,14 +21,21 @@ class NewDeviceView(DashboardView, FormView): template_name = "new_device.html" title = _("New Device") breadcrumb = "Device / New Device" - success_url = reverse_lazy('dashboard:unassigned_devices') + success_url = reverse_lazy('device:add') + # success_url = reverse_lazy('dashboard:unassigned_devices') form_class = DeviceFormSet def form_valid(self, form): - form.instance.owner = self.request.user + # import pdb; pdb.set_trace() + # form.instance.owner = self.request.user response = super().form_valid(form) return response + def form_invalid(self, form): + import pdb; pdb.set_trace() + response = super().form_invalid(form) + return response + # class AddToLotView(DashboardView, FormView): # template_name = "list_lots.html" -- 2.30.2 From 70ded1085220c24818f35b785363e5385ef4eb95 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 23 Jul 2024 15:37:40 +0200 Subject: [PATCH 07/26] save the device from web to index --- device/forms.py | 97 +++++++++++++++++++++++++++++--- device/templates/new_device.html | 24 +++++++- device/views.py | 5 +- snapshot/parse.py | 5 +- 4 files changed, 116 insertions(+), 15 deletions(-) diff --git a/device/forms.py b/device/forms.py index b74d29b..cf42dbc 100644 --- a/device/forms.py +++ b/device/forms.py @@ -1,17 +1,98 @@ +import json +import uuid +import hashlib +import datetime + from django import forms from snapshot.models import Annotation +from snapshot.xapian import search, index - -class DeviceForm2(forms.ModelForm): - class Meta: - model = Annotation - fields = ['key', 'value'] +DEVICE_TYPES = [ + ("Desktop", "Desktop"), + ("Laptop", "Laptop"), + ("Server", "Server"), + ("GraphicCard", "GraphicCard"), + ("HardDrive", "HardDrive"), + ("SolidStateDrive", "SolidStateDrive"), + ("Motherboard", "Motherboard"), + ("NetworkAdapter", "NetworkAdapter"), + ("Processor", "Processor"), + ("RamModule", "RamModule"), + ("SoundCard", "SoundCard"), + ("Display", "Display"), + ("Battery", "Battery"), + ("Camera", "Camera"), +] class DeviceForm(forms.Form): - name = forms.CharField() - value = forms.CharField() + type = forms.ChoiceField(choices = DEVICE_TYPES, required=False) + amount = forms.IntegerField(required=True, initial=1) + tag = forms.CharField(required=False) + name = forms.CharField(required=False) + value = forms.CharField(required=False) -DeviceFormSet = forms.formset_factory(form=DeviceForm, extra=1) +class BaseDeviceFormSet(forms.BaseFormSet): + def save(self, user, commit=True): + self.user = user + doc = {} + device = {} + kv = {} + self.uuid = str(uuid.uuid4()) + tag = hashlib.sha3_256(self.uuid.encode()).hexdigest() + for f in self.forms: + d = f.cleaned_data + if not d: + continue + if d.get("type"): + device["type"] = d["type"] + if d.get("amount"): + device["amount"] = d["amount"] + if d.get("name"): + kv[d["name"]] = d.get("value", '') + if d.get("tag"): + tag = d["tag"] + + if not device: + return + device["manufacturer"] = "" + device["model"] = tag + + doc["device"] = device + + if kv: + doc["kv"] = kv + + date = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S") + if doc: + doc["uuid"] = self.uuid + doc["endTime"] = date + doc["software"] = "DeviceHub" + doc["type"] = "WebSnapshot" + + + if not commit: + return doc + + self.index(doc) + self.create_annotations(tag) + return doc + + def index(self, doc): + snap = json.dumps(doc) + index(self.uuid, snap) + + def create_annotations(self, tag): + Annotation.objects.create( + uuid=self.uuid, + owner=self.user, + type=Annotation.Type.SYSTEM, + key='Web', + value=tag + ) + + + +DeviceFormSet = forms.formset_factory(form=DeviceForm, formset=BaseDeviceFormSet, extra=1) diff --git a/device/templates/new_device.html b/device/templates/new_device.html index 870bf79..0d6cf7c 100644 --- a/device/templates/new_device.html +++ b/device/templates/new_device.html @@ -12,8 +12,13 @@ function addForm(button) { var formCount = parseInt(document.getElementById('id_form-TOTAL_FORMS').value); var formCopy = $(document.querySelector('#id_form-0-name')).parent().parent().parent()[0].cloneNode(true); - // formCopy.style.display = 'block'; - formCopy.innerHTML = formCopy.innerHTML.replace(/__prefix__/g, formCount); + formCopy.querySelectorAll('input').forEach(function(input) { + var name = input.name.replace(/form-\d+/g, 'form-' + formCount); + var id = 'id_' + name; + input.name = name; + input.id = id; + input.value = ''; + }); document.getElementById('formset-container').appendChild(formCopy); document.getElementById('id_form-TOTAL_FORMS').value = formCount + 1; } @@ -44,6 +49,21 @@
    +
    +
    + {% bootstrap_field form.0.type %} +
    +
    +
    +
    + {% bootstrap_field form.0.amount %} +
    +
    +
    +
    + {% bootstrap_field form.0.tag %} +
    +
    {% for f in form %}
    diff --git a/device/views.py b/device/views.py index 1a1f4a8..68344b0 100644 --- a/device/views.py +++ b/device/views.py @@ -22,17 +22,14 @@ class NewDeviceView(DashboardView, FormView): title = _("New Device") breadcrumb = "Device / New Device" success_url = reverse_lazy('device:add') - # success_url = reverse_lazy('dashboard:unassigned_devices') form_class = DeviceFormSet def form_valid(self, form): - # import pdb; pdb.set_trace() - # form.instance.owner = self.request.user + form.save(self.request.user) response = super().form_valid(form) return response def form_invalid(self, form): - import pdb; pdb.set_trace() response = super().form_invalid(form) return response diff --git a/snapshot/parse.py b/snapshot/parse.py index 8137a86..ee0e8cc 100644 --- a/snapshot/parse.py +++ b/snapshot/parse.py @@ -1,7 +1,6 @@ import os import json import shutil -import xapian import hashlib from datetime import datetime @@ -39,6 +38,7 @@ class Build: 'hidalgo1': self.get_hid_14(), } + # TODO is neccesary? annotation = Annotation.objects.filter( owner=self.user, type=Annotation.Type.SYSTEM, @@ -47,6 +47,9 @@ class Build: ).first() for k, v in algorithms.items(): + if annotation and k == annotation.key: + continue + Annotation.objects.create( uuid=self.uuid, owner=self.user, -- 2.30.2 From 91780be94bdef1ca5fd63f8a8578593f2604f76c Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 26 Jul 2024 17:59:34 +0200 Subject: [PATCH 08/26] change snapshots for evidences --- dashboard/mixins.py | 2 +- dashboard/templates/base.html | 10 ++--- dashboard/templates/base_site.html | 6 +-- dashboard/views.py | 4 +- device/models.py | 42 +++++++++---------- device/templates/details.html | 16 +++---- dhub/settings.py | 2 +- {snapshot => evidence}/__init__.py | 0 {snapshot => evidence}/admin.py | 0 {snapshot => evidence}/apps.py | 2 +- {snapshot => evidence}/forms.py | 2 +- {snapshot => evidence}/management/__init__.py | 0 .../management/commands/__init__.py | 0 .../management/commands/up_snapshots.py | 0 .../migrations/0001_initial.py | 0 .../0002_remove_annotation_device.py | 0 {snapshot => evidence}/migrations/__init__.py | 0 {snapshot => evidence}/models.py | 4 +- {snapshot => evidence}/parse.py | 8 ++-- {snapshot => evidence}/serializers.py | 8 ++-- .../templates/evidences.html | 6 +-- {snapshot => evidence}/tests.py | 0 {snapshot => evidence}/urls.py | 6 +-- {snapshot => evidence}/views.py | 18 ++++---- {snapshot => evidence}/xapian.py | 0 lot/models.py | 2 +- 26 files changed, 69 insertions(+), 69 deletions(-) rename {snapshot => evidence}/__init__.py (100%) rename {snapshot => evidence}/admin.py (100%) rename {snapshot => evidence}/apps.py (84%) rename {snapshot => evidence}/forms.py (62%) rename {snapshot => evidence}/management/__init__.py (100%) rename {snapshot => evidence}/management/commands/__init__.py (100%) rename {snapshot => evidence}/management/commands/up_snapshots.py (100%) rename {snapshot => evidence}/migrations/0001_initial.py (100%) rename {snapshot => evidence}/migrations/0002_remove_annotation_device.py (100%) rename {snapshot => evidence}/migrations/__init__.py (100%) rename {snapshot => evidence}/models.py (97%) rename {snapshot => evidence}/parse.py (89%) rename {snapshot => evidence}/serializers.py (88%) rename snapshot/templates/snapshots.html => evidence/templates/evidences.html (83%) rename {snapshot => evidence}/tests.py (100%) rename {snapshot => evidence}/urls.py (74%) rename {snapshot => evidence}/views.py (74%) rename {snapshot => evidence}/xapian.py (100%) diff --git a/dashboard/mixins.py b/dashboard/mixins.py index 470bf0d..c28dcf8 100644 --- a/dashboard/mixins.py +++ b/dashboard/mixins.py @@ -5,7 +5,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 snapshot.models import Annotation +from evidence.models import Annotation from lot.models import LotTag diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html index be20573..c73e203 100644 --- a/dashboard/templates/base.html +++ b/dashboard/templates/base.html @@ -108,19 +108,19 @@
  • - -
      + diff --git a/dashboard/templates/base_site.html b/dashboard/templates/base_site.html index 796b73d..386c437 100644 --- a/dashboard/templates/base_site.html +++ b/dashboard/templates/base_site.html @@ -151,12 +151,12 @@ -
    • Snapshots
      • +
    • evidences
    • -
      • diff --git a/dashboard/views.py b/dashboard/views.py index 030ed81..bf8f8e2 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -4,8 +4,8 @@ from django.utils.translation import gettext_lazy as _ from django.db.models import Count from dashboard.mixins import InventaryMixin, DetailsMixin from device.models import Device -from snapshot.xapian import search -from snapshot.models import Annotation +from evidence.xapian import search +from evidence.models import Annotation from lot.models import Lot, LotTag diff --git a/device/models.py b/device/models.py index f0ff3bc..a29f8c4 100644 --- a/device/models.py +++ b/device/models.py @@ -1,7 +1,7 @@ from django.db import models from utils.constants import STR_SM_SIZE, STR_SIZE, STR_EXTEND_SIZE, ALGOS -from snapshot.models import Annotation, Snapshot +from evidence.models import Annotation, Evidence from user.models import User from lot.models import DeviceLot @@ -32,15 +32,15 @@ class Device: self.annotations = [] self.hids = [] self.uuids = [] - self.snapshots = [] - self.last_snapshot = None - self.get_last_snapshot() + self.evidences = [] + self.last_evidence = None + self.get_last_evidence() def initial(self): self.get_annotations() self.get_uuids() self.get_hids() - self.get_snapshots() + self.get_evidences() def get_annotations(self): if self.annotations: @@ -70,17 +70,17 @@ class Device: key__in=ALGOS.keys(), ).values_list("value", flat=True) - def get_snapshots(self): + def get_evidences(self): if not self.uuids: self.get_uuids() - self.snapshots = [Snapshot(u) for u in self.uuids] + self.evidences = [Evidence(u) for u in self.uuids] - def get_last_snapshot(self): + def get_last_evidence(self): annotations = self.get_annotations() if annotations: annotation = annotations.first() - self.last_snapshot = Snapshot(annotation.uuid) + self.last_evidence = Evidence(annotation.uuid) def last_uuid(self): return self.uuids[0] @@ -100,24 +100,24 @@ class Device: @property def manufacturer(self): - if not self.last_snapshot: - self.get_last_snapshot() - return self.last_snapshot.doc['device']['manufacturer'] + if not self.last_evidence: + self.get_last_evidence() + return self.last_evidence.doc['device']['manufacturer'] @property def type(self): - if not self.last_snapshot: - self.get_last_snapshot() - return self.last_snapshot.doc['device']['type'] + if not self.last_evidence: + self.get_last_evidence() + return self.last_evidence.doc['device']['type'] @property def model(self): - if not self.last_snapshot: - self.get_last_snapshot() - return self.last_snapshot.doc['device']['model'] + if not self.last_evidence: + self.get_last_evidence() + return self.last_evidence.doc['device']['model'] @property def type(self): - if not self.last_snapshot: - self.get_last_snapshot() - return self.last_snapshot.doc['device']['type'] + if not self.last_evidence: + self.get_last_evidence() + return self.last_evidence.doc['device']['type'] diff --git a/device/templates/details.html b/device/templates/details.html index 1140dcb..bba1ac9 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -27,7 +27,7 @@
    • - +
    • Web @@ -69,7 +69,7 @@
      Serial Number
      -
      {{ object.last_snapshot.doc.device.serialNumber|default:"" }}
      +
      {{ object.last_evidence.doc.device.serialNumber|default:"" }}
      Identifiers
      @@ -163,13 +163,13 @@
      -
      Components last snapshot
      +
      Components last evidence
      - {% for c in object.last_snapshot.doc.components %} + {% for c in object.last_evidence.doc.components %}
      {{ c.type }}
      - {{ snapshot.created }} + {{ evidence.created }}

      {{ c.manufacturer }}
      @@ -183,10 +183,10 @@

      -
      -
      List of snapshots
      +
      +
      List of evidences
      - {% for snap in object.snapshots %} + {% for snap in object.evidences %}
      diff --git a/dhub/settings.py b/dhub/settings.py index 6444f43..2baf522 100644 --- a/dhub/settings.py +++ b/dhub/settings.py @@ -47,7 +47,7 @@ INSTALLED_APPS = [ "login", "user", "device", - "snapshot", + "evidence", "action", "tag", "lot", diff --git a/snapshot/__init__.py b/evidence/__init__.py similarity index 100% rename from snapshot/__init__.py rename to evidence/__init__.py diff --git a/snapshot/admin.py b/evidence/admin.py similarity index 100% rename from snapshot/admin.py rename to evidence/admin.py diff --git a/snapshot/apps.py b/evidence/apps.py similarity index 84% rename from snapshot/apps.py rename to evidence/apps.py index 5e9983e..af09568 100644 --- a/snapshot/apps.py +++ b/evidence/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class ActionConfig(AppConfig): default_auto_field = "django.db.models.BigAutoField" - name = "snapshot" + name = "evidence" diff --git a/snapshot/forms.py b/evidence/forms.py similarity index 62% rename from snapshot/forms.py rename to evidence/forms.py index 063c115..99abdb4 100644 --- a/snapshot/forms.py +++ b/evidence/forms.py @@ -2,7 +2,7 @@ class UploadForm(forms.Form): - snapshot_file = forms.FileField(label=_("File")) + evidence_file = forms.FileField(label=_("File")) def clean(self): data = self.cleaned_data diff --git a/snapshot/management/__init__.py b/evidence/management/__init__.py similarity index 100% rename from snapshot/management/__init__.py rename to evidence/management/__init__.py diff --git a/snapshot/management/commands/__init__.py b/evidence/management/commands/__init__.py similarity index 100% rename from snapshot/management/commands/__init__.py rename to evidence/management/commands/__init__.py diff --git a/snapshot/management/commands/up_snapshots.py b/evidence/management/commands/up_snapshots.py similarity index 100% rename from snapshot/management/commands/up_snapshots.py rename to evidence/management/commands/up_snapshots.py diff --git a/snapshot/migrations/0001_initial.py b/evidence/migrations/0001_initial.py similarity index 100% rename from snapshot/migrations/0001_initial.py rename to evidence/migrations/0001_initial.py diff --git a/snapshot/migrations/0002_remove_annotation_device.py b/evidence/migrations/0002_remove_annotation_device.py similarity index 100% rename from snapshot/migrations/0002_remove_annotation_device.py rename to evidence/migrations/0002_remove_annotation_device.py diff --git a/snapshot/migrations/__init__.py b/evidence/migrations/__init__.py similarity index 100% rename from snapshot/migrations/__init__.py rename to evidence/migrations/__init__.py diff --git a/snapshot/models.py b/evidence/models.py similarity index 97% rename from snapshot/models.py rename to evidence/models.py index 7c1a942..576c172 100644 --- a/snapshot/models.py +++ b/evidence/models.py @@ -3,11 +3,11 @@ import json from django.db import models from utils.constants import STR_SM_SIZE, STR_EXTEND_SIZE -from snapshot.xapian import search +from evidence.xapian import search from user.models import User -class Snapshot: +class Evidence: def __init__(self, uuid): self.uuid = uuid self.owner = None diff --git a/snapshot/parse.py b/evidence/parse.py similarity index 89% rename from snapshot/parse.py rename to evidence/parse.py index ee0e8cc..f303b47 100644 --- a/snapshot/parse.py +++ b/evidence/parse.py @@ -4,14 +4,14 @@ import shutil import hashlib from datetime import datetime -from snapshot.xapian import search, index -from snapshot.models import Snapshot, Annotation +from evidence.xapian import search, index +from evidence.models import Evidence, Annotation from utils.constants import ALGOS class Build: - def __init__(self, snapshot_json, user): - self.json = snapshot_json + def __init__(self, evidence_json, user): + self.json = evidence_json self.uuid = self.json['uuid'] self.user = user self.hid = None diff --git a/snapshot/serializers.py b/evidence/serializers.py similarity index 88% rename from snapshot/serializers.py rename to evidence/serializers.py index ef2662c..c9524b6 100644 --- a/snapshot/serializers.py +++ b/evidence/serializers.py @@ -1,15 +1,15 @@ from rest_framework import serializers -from snapshot.models import SnapshotJson +from evidence.models import EvidenceJson import json from django.views.decorators.csrf import csrf_exempt from django.http import JsonResponse -from snapshot.parse import Parse +from evidence.parse import Parse -class SnapshotSerializer(serializers.ModelSerializer): +class EvidenceSerializer(serializers.ModelSerializer): class Meta: - model = SnapshotJson + model = EvidenceJson fields = ['id', 'title', 'content'] @csrf_exempt diff --git a/snapshot/templates/snapshots.html b/evidence/templates/evidences.html similarity index 83% rename from snapshot/templates/snapshots.html rename to evidence/templates/evidences.html index c1fdb39..3ce592d 100644 --- a/snapshot/templates/snapshots.html +++ b/evidence/templates/evidences.html @@ -19,14 +19,14 @@ - {% for snap in snapshots %} + {% for snap in evicendes %} - + - {{ snap.uuid }} {{ snap.sid }} {{ snap.version }} + {{ snap.uuid }} {{ snap.sid }} {{ snap.version }} {{ snap.computer.device.manufacturer }} {{ snap.computer.device.model }} diff --git a/snapshot/tests.py b/evidence/tests.py similarity index 100% rename from snapshot/tests.py rename to evidence/tests.py diff --git a/snapshot/urls.py b/evidence/urls.py similarity index 74% rename from snapshot/urls.py rename to evidence/urls.py index b3e00f9..7a6e992 100644 --- a/snapshot/urls.py +++ b/evidence/urls.py @@ -9,10 +9,10 @@ # path('', include(router.urls)), # ] from django.urls import path -from snapshot import views +from evidence import views -app_name = 'snapshot' +app_name = 'evidence' urlpatterns = [ - path("", views.ListSnapshotsView.as_view(), name="list"), + path("", views.ListEvidencesView.as_view(), name="list"), ] diff --git a/snapshot/views.py b/evidence/views.py similarity index 74% rename from snapshot/views.py rename to evidence/views.py index 6a7f98b..543283b 100644 --- a/snapshot/views.py +++ b/evidence/views.py @@ -8,7 +8,7 @@ from django.views.generic.edit import ( ) from dashboard.mixins import DashboardView -from snapshot.models import Snapshot, Annotation +from evidence.models import Evidence, Annotation # from snapshot.forms import UploadForm # from django.shortcuts import render # from rest_framework import viewsets @@ -20,18 +20,18 @@ from snapshot.models import Snapshot, Annotation # serializer_class = SnapshotSerializer -class ListSnapshotsView(DashboardView, TemplateView): - template_name = "snapshots.html" - section = "snapshots" - title = _("Snapshots") - breadcrumb = "Snapshots" +class ListEvidencesView(DashboardView, TemplateView): + template_name = "evidences.html" + section = "evidences" + title = _("Evidences") + breadcrumb = "Evidences" def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - # snapshots = Snapshot.objects.filter(owner=self.request.user) - snapshots = [] + # evidences = Evidence.objects.filter(owner=self.request.user) + evidences = [] context.update({ - 'snapshots': snapshots, + 'evidences': evidences, }) return context diff --git a/snapshot/xapian.py b/evidence/xapian.py similarity index 100% rename from snapshot/xapian.py rename to evidence/xapian.py diff --git a/lot/models.py b/lot/models.py index 9237a27..9940594 100644 --- a/lot/models.py +++ b/lot/models.py @@ -8,7 +8,7 @@ from utils.constants import ( from user.models import User # from device.models import Device -from snapshot.models import Annotation +from evidence.models import Annotation class LotTag(models.Model): -- 2.30.2 From 0136a98ff5f62162e56d86797e114911f327b316 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 30 Jul 2024 13:37:08 +0200 Subject: [PATCH 09/26] add annotations in device and in lots --- dashboard/templates/unassigned_devices.html | 12 +-- dashboard/views.py | 7 +- device/forms.py | 12 ++- device/migrations/0002_device_model.py | 18 ---- device/migrations/0003_device_manufacturer.py | 18 ---- device/migrations/0004_delete_device.py | 18 ---- device/models.py | 24 ++++- device/templates/details.html | 29 +++--- device/templates/new_annotation.html | 45 +++++++++ device/urls.py | 1 + device/views.py | 47 +++++++--- dhub/urls.py | 2 +- evidence/management/commands/up_snapshots.py | 2 +- evidence/migrations/0001_initial.py | 9 +- .../migrations/0002_alter_annotation_type.py | 20 ++++ .../0002_remove_annotation_device.py | 17 ---- .../migrations/0003_alter_annotation_type.py | 20 ++++ evidence/models.py | 6 +- lot/migrations/0001_initial.py | 90 +++++++++++------- .../migrations/0002_lotannotation.py | 23 ++++- .../0002_remove_lot_devices_devicelot.py | 39 -------- lot/models.py | 13 +++ lot/templates/annotations.html | 48 ++++++++++ lot/templates/documents.html | 48 ++++++++++ lot/templates/new_annotation.html | 45 +++++++++ lot/urls.py | 4 + lot/views.py | 93 ++++++++++++++++++- 27 files changed, 502 insertions(+), 208 deletions(-) delete mode 100644 device/migrations/0002_device_model.py delete mode 100644 device/migrations/0003_device_manufacturer.py delete mode 100644 device/migrations/0004_delete_device.py create mode 100644 device/templates/new_annotation.html create mode 100644 evidence/migrations/0002_alter_annotation_type.py delete mode 100644 evidence/migrations/0002_remove_annotation_device.py create mode 100644 evidence/migrations/0003_alter_annotation_type.py rename device/migrations/0001_initial.py => lot/migrations/0002_lotannotation.py (55%) delete mode 100644 lot/migrations/0002_remove_lot_devices_devicelot.py create mode 100644 lot/templates/annotations.html create mode 100644 lot/templates/documents.html create mode 100644 lot/templates/new_annotation.html diff --git a/dashboard/templates/unassigned_devices.html b/dashboard/templates/unassigned_devices.html index df71266..afd65b6 100644 --- a/dashboard/templates/unassigned_devices.html +++ b/dashboard/templates/unassigned_devices.html @@ -7,21 +7,17 @@

      {{ subtitle }}

      - + - {% trans 'Lots' %} - - - - {% trans 'Actions' %} + {% trans 'Documents' %} {% trans 'Exports' %} - + - {% trans 'Labels' %} + {% trans 'Annotations' %}
      diff --git a/dashboard/views.py b/dashboard/views.py index bf8f8e2..4a59a8f 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -1,12 +1,7 @@ -import json - from django.utils.translation import gettext_lazy as _ -from django.db.models import Count from dashboard.mixins import InventaryMixin, DetailsMixin from device.models import Device -from evidence.xapian import search -from evidence.models import Annotation -from lot.models import Lot, LotTag +from lot.models import Lot class UnassignedDevicesView(InventaryMixin): diff --git a/device/forms.py b/device/forms.py index cf42dbc..1ad0c6b 100644 --- a/device/forms.py +++ b/device/forms.py @@ -4,8 +4,8 @@ import hashlib import datetime from django import forms -from snapshot.models import Annotation -from snapshot.xapian import search, index +from evidence.models import Annotation +from evidence.xapian import search, index DEVICE_TYPES = [ ("Desktop", "Desktop"), @@ -27,13 +27,19 @@ DEVICE_TYPES = [ class DeviceForm(forms.Form): type = forms.ChoiceField(choices = DEVICE_TYPES, required=False) - amount = forms.IntegerField(required=True, initial=1) + amount = forms.IntegerField(required=False, initial=1) tag = forms.CharField(required=False) name = forms.CharField(required=False) value = forms.CharField(required=False) class BaseDeviceFormSet(forms.BaseFormSet): + def clean(self): + for x in self.cleaned_data: + if x.get("amount"): + return True + return False + def save(self, user, commit=True): self.user = user doc = {} diff --git a/device/migrations/0002_device_model.py b/device/migrations/0002_device_model.py deleted file mode 100644 index 0d02c3d..0000000 --- a/device/migrations/0002_device_model.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-18 09:20 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("device", "0001_initial"), - ] - - operations = [ - migrations.AddField( - model_name="device", - name="model", - field=models.CharField(blank=True, max_length=256, null=True), - ), - ] diff --git a/device/migrations/0003_device_manufacturer.py b/device/migrations/0003_device_manufacturer.py deleted file mode 100644 index 511b7c1..0000000 --- a/device/migrations/0003_device_manufacturer.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-18 09:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("device", "0002_device_model"), - ] - - operations = [ - migrations.AddField( - model_name="device", - name="manufacturer", - field=models.CharField(blank=True, max_length=256, null=True), - ), - ] diff --git a/device/migrations/0004_delete_device.py b/device/migrations/0004_delete_device.py deleted file mode 100644 index 10cbd01..0000000 --- a/device/migrations/0004_delete_device.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-18 17:30 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("device", "0003_device_manufacturer"), - ("lot", "0002_remove_lot_devices_devicelot"), - ("snapshot", "0002_remove_annotation_device"), - ] - - operations = [ - migrations.DeleteModel( - name="Device", - ), - ] diff --git a/device/models.py b/device/models.py index a29f8c4..aa0b95f 100644 --- a/device/models.py +++ b/device/models.py @@ -56,10 +56,32 @@ class Device: self.owner = self.annotations[0].owner return self.annotations + + def get_user_annotations(self): + if not self.uuids: + self.get_uuids() + + annotations = Annotation.objects.filter( + uuid__in=self.uuids, + owner=self.owner, + type=Annotation.Type.USER + ) + return annotations + + def get_user_documents(self): + if not self.uuids: + self.get_uuids() + + annotations = Annotation.objects.filter( + uuid__in=self.uuids, + owner=self.owner, + type=Annotation.Type.DOCUMENT + ) + return annotations def get_uuids(self): for a in self.get_annotations(): - if not a.uuid in self.uuids: + if a.uuid not in self.uuids: self.uuids.append(a.uuid) def get_hids(self): diff --git a/device/templates/details.html b/device/templates/details.html index bba1ac9..38e1d78 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -90,7 +90,7 @@
      -
      Annotations
      +
      Annotations
      @@ -102,8 +102,7 @@ - {% for a in object.annotations %} - {% if a.is_user_annotation %} + {% for a in object.get_user_annotations %} @@ -111,7 +110,6 @@ - {% endif %} {% endfor %} @@ -137,26 +135,35 @@
      {{ a.key }} {{ a.value }}
      +
      Documents
      +
      - - - - + + + + {% for a in object.get_user_documents %} + + + + + + + + {% endfor %}
      FileTypeDescriptionUploaded onKeyValueCreated on
      {{ a.key }}{{ a.value }}{{ a.created }}
      diff --git a/device/templates/new_annotation.html b/device/templates/new_annotation.html new file mode 100644 index 0000000..ac16bf8 --- /dev/null +++ b/device/templates/new_annotation.html @@ -0,0 +1,45 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
      +
      +

      {{ subtitle }}

      +
      +
      + +{% load django_bootstrap5 %} +
      + {% csrf_token %} + {% if form.errors %} + + {% endif %} + {{ form.management_form }} +
      +
      +
      +
      + {% for f in form %} +
      +
      + {% bootstrap_field f %} +
      +
      + {% endfor %} +
      +
      + {% translate "Cancel" %} + +
      + +
      + +{% endblock %} diff --git a/device/urls.py b/device/urls.py index 3d0b368..3d7c12b 100644 --- a/device/urls.py +++ b/device/urls.py @@ -8,4 +8,5 @@ urlpatterns = [ 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("/document/add", views.AddDocumentView.as_view(), name="add_document"), ] diff --git a/device/views.py b/device/views.py index 68344b0..e89cc3c 100644 --- a/device/views.py +++ b/device/views.py @@ -10,8 +10,8 @@ from django.views.generic.edit import ( ) from django.views.generic.base import TemplateView from dashboard.mixins import DashboardView -from snapshot.models import Annotation -from snapshot.xapian import search +from evidence.models import Annotation +from evidence.xapian import search from lot.models import LotTag from device.models import Device from device.forms import DeviceFormSet @@ -95,14 +95,14 @@ class DetailsView(DashboardView, TemplateView): lot_tags = LotTag.objects.filter(owner=self.request.user) context.update({ 'object': self.object, - 'snapshot': self.object.get_last_snapshot(), + 'snapshot': self.object.get_last_evidence(), 'lot_tags': lot_tags, }) return context class AddAnnotationView(DashboardView, CreateView): - template_name = "new_device.html" + template_name = "new_annotation.html" title = _("New annotation") breadcrumb = "Device / New annotation" success_url = reverse_lazy('dashboard:unassigned_devices') @@ -110,25 +110,46 @@ class AddAnnotationView(DashboardView, CreateView): fields = ("key", "value") def form_valid(self, form): - self.device.get_annotations() - self.device.get_uuids() form.instance.owner = self.request.user - form.instance.device = self.device - form.instance.uuid = self.device.uuids[0] + form.instance.uuid = self.annotation.uuid form.instance.type = Annotation.Type.USER response = super().form_valid(form) return response def get_form_kwargs(self): pk = self.kwargs.get('pk') - self.device = get_object_or_404(Device, pk=pk) + self.annotation = Annotation.objects.filter( + owner=self.request.user, value=pk, type=Annotation.Type.SYSTEM + ).first() + if not self.annotation: + get_object_or_404(Annotation, pk=0, owner=self.request.user) self.success_url = reverse_lazy('device:details', args=[pk]) kwargs = super().get_form_kwargs() return kwargs - def get_success_url(self): - url = super().get_success_url() - import pdb; pdb.set_trace() - return url +class AddDocumentView(DashboardView, CreateView): + template_name = "new_annotation.html" + title = _("New Document") + breadcrumb = "Device / New document" + success_url = reverse_lazy('dashboard:unassigned_devices') + model = Annotation + fields = ("key", "value") + def form_valid(self, form): + form.instance.owner = self.request.user + form.instance.uuid = self.annotation.uuid + form.instance.type = Annotation.Type.DOCUMENT + response = super().form_valid(form) + return response + + def get_form_kwargs(self): + pk = self.kwargs.get('pk') + self.annotation = Annotation.objects.filter( + owner=self.request.user, value=pk, type=Annotation.Type.SYSTEM + ).first() + if not self.annotation: + get_object_or_404(Annotation, pk=0, owner=self.request.user) + self.success_url = reverse_lazy('device:details', args=[pk]) + kwargs = super().get_form_kwargs() + return kwargs diff --git a/dhub/urls.py b/dhub/urls.py index 9c77ee8..90252d9 100644 --- a/dhub/urls.py +++ b/dhub/urls.py @@ -21,7 +21,7 @@ urlpatterns = [ # path('api/', include('snapshot.urls')), path("", include("login.urls")), path("dashboard/", include("dashboard.urls")), - path("snapshot/", include("snapshot.urls")), + path("evidence/", include("evidence.urls")), path("device/", include("device.urls")), path("lot/", include("lot.urls")), ] diff --git a/evidence/management/commands/up_snapshots.py b/evidence/management/commands/up_snapshots.py index f8cf0ce..3cb12fa 100644 --- a/evidence/management/commands/up_snapshots.py +++ b/evidence/management/commands/up_snapshots.py @@ -4,7 +4,7 @@ import json from django.core.management.base import BaseCommand from django.contrib.auth import get_user_model -from snapshot.parse import Build +from evidence.parse import Build User = get_user_model() diff --git a/evidence/migrations/0001_initial.py b/evidence/migrations/0001_initial.py index 206cc8a..8b86718 100644 --- a/evidence/migrations/0001_initial.py +++ b/evidence/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.6 on 2024-07-17 14:57 +# Generated by Django 5.0.6 on 2024-07-27 16:23 import django.db.models.deletion from django.conf import settings @@ -10,7 +10,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("device", "0001_initial"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] @@ -35,12 +34,6 @@ class Migration(migrations.Migration): ), ("key", models.CharField(max_length=256)), ("value", models.CharField(max_length=256)), - ( - "device", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="device.device" - ), - ), ( "owner", models.ForeignKey( diff --git a/evidence/migrations/0002_alter_annotation_type.py b/evidence/migrations/0002_alter_annotation_type.py new file mode 100644 index 0000000..df63e61 --- /dev/null +++ b/evidence/migrations/0002_alter_annotation_type.py @@ -0,0 +1,20 @@ +# Generated by Django 5.0.6 on 2024-07-29 14:58 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("evidence", "0001_initial"), + ] + + operations = [ + migrations.AlterField( + model_name="annotation", + name="type", + field=models.SmallIntegerField( + choices=[(0, "System"), (1, "User"), (2, "Document"), (3, "Action")] + ), + ), + ] diff --git a/evidence/migrations/0002_remove_annotation_device.py b/evidence/migrations/0002_remove_annotation_device.py deleted file mode 100644 index 326eca2..0000000 --- a/evidence/migrations/0002_remove_annotation_device.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-18 17:30 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("snapshot", "0001_initial"), - ] - - operations = [ - migrations.RemoveField( - model_name="annotation", - name="device", - ), - ] diff --git a/evidence/migrations/0003_alter_annotation_type.py b/evidence/migrations/0003_alter_annotation_type.py new file mode 100644 index 0000000..4d18482 --- /dev/null +++ b/evidence/migrations/0003_alter_annotation_type.py @@ -0,0 +1,20 @@ +# Generated by Django 5.0.6 on 2024-07-29 15:37 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("evidence", "0002_alter_annotation_type"), + ] + + operations = [ + migrations.AlterField( + model_name="annotation", + name="type", + field=models.SmallIntegerField( + choices=[(0, "System"), (1, "User"), (2, "Document")] + ), + ), + ] diff --git a/evidence/models.py b/evidence/models.py index 576c172..ece8616 100644 --- a/evidence/models.py +++ b/evidence/models.py @@ -56,6 +56,7 @@ class Annotation(models.Model): class Type(models.IntegerChoices): SYSTEM= 0, "System" USER = 1, "User" + DOCUMENT = 2, "Document" created = models.DateTimeField(auto_now_add=True) uuid = models.UUIDField() @@ -68,8 +69,3 @@ class Annotation(models.Model): constraints = [ models.UniqueConstraint(fields=["type", "key", "uuid"], name="unique_type_key_uuid") ] - - def is_user_annotation(self): - if self.type == self.Type.USER: - return True - return False diff --git a/lot/migrations/0001_initial.py b/lot/migrations/0001_initial.py index cb398b2..28b3e8e 100644 --- a/lot/migrations/0001_initial.py +++ b/lot/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.6 on 2024-07-17 14:57 +# Generated by Django 5.0.6 on 2024-07-27 16:23 import django.db.models.deletion from django.conf import settings @@ -10,11 +10,58 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("device", "0001_initial"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ + migrations.CreateModel( + name="Lot", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("created", models.DateTimeField(auto_now_add=True)), + ("updated", models.DateTimeField(auto_now=True)), + ("name", models.CharField(blank=True, max_length=64, null=True)), + ("code", models.CharField(blank=True, max_length=64, null=True)), + ("description", models.CharField(blank=True, max_length=64, null=True)), + ("closed", models.BooleanField(default=True)), + ( + "owner", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + ), + ), + ], + ), + migrations.CreateModel( + name="DeviceLot", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("device_id", models.CharField(max_length=256)), + ( + "lot", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="lot.lot" + ), + ), + ], + ), migrations.CreateModel( name="LotTag", fields=[ @@ -37,38 +84,11 @@ class Migration(migrations.Migration): ), ], ), - migrations.CreateModel( - name="Lot", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("created", models.DateTimeField(auto_now_add=True)), - ("updated", models.DateTimeField(auto_now=True)), - ("name", models.CharField(blank=True, max_length=64, null=True)), - ("code", models.CharField(blank=True, max_length=64, null=True)), - ("description", models.CharField(blank=True, max_length=64, null=True)), - ("closed", models.BooleanField(default=True)), - ("devices", models.ManyToManyField(to="device.device")), - ( - "owner", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - ), - ), - ( - "type", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="lot.lottag" - ), - ), - ], + migrations.AddField( + model_name="lot", + name="type", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="lot.lottag" + ), ), ] diff --git a/device/migrations/0001_initial.py b/lot/migrations/0002_lotannotation.py similarity index 55% rename from device/migrations/0001_initial.py rename to lot/migrations/0002_lotannotation.py index ed68a41..aca7de1 100644 --- a/device/migrations/0001_initial.py +++ b/lot/migrations/0002_lotannotation.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.6 on 2024-07-17 14:57 +# Generated by Django 5.0.6 on 2024-07-29 15:37 import django.db.models.deletion from django.conf import settings @@ -7,15 +7,14 @@ from django.db import migrations, models class Migration(migrations.Migration): - initial = True - dependencies = [ + ("lot", "0001_initial"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ migrations.CreateModel( - name="Device", + name="LotAnnotation", fields=[ ( "id", @@ -26,7 +25,21 @@ class Migration(migrations.Migration): verbose_name="ID", ), ), - ("type", models.CharField(blank=True, max_length=64, null=True)), + ("created", models.DateTimeField(auto_now_add=True)), + ( + "type", + models.SmallIntegerField( + choices=[(0, "System"), (1, "User"), (2, "Document")] + ), + ), + ("key", models.CharField(max_length=256)), + ("value", models.CharField(max_length=256)), + ( + "lot", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="lot.lot" + ), + ), ( "owner", models.ForeignKey( diff --git a/lot/migrations/0002_remove_lot_devices_devicelot.py b/lot/migrations/0002_remove_lot_devices_devicelot.py deleted file mode 100644 index 8496dea..0000000 --- a/lot/migrations/0002_remove_lot_devices_devicelot.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-18 17:30 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("lot", "0001_initial"), - ] - - operations = [ - migrations.RemoveField( - model_name="lot", - name="devices", - ), - migrations.CreateModel( - name="DeviceLot", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("device_id", models.CharField(max_length=256)), - ( - "lot", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="lot.lot" - ), - ), - ], - ), - ] diff --git a/lot/models.py b/lot/models.py index 9940594..9078459 100644 --- a/lot/models.py +++ b/lot/models.py @@ -43,3 +43,16 @@ class Lot(models.Model): for d in DeviceLot.objects.filter(lot=self, device_id=v): d.delete() + +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(User, on_delete=models.CASCADE) + 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/annotations.html b/lot/templates/annotations.html new file mode 100644 index 0000000..7e6747e --- /dev/null +++ b/lot/templates/annotations.html @@ -0,0 +1,48 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
      +
      +

      Lot {{ lot.name }}

      +
      +
      + +
      +
      +
      + + + + Add new annotation + + +
      + +
      Annotations
      + + + + + + + + + + + + {% for a in annotations %} + + + + + + + + {% endfor %} + + +
      KeyValueCreated on
      {{ a.key }}{{ a.value }}{{ a.created }}
      +
      +
      +{% endblock %} diff --git a/lot/templates/documents.html b/lot/templates/documents.html new file mode 100644 index 0000000..f8abac9 --- /dev/null +++ b/lot/templates/documents.html @@ -0,0 +1,48 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
      +
      +

      Lot {{ lot.name }}

      +
      +
      + +
      +
      +
      + + + + Add new document + + +
      + +
      Documents
      + + + + + + + + + + + + {% for a in documents %} + + + + + + + + {% endfor %} + + +
      KeyValueCreated on
      {{ a.key }}{{ a.value }}{{ a.created }}
      +
      +
      +{% endblock %} diff --git a/lot/templates/new_annotation.html b/lot/templates/new_annotation.html new file mode 100644 index 0000000..ac16bf8 --- /dev/null +++ b/lot/templates/new_annotation.html @@ -0,0 +1,45 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
      +
      +

      {{ subtitle }}

      +
      +
      + +{% load django_bootstrap5 %} +
      + {% csrf_token %} + {% if form.errors %} + + {% endif %} + {{ form.management_form }} +
      +
      +
      +
      + {% for f in form %} +
      +
      + {% bootstrap_field f %} +
      +
      + {% endfor %} +
      +
      + {% translate "Cancel" %} + +
      + +
      + +{% endblock %} diff --git a/lot/urls.py b/lot/urls.py index 691e592..eb863b0 100644 --- a/lot/urls.py +++ b/lot/urls.py @@ -10,4 +10,8 @@ urlpatterns = [ path("add/devices/", views.AddToLotView.as_view(), name="add_devices"), path("del/devices/", views.DelToLotView.as_view(), name="del_devices"), 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"), ] diff --git a/lot/views.py b/lot/views.py index 9549076..0045d16 100644 --- a/lot/views.py +++ b/lot/views.py @@ -9,7 +9,7 @@ from django.views.generic.edit import ( FormView, ) from dashboard.mixins import DashboardView -from lot.models import Lot, LotTag +from lot.models import Lot, LotTag, LotAnnotation from lot.forms import LotsForm @@ -134,3 +134,94 @@ class LotsTagsView(DashboardView, TemplateView): }) return context + +class LotAddDocumentView(DashboardView, CreateView): + template_name = "new_annotation.html" + title = _("New Document") + breadcrumb = "Device / New document" + success_url = reverse_lazy('dashboard:unassigned_devices') + model = LotAnnotation + fields = ("key", "value") + + def form_valid(self, form): + form.instance.owner = self.request.user + form.instance.lot = self.lot + form.instance.type = LotAnnotation.Type.DOCUMENT + 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) + self.success_url = reverse_lazy('lot:documents', args=[pk]) + kwargs = super().get_form_kwargs() + return kwargs + + +class LotDocumentsView(DashboardView, TemplateView): + template_name = "documents.html" + title = _("New Document") + breadcrumb = "Device / 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, id=self.pk) + documents = LotAnnotation.objects.filter( + lot=lot, + owner=self.request.user, + type=LotAnnotation.Type.DOCUMENT, + ) + context.update({ + 'lot': lot, + 'documents': documents, + 'title': self.title, + 'breadcrumb': self.breadcrumb + }) + return context + + +class LotAnnotationsView(DashboardView, TemplateView): + template_name = "annotations.html" + title = _("New Annotation") + breadcrumb = "Device / New annotation" + + 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, id=self.pk) + annotations = LotAnnotation.objects.filter( + lot=lot, + owner=self.request.user, + type=LotAnnotation.Type.USER, + ) + context.update({ + 'lot': lot, + 'annotations': annotations, + 'title': self.title, + 'breadcrumb': self.breadcrumb + }) + return context + + +class LotAddAnnotationView(DashboardView, CreateView): + template_name = "new_annotation.html" + title = _("New Annotation") + breadcrumb = "Device / New annotation" + success_url = reverse_lazy('dashboard:unassigned_devices') + model = LotAnnotation + fields = ("key", "value") + + def form_valid(self, form): + form.instance.owner = self.request.user + form.instance.lot = self.lot + form.instance.type = LotAnnotation.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) + self.success_url = reverse_lazy('lot:annotations', args=[pk]) + kwargs = super().get_form_kwargs() + return kwargs -- 2.30.2 From da1e40b7ed49dbcb2f0c26cf597cbabce84ec196 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 30 Jul 2024 19:38:04 +0200 Subject: [PATCH 10/26] upload evidences --- dashboard/templates/base.html | 2 +- dashboard/templates/unassigned_devices.html | 4 +++ dashboard/views.py | 2 ++ evidence/forms.py | 27 ++++++++++++++++- evidence/templates/upload.html | 32 +++++++++++++++++++++ evidence/urls.py | 1 + evidence/views.py | 25 ++++++++++------ 7 files changed, 83 insertions(+), 10 deletions(-) create mode 100644 evidence/templates/upload.html diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html index c73e203..e79d83e 100644 --- a/dashboard/templates/base.html +++ b/dashboard/templates/base.html @@ -114,7 +114,7 @@
      • - + {% trans 'Upload one' %}
        • diff --git a/dashboard/templates/unassigned_devices.html b/dashboard/templates/unassigned_devices.html index afd65b6..c21a2be 100644 --- a/dashboard/templates/unassigned_devices.html +++ b/dashboard/templates/unassigned_devices.html @@ -7,18 +7,22 @@

        {{ subtitle }}

      + {% if lot %} {% trans 'Documents' %} + {% endif %} {% trans 'Exports' %} + {% if lot %} {% trans 'Annotations' %} + {% endif %}
      diff --git a/dashboard/views.py b/dashboard/views.py index 4a59a8f..79b9346 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -31,8 +31,10 @@ class LotDashboardView(InventaryMixin, DetailsMixin): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) devices = self.get_devices() + lot = context.get('object') context.update({ 'devices': devices, + 'lot': lot, }) return context diff --git a/evidence/forms.py b/evidence/forms.py index 99abdb4..b2e0a61 100644 --- a/evidence/forms.py +++ b/evidence/forms.py @@ -1,8 +1,33 @@ +import json +from django import forms +from django.utils.translation import gettext_lazy as _ +from evidence.parse import Build class UploadForm(forms.Form): + evidence_file = forms.FileField(label=_("File")) def clean(self): - data = self.cleaned_data + data = self.cleaned_data.get('evidence_file') + if not data: + return False + + self.file_name = data.name + self.file_data = data.read() + if not self.file_name or not self.file_data: + return False + try: + self.file_json = json.loads(self.file_data) + except Exception: + return False + + return True + + def save(self, user, commit=True): + if not commit or not user: + return + + evidence = Build(self.file_json, user) + return evidence diff --git a/evidence/templates/upload.html b/evidence/templates/upload.html new file mode 100644 index 0000000..056cf55 --- /dev/null +++ b/evidence/templates/upload.html @@ -0,0 +1,32 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
      +
      +

      {{ subtitle }}

      +
      +
      + +{% load django_bootstrap5 %} +
      +{% csrf_token %} +{% if form.errors %} + +{% endif %} +{% bootstrap_form form %} +
      + {% translate "Cancel" %} + +
      + +
      +{% endblock %} diff --git a/evidence/urls.py b/evidence/urls.py index 7a6e992..3a20d41 100644 --- a/evidence/urls.py +++ b/evidence/urls.py @@ -15,4 +15,5 @@ app_name = 'evidence' urlpatterns = [ path("", views.ListEvidencesView.as_view(), name="list"), + path("upload", views.UploadView.as_view(), name="upload"), ] diff --git a/evidence/views.py b/evidence/views.py index 543283b..08cb886 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -9,7 +9,7 @@ from django.views.generic.edit import ( from dashboard.mixins import DashboardView from evidence.models import Evidence, Annotation -# from snapshot.forms import UploadForm +from evidence.forms import UploadForm # from django.shortcuts import render # from rest_framework import viewsets # from snapshot.serializers import SnapshotSerializer @@ -36,10 +36,19 @@ class ListEvidencesView(DashboardView, TemplateView): return context -# class UploadView(DashboardView, FormView): -# template_name = "upload.html" -# section = "snapshots" -# title = _("Upload Snapshot") -# breadcrumb = "Snapshots / Upload" -# success_url = reverse_lazy('snashot:list') -# form_class = UploadForm +class UploadView(DashboardView, FormView): + template_name = "upload.html" + section = "evidences" + title = _("Upload Evidence") + breadcrumb = "Evidences / Upload" + success_url = reverse_lazy('evidence:list') + form_class = UploadForm + + def form_valid(self, form): + form.save(self.request.user) + response = super().form_valid(form) + return response + + def form_invalid(self, form): + response = super().form_invalid(form) + return response -- 2.30.2 From e599743ca8e1ba9101457ef680b0e47dc5604180 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 30 Jul 2024 22:54:00 +0200 Subject: [PATCH 11/26] test --- lot/forms.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lot/forms.py b/lot/forms.py index 7b809fd..b053a51 100644 --- a/lot/forms.py +++ b/lot/forms.py @@ -1,6 +1,7 @@ from django import forms from lot.models import Lot + class LotsForm(forms.Form): lots = forms.ModelMultipleChoiceField( queryset=Lot.objects.all(), -- 2.30.2 From 4df2efd8adae63000017a609c83ca2fe5d471dc6 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 30 Jul 2024 23:00:39 +0200 Subject: [PATCH 12/26] remove pdb --- lot/forms.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lot/forms.py b/lot/forms.py index b053a51..cc396f1 100644 --- a/lot/forms.py +++ b/lot/forms.py @@ -9,7 +9,6 @@ class LotsForm(forms.Form): ) def clean(self): - # import pdb; pdb.set_trace() self._lots = self.cleaned_data.get("lots") return self._lots -- 2.30.2 From 9d42c27bd497389d95e76d38455eec266a96694a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 31 Jul 2024 13:21:54 +0200 Subject: [PATCH 13/26] fix view lots in details of device --- device/models.py | 5 +++++ device/templates/details.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/device/models.py b/device/models.py index aa0b95f..ce874fd 100644 --- a/device/models.py +++ b/device/models.py @@ -33,6 +33,7 @@ class Device: self.hids = [] self.uuids = [] self.evidences = [] + self.lots = [] self.last_evidence = None self.get_last_evidence() @@ -41,6 +42,7 @@ class Device: self.get_uuids() self.get_hids() self.get_evidences() + self.get_lots() def get_annotations(self): if self.annotations: @@ -107,6 +109,9 @@ class Device: def last_uuid(self): return self.uuids[0] + def get_lots(self): + self.lots = [x.lot for x in DeviceLot.objects.filter(device_id=self.id)] + @classmethod def get_unassigned(cls, user): chids = DeviceLot.objects.filter(lot__owner=user).values_list("device_id", flat=True).distinct() diff --git a/device/templates/details.html b/device/templates/details.html index 38e1d78..a549910 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -121,7 +121,7 @@ {% for tag in lot_tags %}
      {{ tag }}
      - {% for lot in tag.lot_set.filter %} + {% for lot in object.lots %} {% if lot.type == tag %}
      -- 2.30.2 From 46a0bb392da9e4801f569efbede110e28c4cb4e9 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 31 Jul 2024 13:28:02 +0200 Subject: [PATCH 14/26] Upload multiple File of evidences --- dhub/settings.py | 1 + evidence/forms.py | 38 +++++++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dhub/settings.py b/dhub/settings.py index 2baf522..055828a 100644 --- a/dhub/settings.py +++ b/dhub/settings.py @@ -171,3 +171,4 @@ LOGGING = { } SNAPSHOT_PATH="/tmp/" +DATA_UPLOAD_MAX_NUMBER_FILES = 1000 diff --git a/evidence/forms.py b/evidence/forms.py index b2e0a61..2e49a6d 100644 --- a/evidence/forms.py +++ b/evidence/forms.py @@ -1,27 +1,43 @@ import json from django import forms +from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ +from utils.forms import MultipleFileField from evidence.parse import Build +from evidence.models import Annotation class UploadForm(forms.Form): - evidence_file = forms.FileField(label=_("File")) + evidence_file = MultipleFileField(label=_("File")) def clean(self): + self.evidences = [] data = self.cleaned_data.get('evidence_file') if not data: return False - self.file_name = data.name - self.file_data = data.read() - if not self.file_name or not self.file_data: - return False - try: - self.file_json = json.loads(self.file_data) - except Exception: - return False + for f in data: + file_name = f.name + file_data = f.read() + if not file_name or not file_data: + return False + + try: + file_json = json.loads(file_data) + Build(file_json, None, check=True) + exist_annotation = Annotation.objects.filter( + uuid=file_json['uuid'] + ).first() + + if exist_annotation: + raise ValidationError("error: {} exist".format(file_name)) + + except Exception: + raise ValidationError("error in: {}".format(file_name)) + + self.evidences.append((file_name, file_json)) return True @@ -29,5 +45,5 @@ class UploadForm(forms.Form): if not commit or not user: return - evidence = Build(self.file_json, user) - return evidence + for ev in self.evidences: + Build(ev[1], user) -- 2.30.2 From f3117e2f008d0068dbc83ba55aef3cef2b960267 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 31 Jul 2024 13:28:46 +0200 Subject: [PATCH 15/26] View list of evidences --- evidence/models.py | 45 ++++++++++++++++++------------- evidence/parse.py | 28 ++++++++----------- evidence/templates/evidences.html | 38 +++++++++----------------- evidence/views.py | 8 +++--- 4 files changed, 52 insertions(+), 67 deletions(-) diff --git a/evidence/models.py b/evidence/models.py index ece8616..dbb47a0 100644 --- a/evidence/models.py +++ b/evidence/models.py @@ -7,6 +7,25 @@ from evidence.xapian import search from user.models import User +class Annotation(models.Model): + class Type(models.IntegerChoices): + SYSTEM= 0, "System" + USER = 1, "User" + DOCUMENT = 2, "Document" + + created = models.DateTimeField(auto_now_add=True) + uuid = models.UUIDField() + owner = models.ForeignKey(User, on_delete=models.CASCADE) + type = models.SmallIntegerField(choices=Type) + key = models.CharField(max_length=STR_EXTEND_SIZE) + value = models.CharField(max_length=STR_EXTEND_SIZE) + + class Meta: + constraints = [ + models.UniqueConstraint(fields=["type", "key", "uuid"], name="unique_type_key_uuid") + ] + + class Evidence: def __init__(self, uuid): self.uuid = uuid @@ -22,7 +41,7 @@ class Evidence: self.annotations = Annotation.objects.filter( uuid=self.uuid ).order_by("created") - + def get_owner(self): if not self.annotations: self.get_annotations() @@ -51,21 +70,9 @@ class Evidence: def components(self): return self.doc.get('components', []) - -class Annotation(models.Model): - class Type(models.IntegerChoices): - SYSTEM= 0, "System" - USER = 1, "User" - DOCUMENT = 2, "Document" - - created = models.DateTimeField(auto_now_add=True) - uuid = models.UUIDField() - owner = models.ForeignKey(User, on_delete=models.CASCADE) - type = models.SmallIntegerField(choices=Type) - key = models.CharField(max_length=STR_EXTEND_SIZE) - value = models.CharField(max_length=STR_EXTEND_SIZE) - - class Meta: - constraints = [ - models.UniqueConstraint(fields=["type", "key", "uuid"], name="unique_type_key_uuid") - ] + @classmethod + def get_all(cls, user): + return Annotation.objects.filter( + owner=user, + type=Annotation.Type.SYSTEM, + ).order_by("-created").values_list("uuid", flat=True).distinct() diff --git a/evidence/parse.py b/evidence/parse.py index f303b47..614c2ec 100644 --- a/evidence/parse.py +++ b/evidence/parse.py @@ -10,11 +10,15 @@ from utils.constants import ALGOS class Build: - def __init__(self, evidence_json, user): + def __init__(self, evidence_json, user, check=False): self.json = evidence_json self.uuid = self.json['uuid'] self.user = user self.hid = None + self.generate_chids() + + if check: + return self.index() self.create_annotations() @@ -23,6 +27,11 @@ class Build: snap = json.dumps(self.json) index(self.uuid, snap) + def generate_chids(self): + self.algorithms = { + 'hidalgo1': self.get_hid_14(), + } + def get_hid_14(self): device = self.json['device'] manufacturer = device.get("manufacturer", '') @@ -34,22 +43,8 @@ class Build: return hashlib.sha3_256(hid.encode()).hexdigest() def create_annotations(self): - algorithms = { - 'hidalgo1': self.get_hid_14(), - } - # TODO is neccesary? - annotation = Annotation.objects.filter( - owner=self.user, - type=Annotation.Type.SYSTEM, - key='hidalgo1', - value = algorithms['hidalgo1'] - ).first() - - for k, v in algorithms.items(): - if annotation and k == annotation.key: - continue - + for k, v in self.algorithms.items(): Annotation.objects.create( uuid=self.uuid, owner=self.user, @@ -57,4 +52,3 @@ class Build: key=k, value=v ) - diff --git a/evidence/templates/evidences.html b/evidence/templates/evidences.html index 3ce592d..3df647a 100644 --- a/evidence/templates/evidences.html +++ b/evidence/templates/evidences.html @@ -8,33 +8,19 @@
      -
      -
      - {% csrf_token %} - - - - - - - {% for snap in evicendes %} - - - - - - - + +
      +
      - Title -
      - - - {{ snap.uuid }} {{ snap.sid }} {{ snap.version }} - - {{ snap.computer.device.manufacturer }} {{ snap.computer.device.model }} -
      + {% for ev in evidences %} + + + + {% endfor %}
      + {{ ev }} + + +
      -
      {% endblock %} diff --git a/evidence/views.py b/evidence/views.py index 08cb886..77d1577 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -2,13 +2,11 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic.base import TemplateView from django.urls import reverse_lazy from django.views.generic.edit import ( - CreateView, - UpdateView, FormView, ) from dashboard.mixins import DashboardView -from evidence.models import Evidence, Annotation +from evidence.models import Evidence from evidence.forms import UploadForm # from django.shortcuts import render # from rest_framework import viewsets @@ -28,8 +26,8 @@ class ListEvidencesView(DashboardView, TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - # evidences = Evidence.objects.filter(owner=self.request.user) - evidences = [] + evidences = Evidence.get_all(self.request.user) + context.update({ 'evidences': evidences, }) -- 2.30.2 From 0c6a20fbad1dbc80b81c3cc657d704025c05dbc8 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 31 Jul 2024 19:24:22 +0200 Subject: [PATCH 16/26] Add evidence details view --- dashboard/templates/base.html | 2 +- device/templates/details.html | 2 +- evidence/templates/ev_details.html | 49 ++++++++++++++++++++++++++++++ evidence/templates/evidences.html | 2 +- evidence/urls.py | 1 + evidence/views.py | 25 ++++++++++++++- utils/forms.py | 19 ++++++++++++ 7 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 evidence/templates/ev_details.html create mode 100644 utils/forms.py diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html index e79d83e..bcf569f 100644 --- a/dashboard/templates/base.html +++ b/dashboard/templates/base.html @@ -59,7 +59,7 @@
      - DEVICE HUB + DEVICEHUB
      PANGEA
      diff --git a/device/templates/details.html b/device/templates/details.html index a549910..30e7cfb 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -200,7 +200,7 @@ {{ snap.created }}

      - {{ snap.uuid }}
      + {{ snap.uuid }}

      diff --git a/evidence/templates/ev_details.html b/evidence/templates/ev_details.html new file mode 100644 index 0000000..2289f84 --- /dev/null +++ b/evidence/templates/ev_details.html @@ -0,0 +1,49 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
      +
      +

      {{ object.id }}

      +
      +
      + +
      +
      +
        +
      • + +
        • +
      • + +
        • +
      +
      +
      +
      + +
      +
      List of chids
      +
      + {% for snap in object.annotations %} + {% if snap.type == 0 %} +
      +
      +
      + + {{ snap.created }} + +
      +

      + {{ snap.key }}
      +

      + + {{ snap.value }} + +
      + {% endif %} + {% endfor %} +
      +
      +
      +{% endblock %} diff --git a/evidence/templates/evidences.html b/evidence/templates/evidences.html index 3df647a..c67e9d9 100644 --- a/evidence/templates/evidences.html +++ b/evidence/templates/evidences.html @@ -14,7 +14,7 @@ {% for ev in evidences %} - {{ ev }} + {{ ev }} diff --git a/evidence/urls.py b/evidence/urls.py index 3a20d41..060ce52 100644 --- a/evidence/urls.py +++ b/evidence/urls.py @@ -16,4 +16,5 @@ app_name = 'evidence' urlpatterns = [ path("", views.ListEvidencesView.as_view(), name="list"), path("upload", views.UploadView.as_view(), name="upload"), + path("", views.EvidenceView.as_view(), name="details"), ] diff --git a/evidence/views.py b/evidence/views.py index 77d1577..58a0d56 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -5,7 +5,7 @@ from django.views.generic.edit import ( FormView, ) -from dashboard.mixins import DashboardView +from dashboard.mixins import DashboardView, Http403 from evidence.models import Evidence from evidence.forms import UploadForm # from django.shortcuts import render @@ -50,3 +50,26 @@ class UploadView(DashboardView, FormView): def form_invalid(self, form): response = super().form_invalid(form) return response + + +class EvidenceView(DashboardView, TemplateView): + template_name = "ev_details.html" + section = "evidences" + title = _("Evidences") + breadcrumb = "Evidences / Details" + + def get(self, request, *args, **kwargs): + self.pk = kwargs['pk'] + self.object = Evidence(self.pk) + if self.object.owner != self.request.user: + raise Http403 + + self.object.get_annotations() + return super().get(request, *args, **kwargs) + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({ + 'object': self.object, + }) + return context diff --git a/utils/forms.py b/utils/forms.py new file mode 100644 index 0000000..5e19829 --- /dev/null +++ b/utils/forms.py @@ -0,0 +1,19 @@ +from django import forms + + +class MultipleFileInput(forms.ClearableFileInput): + allow_multiple_selected = True + + +class MultipleFileField(forms.FileField): + def __init__(self, *args, **kwargs): + kwargs.setdefault("widget", MultipleFileInput()) + super().__init__(*args, **kwargs) + + def clean(self, data, initial=None): + single_file_clean = super().clean + if isinstance(data, (list, tuple)): + result = [single_file_clean(d, initial) for d in data] + else: + result = [single_file_clean(data, initial)] + return result -- 2.30.2 From 1a44d40227ac2ed13bd09e4474b1009839f9babd Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 1 Aug 2024 14:29:51 +0200 Subject: [PATCH 17/26] dd CUSTOM_ID in the key for Identify device from user --- device/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device/forms.py b/device/forms.py index 1ad0c6b..1c1c5e7 100644 --- a/device/forms.py +++ b/device/forms.py @@ -94,7 +94,7 @@ class BaseDeviceFormSet(forms.BaseFormSet): uuid=self.uuid, owner=self.user, type=Annotation.Type.SYSTEM, - key='Web', + key='CUSTOM_ID', value=tag ) -- 2.30.2 From aa2b8a750dc236c758a3f7a9b5cb393d8a56e35c Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 1 Aug 2024 14:33:09 +0200 Subject: [PATCH 18/26] Add user tag for identify a device from form --- evidence/forms.py | 28 +++++++++++++++++++++++++++- evidence/templates/ev_details.html | 24 ++++++++++++++++++++++++ evidence/views.py | 27 ++++++++++++++++++++++++--- lot/views.py | 6 +++--- 4 files changed, 78 insertions(+), 7 deletions(-) diff --git a/evidence/forms.py b/evidence/forms.py index 2e49a6d..7eaf0ca 100644 --- a/evidence/forms.py +++ b/evidence/forms.py @@ -9,7 +9,6 @@ from evidence.models import Annotation class UploadForm(forms.Form): - evidence_file = MultipleFileField(label=_("File")) def clean(self): @@ -47,3 +46,30 @@ class UploadForm(forms.Form): for ev in self.evidences: Build(ev[1], user) + + +class UserTagForm(forms.Form): + tag = forms.CharField(label=_("Tag")) + + def __init__(self, *args, **kwargs): + self.uuid = kwargs.pop('uuid', None) + super().__init__(*args, **kwargs) + + def clean(self): + data = self.cleaned_data.get('tag') + if not data: + return False + self.tag = data + return True + + def save(self, user, commit=True): + if not commit: + return + + Annotation.objects.create( + uuid=self.uuid, + owner=user, + type=Annotation.Type.SYSTEM, + key='CUSTOM_ID', + value=self.tag + ) diff --git a/evidence/templates/ev_details.html b/evidence/templates/ev_details.html index 2289f84..e589d2f 100644 --- a/evidence/templates/ev_details.html +++ b/evidence/templates/ev_details.html @@ -45,5 +45,29 @@ {% endfor %}
    • +
    + {% load django_bootstrap5 %} +
    +
    + {% csrf_token %} + {% if form.errors %} + + {% endif %} + {% bootstrap_form form %} +
    + {% translate "Cancel" %} + +
    +
    +
    +
    {% endblock %} diff --git a/evidence/views.py b/evidence/views.py index 58a0d56..a9459e1 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -7,7 +7,7 @@ from django.views.generic.edit import ( from dashboard.mixins import DashboardView, Http403 from evidence.models import Evidence -from evidence.forms import UploadForm +from evidence.forms import UploadForm, UserTagForm # from django.shortcuts import render # from rest_framework import viewsets # from snapshot.serializers import SnapshotSerializer @@ -51,12 +51,14 @@ class UploadView(DashboardView, FormView): response = super().form_invalid(form) return response - -class EvidenceView(DashboardView, TemplateView): + +class EvidenceView(DashboardView, FormView): template_name = "ev_details.html" section = "evidences" title = _("Evidences") breadcrumb = "Evidences / Details" + success_url = reverse_lazy('evidence:list') + form_class = UserTagForm def get(self, request, *args, **kwargs): self.pk = kwargs['pk'] @@ -73,3 +75,22 @@ class EvidenceView(DashboardView, TemplateView): 'object': self.object, }) return context + + def get_form_kwargs(self): + self.pk = self.kwargs.get('pk') + kwargs = super().get_form_kwargs() + kwargs['uuid'] = self.pk + return kwargs + + def form_valid(self, form): + form.save(self.request.user) + response = super().form_valid(form) + return response + + def form_invalid(self, form): + response = super().form_invalid(form) + return response + + def get_success_url(self): + success_url = reverse_lazy('evidence:details', args=[self.pk]) + return success_url diff --git a/lot/views.py b/lot/views.py index 0045d16..280450e 100644 --- a/lot/views.py +++ b/lot/views.py @@ -162,7 +162,7 @@ class LotDocumentsView(DashboardView, TemplateView): template_name = "documents.html" title = _("New Document") breadcrumb = "Device / New document" - + def get_context_data(self, **kwargs): self.pk = kwargs.get('pk') context = super().get_context_data(**kwargs) @@ -185,7 +185,7 @@ class LotAnnotationsView(DashboardView, TemplateView): template_name = "annotations.html" title = _("New Annotation") breadcrumb = "Device / New annotation" - + def get_context_data(self, **kwargs): self.pk = kwargs.get('pk') context = super().get_context_data(**kwargs) @@ -203,7 +203,7 @@ class LotAnnotationsView(DashboardView, TemplateView): }) return context - + class LotAddAnnotationView(DashboardView, CreateView): template_name = "new_annotation.html" title = _("New Annotation") -- 2.30.2 From 435e18c8b6b4c62f29ac1255b56956266e8d3192 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 1 Aug 2024 17:33:23 +0200 Subject: [PATCH 19/26] Download evidence from evidence details --- evidence/templates/ev_details.html | 3 +++ evidence/urls.py | 1 + evidence/views.py | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/evidence/templates/ev_details.html b/evidence/templates/ev_details.html index e589d2f..4c3fdbf 100644 --- a/evidence/templates/ev_details.html +++ b/evidence/templates/ev_details.html @@ -16,6 +16,9 @@
  • +
  • + Download File +
    • diff --git a/evidence/urls.py b/evidence/urls.py index 060ce52..872073a 100644 --- a/evidence/urls.py +++ b/evidence/urls.py @@ -17,4 +17,5 @@ urlpatterns = [ path("", views.ListEvidencesView.as_view(), name="list"), path("upload", views.UploadView.as_view(), name="upload"), path("", views.EvidenceView.as_view(), name="details"), + path("/download", views.DownloadEvidenceView.as_view(), name="download"), ] diff --git a/evidence/views.py b/evidence/views.py index a9459e1..d5ff542 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -1,3 +1,6 @@ +import json + +from django.http import HttpResponse from django.utils.translation import gettext_lazy as _ from django.views.generic.base import TemplateView from django.urls import reverse_lazy @@ -94,3 +97,18 @@ class EvidenceView(DashboardView, FormView): def get_success_url(self): success_url = reverse_lazy('evidence:details', args=[self.pk]) return success_url + + +class DownloadEvidenceView(DashboardView, TemplateView): + + def get(self, request, *args, **kwargs): + pk = kwargs['pk'] + evidence = Evidence(pk) + if evidence.owner != self.request.user: + raise Http403() + + evidence.get_doc() + data = json.dumps(evidence.doc) + response = HttpResponse(data, content_type="application/json") + response['Content-Disposition'] = 'attachment; filename={}'.format("credential.json") + return response -- 2.30.2 From 260b7db7656e310865e57eada12b106bd6e28624 Mon Sep 17 00:00:00 2001 From: pedro Date: Fri, 2 Aug 2024 13:05:02 +0200 Subject: [PATCH 20/26] add minimal docker support for debugging --- db/.gitignore | 6 +++ docker-compose.yml | 12 ++++++ docker/devicehub-django.Dockerfile | 35 +++++++++++++++++ docker/devicehub-django.entrypoint.sh | 56 +++++++++++++++++++++++++++ 4 files changed, 109 insertions(+) create mode 100644 db/.gitignore create mode 100644 docker-compose.yml create mode 100644 docker/devicehub-django.Dockerfile create mode 100644 docker/devicehub-django.entrypoint.sh diff --git a/db/.gitignore b/db/.gitignore new file mode 100644 index 0000000..2171e8d --- /dev/null +++ b/db/.gitignore @@ -0,0 +1,6 @@ +# src https://stackoverflow.com/questions/115983/how-do-i-add-an-empty-directory-to-a-git-repository + +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..b6e2d01 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +services: + devicehub-django: + init: true + build: + dockerfile: docker/devicehub-django.Dockerfile + environment: + DEBUG: true + volumes: + - .:/opt/devicehub-django + ports: + - 8000:8000 + diff --git a/docker/devicehub-django.Dockerfile b/docker/devicehub-django.Dockerfile new file mode 100644 index 0000000..2f734b4 --- /dev/null +++ b/docker/devicehub-django.Dockerfile @@ -0,0 +1,35 @@ +FROM python:3.11.7-slim-bookworm + +# last line is dependencies for weasyprint (for generating pdfs in lafede pilot) https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#debian-11 +RUN apt update && \ + apt-get install -y \ + python3-xapian \ + git \ + sqlite3 \ + jq \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /opt/devicehub-django + +# reduce size (python specifics) -> src https://stackoverflow.com/questions/74616667/removing-pip-cache-after-installing-dependencies-in-docker-image +ENV PYTHONDONTWRITEBYTECODE=1 +# here document in dockerfile src https://stackoverflow.com/questions/40359282/launch-a-cat-command-unix-into-dockerfile +RUN cat > /etc/pip.conf < Date: Mon, 5 Aug 2024 13:32:52 +0200 Subject: [PATCH 21/26] Import device from a file --- dashboard/templates/base.html | 2 +- device/forms.py | 6 +- device/templates/details.html | 8 -- evidence/forms.py | 125 +++++++++++++++++++++++++ evidence/urls.py | 1 + evidence/views.py | 25 ++++- example/placeholders1.ods | Bin 0 -> 13284 bytes example/{ => snapshots}/snapshot1.json | 0 requirements.txt | 6 +- reset.sh | 2 +- 10 files changed, 160 insertions(+), 15 deletions(-) create mode 100644 example/placeholders1.ods rename example/{ => snapshots}/snapshot1.json (100%) diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html index bcf569f..67c7573 100644 --- a/dashboard/templates/base.html +++ b/dashboard/templates/base.html @@ -132,7 +132,7 @@
    • - + {% trans 'Upload Spreadsheet' %}
      • diff --git a/device/forms.py b/device/forms.py index 1c1c5e7..e83aed2 100644 --- a/device/forms.py +++ b/device/forms.py @@ -5,7 +5,7 @@ import datetime from django import forms from evidence.models import Annotation -from evidence.xapian import search, index +from evidence.xapian import index DEVICE_TYPES = [ ("Desktop", "Desktop"), @@ -62,8 +62,6 @@ class BaseDeviceFormSet(forms.BaseFormSet): if not device: return - device["manufacturer"] = "" - device["model"] = tag doc["device"] = device @@ -71,10 +69,12 @@ class BaseDeviceFormSet(forms.BaseFormSet): doc["kv"] = kv date = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S") + if doc: doc["uuid"] = self.uuid doc["endTime"] = date doc["software"] = "DeviceHub" + doc["CUSTOMER_ID"] = tag doc["type"] = "WebSnapshot" diff --git a/device/templates/details.html b/device/templates/details.html index 30e7cfb..577e823 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -40,14 +40,6 @@
      Details
      -
      - (Edit Device) -
      -
      -
      -
      - -
      Phid
      {{ object.id }}
      diff --git a/evidence/forms.py b/evidence/forms.py index 7eaf0ca..6e6ad8a 100644 --- a/evidence/forms.py +++ b/evidence/forms.py @@ -1,10 +1,16 @@ import json +import uuid +import hashlib +import datetime +import pandas as pd from django import forms from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ from utils.forms import MultipleFileField +from device.models import Device from evidence.parse import Build +from evidence.xapian import index from evidence.models import Annotation @@ -73,3 +79,122 @@ class UserTagForm(forms.Form): key='CUSTOM_ID', value=self.tag ) + + +class ImportForm(forms.Form): + file_import = forms.FileField(label=_("File to import")) + + def __init__(self, *args, **kwargs): + + self.rows = [] + self.properties = {} + self.user = kwargs.pop('user') + super().__init__(*args, **kwargs) + + def clean_file_import(self): + data = self.cleaned_data["file_import"] + + self.file_name = data.name + df = pd.read_excel(data) + df.fillna('', inplace=True) + + data_pd = df.to_dict(orient='index') + + if not data_pd or df.last_valid_index() is None: + self.exception(_("The file you try to import is empty!")) + + for n in data_pd.keys(): + # import pdb; pdb.set_trace() + if 'type' not in [x.lower() for x in data_pd[n]]: + raise ValidationError("You need a column with name 'type'") + + + for k, v in data_pd[n].items(): + if k.lower() == "type": + if v not in Device.Types.values: + raise ValidationError("{} is not a valid device".format(v)) + + self.rows.append(data_pd[n]) + + return data + + def save(self, commit=True): + table = [] + for row in self.rows: + table.append(self.create_annotation(row)) + + if commit: + for doc, cred in table: + cred.save() + self.index(doc) + return table + + return + + def create_annotation(self, row): + doc = self.create_doc(row) + if not doc: + return [] + + data = { + 'uuid': doc['uuid'], + 'owner': self.user, + 'type': Annotation.Type.SYSTEM, + 'key': 'CUSTOM_ID', + 'value': doc['CUSTOMER_ID'], + } + + return [doc, Annotation(**data)] + + def index(self, doc): + _uuid = doc['uuid'] + ev = json.dumps(doc) + index(_uuid, ev) + + def create_doc(self, row): + doc = {} + device = {"manufacturer": "", "model": ""} + kv = {} + _uuid = str(uuid.uuid4()) + tag = hashlib.sha3_256(_uuid.encode()).hexdigest() + + + for k, v in row.items(): + if k.upper() == "CUSTOM_ID": + tag = v + + if not v: + continue + + if k.lower() == "type": + device["type"] = v + elif k.lower() == "amount": + try: + device["amount"] = int(v) + except Exception: + device["amount"] = 1 + + else: + kv[k] = v + + if 'amount' not in row.keys(): + device["amount"] = 1 + + if not device: + return + + doc["device"] = device + + if kv: + doc["kv"] = kv + + date = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S") + + if doc: + doc["uuid"] = _uuid + doc["endTime"] = date + doc["software"] = "DeviceHub" + doc["CUSTOMER_ID"] = tag + doc["type"] = "WebSnapshot" + + return doc diff --git a/evidence/urls.py b/evidence/urls.py index 872073a..d4dff01 100644 --- a/evidence/urls.py +++ b/evidence/urls.py @@ -16,6 +16,7 @@ app_name = 'evidence' urlpatterns = [ path("", views.ListEvidencesView.as_view(), name="list"), path("upload", views.UploadView.as_view(), name="upload"), + path("import", views.ImportView.as_view(), name="import"), path("", views.EvidenceView.as_view(), name="details"), path("/download", views.DownloadEvidenceView.as_view(), name="download"), ] diff --git a/evidence/views.py b/evidence/views.py index d5ff542..1e02c7e 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -10,7 +10,7 @@ from django.views.generic.edit import ( from dashboard.mixins import DashboardView, Http403 from evidence.models import Evidence -from evidence.forms import UploadForm, UserTagForm +from evidence.forms import UploadForm, UserTagForm, ImportForm # from django.shortcuts import render # from rest_framework import viewsets # from snapshot.serializers import SnapshotSerializer @@ -55,6 +55,29 @@ class UploadView(DashboardView, FormView): return response +class ImportView(DashboardView, FormView): + template_name = "upload.html" + section = "evidences" + title = _("Import Evidence") + breadcrumb = "Evidences / Import" + success_url = reverse_lazy('evidence:list') + form_class = ImportForm + + def get_form_kwargs(self): + kwargs = super().get_form_kwargs() + kwargs['user'] = self.request.user + return kwargs + + def form_valid(self, form): + form.save() + response = super().form_valid(form) + return response + + def form_invalid(self, form): + response = super().form_invalid(form) + return response + + class EvidenceView(DashboardView, FormView): template_name = "ev_details.html" section = "evidences" diff --git a/example/placeholders1.ods b/example/placeholders1.ods new file mode 100644 index 0000000000000000000000000000000000000000..414816577dd4550760d8ce4fdf4564963d739da8 GIT binary patch literal 13284 zcmbt*1yo!~w>9n(T!IA+?ry<7H16)!ST_U@PH-o<1c%0g1czV&0t9yt?gZCIzW2|U znRzqw-uvI_b=RtU*WJ6S&Z(-duCp7U01Jl;1%(6!)vE`u6Ku~P&H@Dm_49gq1m$4k zU;*-QvM_OSvbQla0ogbLS>1rDX41rWsI>f~Z!V(w~fVF3dC zf%A#x-$wjYl5hlC+E{^I{>A3X!3uJ8w0ANATG+GxJ&yb@a5fGmRu-{LctcpGp|_T;ay%1G}>l&aEEBav!145FSSJ{XsYCw?q*M{S4eX% zN7tqwn2>yls44DL=Q5+G8IZNE+hG)FW@#*#7nqx=XCzM}J+Tce$YyAA2Qu&*B?mL} zqS=pp%zODJ?T3(Z3uWgdpR+7lZ*4RZGFgb}tLdM68(IYcUVQ7UL zhAXXAhx&ob-bvP;hi0DO@t%`qszl=qjzi_$Wpv-nvE796P7m)_EBnsz`u&l+=Bcc=$U8L*StrrUAkSScNUgO3A8+7>@qJBzy6S9y}c_opoErb3g9UgZzGpIe&QyS*Q(j**fE z-9pPP*l9QM8Kyb!e7yi6)R8{%*VGHaK|MtC`C{TfUM@;fGautgz2Iw31iEpVVwof& z*oey#7J8_z1oJco#8$MwF{*Xj*LaxeF)}-ivJ|yS@gqzTe+Xr?mX{YDweqH%&dJq! zt|u}O7<^>*W`Pc6?d_6?{9@MSh)#{N=@G1nU(F_gQz(v$*Rnj#UC;N{Q8zJ_YtbTPbFq=UMBe79qp8=P3^}@HG|FVi7spCJmvq&@Ki2abH8Q z;p1!e{g!iI_Sa6kOmKlQ52R4z95;oB(PY*QS{Ju$YhcX^ShC`07r9bjb=Jj7T_k$n z9iw_Av>5m`jM*^oGX-yIU<6a?6JR{P{?=4AIQF)OcaxYdi9R_^$0h}Su#<(F=V3vB&BD!?gTtgw9zYRVzP`^sLE z0PtJZ*>7NJw`TY9_Rb#yV%E8IoJab4diahs#Bx%i?rC?fTGO=IPX?+vxCp+@9e;JR54%kC>-FWY8}Oii!^o6eCdc!NWhSBo7~2-k+bky;+=dN-cMUDycxhIs}H1?<=s4 zIkHc_XI2*KcK&#nBfZrG-8XeuycN-V7^zdVu7Gy1DNNTjVN_WyGxv54Eqdcr+rFV1 zV1jSjaxLCnUkK6yi2z^=cv#vtZj(z9jRs1l+IpDr#3n!8=CDwK=;{>$u&Jo zX{$!)?8LBZ)Ykh6%Js=N~(KChHU|cJ>cn%CnC@r^El+QOCa&ImLvf{1Y71@h(d5oak zg_$^mzUh~Cshz?y*4>|=5#T5Ezq5;>Bf@>dwhyjPp30(--{JGka{Kyab9k(s+Tnt^ zjg)Zv5ZVsJA*nCT}JR<6c#Tjd7zIuYY z&W@l(m`~>nfZN$T)uCW2{0ysobyA;*kH;kQ@2^T0fjw}AZ~)_(Jn zR6K|a3qw9`Mj@qLt-39U1#nX%q89pa6EdO>-%TnnscXeH+@Jq^pJhLns$H$Z)sjzd z^uj@EIT2ee$Y}6g$8E>~HgMoTs}g(c8x~qVYjWn5OBspPo;5J;Jk-kYH>Uj?OMDCmwFy&Y${doUSLm zj#q99+sd`B6;18j?oXU*&3p`fb5Hkk)lxoxIQ4;pf-=Sbr|%+^r&Y@pfn5k3)*j4;cDY51B@Ii)_6@)i zGMRRw9ahki=1{;iEmpOBv~|0Yal&+UN)O;NS`#GVJB*}5K3F#lTIKi>04Mi-8N0=A zo%*nz<0vVNg@px130#gmh*%g6vvPdG%=C&6h~=s}P%_B7Fce%AxusTs=cvXb<04p9 zsBsJ(c9V_S&gY9WR5EA3|NMr~EJ=XIm@mV980JT-;jFrnd%z9-53}TySiny|Arm`^{bz;C+c(c#?xsXV|rT?wPdfd_zm zf`8I4Hu@D3#?YsPLBG2_TrH^<{M6Uv8l3p~JY}CiRO)ne@KgLH5f%xY?WpY|n*%iL*^$jp%;7RF?ww>WzPMRy5Wrf2p z5MJ|(htPJ?&#BC7G^RqT zn_%t<)dXDkY1Uq@7cbnGQG}o%Bmv zB2f*6(WJKt{W+nORJ{Zdnn@R~#0v!sp2sVXsm!U+HAyMQhlxmee={yyv{4(E+Dbi{ zY6jBPBXUeUMzn$}Ae*4TF5`tEEW>UxNU2!%@vfLNhptv_4FapM#xQf?#b_G)P29!p z!+tK>%F)p2{sF&0x`(YRtYThmUW=Z7zH{mN$IudQ%`~1?Gkz^piLKu4N@(WDx)F?w@(v4ywC4&(W@dLO2#}Nc3ig(O+TX4_koZ#b#@3u4!VeEG1 z&&$~54@&eQ(wg_U=f@J~)Vpvb!vuKNb=&NkO6iPC#5D7?wN9MD$|SnspXo){0Xce# zH4sq$!V6u_a{S_OY?@uUa7?7!@`yxm)T$kAf#(+|*<8LPpY;Xnh9Cq1i6tB{&>SYT zr&d1v_UL#m(#Uf5g&S27*K>z6{-KqkuKXnnMMr~joum#b-38D1P7Mu`u07iZ6>b-u zZjLP;FYg~-$8;Is_d>VKbipD478EJ5k+RSNwEo+S#%J%xOtRh!?qKE8*7V72!P{NgL>4 zZ)uBtKE^z$G@FyILn`sOpuvLv)o?U)t5Ul*BoHKoZQXn{)0z?%pXb%yvnoYL6R41% zq7*{wUC~755TMFhU9qoWWTEV|VY-kM;W&{L!LD_IJ#VmTuH_3YXh?pc__4LJI>Wr# z@JywvQpFn1?eco~|@qbc=l zsa*VgYgD^+B73Le{vErHP^DM4g|f@x?!KrbrEWG425*9xr-nwdnSkVCAb8Vsd;T)l~y|!2Raqs>jOW1dh`Byn+$6f@&NS6P5|GOm483W74I14Y1Slq zrD?9H%kb6Uv=5lW3!g6khI5tA{k!DFC)i2%YERtDn~OlP%lpGNVty~;5S*AS9_*rg z+w~WpT?==Sqlx)+bY(K#s=R|f5N94Rx=y%Es0^mKsppB(3EIx>ikh%LbRTJ$#uU0K z3y#dJP4mX8k=@&nqmzG$7G4}*Tl_KCg;ndkYR1B+I1z0`S@&`I*bDgrt;lK_sKOfS zJ2F8UPT(2wO)tb!s4>ka%sBEUj(CCPbLEh`Xsz=(Bl*BNe?0XC>FTz`anCo2W4JzQ znOJY!9&P<0s9EBezP=Jn-!~O3eLlz7^Zm&lwe3_cJ_n zd|{nIGt3V$rqkZ|1VbZxGR{$&J%+gqscgFZxmnUe>V6DcTzomj9Nw|Ch^RjI9%llJ zV4*LrO3B zdK=DAs(LY+6ofeJ5fouo-W!#a+x~DV`pozH?2&C8!gt=dj}`20##QMMygXzCyoj8U}&2s)Mbty5#a__A4tl*-LJ5wCbr~1H z5LJ021lk$K;jvCUscU`1*7nHP%Wf9-tpkbG=RX)nGg54y^V=sIH5*o1oV$j@o#D)8 zl&9mE^3wFXfc=fnDC<m*6t@FnHBp%>T2;Z!L^&CU)IG42tD-2m;9aspF-ry4Fe=R>zv3APU>b*}w;uUk7R3fayv`7vIC;col$B#1nd z1yQP2Il`-9wJX|1o0|Zlil1|7U%ZIjHO%g$c6s@#6NiJxoNFVSeEEU;3R4{yelhPW zCi{wT$7Uln2Cg!D2)~#EKvAbqUXx{nF)1R`Y|dT12&%I(*btG4lhTNM(g%XJ(u*ek zB1#*&-2K|@CHAdDcbfz|uW`jRUy!V4nt&<~UtA1Vi&Ff|cOR18k#{tQBl!X=W1@Jk zjNzH4YvsF9KIBNec7C7kCd=4bM6(z&GAxV{#4Fw>f!gglD~f%^j#I>9)M=;C9i@#B z9*KRHQCUE)vi&H8VxXl|gXr|qjWq&7ERGNld(C*xj;=7dGpMb(pi%@KhUyHxOAN=C ztTzDkhl1}24d8)tE5O8Sya4%K^`fz@$aC8OM2%zVEZ4WOz~k;YMb2&Fybml zbSfsS@=XNUxeL>ER`9hKijYAT4+FXkbVgAdaSh^iyjr}i1Pqaj@)Q*&j{RH7Fw(X&4ZEl*+b82ljOdRhtM%+|*+~|s`?V>YmBQ){?LCVF$7P(hJ#O%! z%2fA`j(0hH$iooq#bw*OL!EVD=BrKhWYp;tj-%~bM>o9wk&ol`3>Pm|E&R+I4jP5) z1B(U#2k31vm)>_nJW0j=d$6taHiJHaq^;LnQ&u$&mRd|Wk+64sjtu?rb(<2)wY%W5 z0v_hFrE$n?H%Y0Ik5j=8DPugBXgU=bn0_`^KJx(4BuCr28nxB!)ov_K?=mrxXO+EMSbjbDDSFCtd%G*5^BE>k1p6i?=z;qaH2$}Y;5G>;1`1~R706_3n9Nv5B0;X; z<3TB~bK{V*tSQ(JIqV&j0u}g1Aj7(z6(tJ0-BCQ1k>P-0W8^zea2`-V~(r z)dG!Zw-txC^#}b?Rb^!3WacU6bk2YWLAUMW(^)Sf(xda9^&E~U^US_XPLYQ~o|jEszw%mOc& zxtQ2_xR_}Iy14YDzL{DoO?bDP0vgO-)S+O?xR_XE_6qy1u!Rsh6Iqt(K*`wWgGXftHJ| zl!=kCjj6t;sRGDU&BapB)z-+z65wT{?qzRiYG!F>=W6BRXY1r<XYwGK2&Ckqgt=P=db!1USw;uAMFx7M2ivEHfj>loi{rgMzV{A)7akCq z6cC*n7N3z26_%J7lNlG9kr|7@sG{jWu23?9bcP14>t6S*7VKP^)EDk z8E^W!)b?$$acHGwbgi>I>C4BA?%MpWPZfjpxkF6_{mqastsh6*O8Pq+X1XBr1N94| zt!txgU0((}2PZ!d&wUx2n;hz%8||B!o$a67?p-*ZSXdukIUHI$n_J(T-a21Ce%PGu z+gKbwS?W7l9r?bxw7W8~v%c_S_3O#{*y-ln`Oe(k&cx0B;^WEU`uEMX&E4-i`#axP z_V+gS_V&K-|M>pne*ffb@9b{x=JCh=_mjijtHag%i=7{5XJ;4JXLk=*=VuRhXAch# zPZQzs@v&1S^l2VFJC>6aQ-3peuz(Cuza&LGZeZ$;4yYlVf|av&kC&AyLqfn?%cG45 zK(rmxt$QaIB~!X4W=o7!^-^WeU%;m2xdChWi8y1bXD=)u!oKAhS01*Ek`Q0b;QGDg z&0~8*^9pyuhH$3b>HYA_!E?V`k=tc=@5^eK7jrUD(CWE2pS)e?!F$bmBi?bMdXp6& z3>pmgZod*-2Q7f^YBlVNZ>{66m=V!qHF~TXzR+!??JSK0ggHExB03utBm!K+M9|sm zMhX~@hV5!%R0DMVD8`Zu3v)1qjIM72D>zdP=cGYwU$_`;xis1>P>59|gm2;#u}@w0 zbz%?<9$X@3K^8Mod5JV&!E`6s>O?rM!SqN$c+xEmpnPe-9Q^dGBKN>g5Kq zLTS_ofIoK;)jdPRlk_S$a2=j-P;vzI9-a=18dtKrVLJ!b`6 zm1^$T5>m4p(uW_y#sB?j&`<#$awRtF*Mmod8p{o_>+ zlpE-s7DqIbc4>I?=3YzDXCik~HEc+$Mr?&J13%?qj5F==JfOz%-_W3H?ErOm{Gkba(=k>h+dw|b*+NB}5l<{6_Zdu*D6fe=oa&%Ty1Q=AAxa75gV+?%r`ztW^Xf zPaX%#I4X4ta62sDv<+LHdG(lMw*krq$mH7P1@@&%3>)2Fqi$91j#PQIzdumh4jFl$ z&b^A3Q=BEjde z`W9;L#w%%M%tTP>njdD0KKGP0x$d{s6m_M|!tc*oIxclI&MAHm^zEMh7V8r!>T@m^ z?~AH3E4MouO1VrYu-ZD()ks{m&fv#D6dy+QrBuxz&}GsLWI3hCXW_ahaTVOl*X-L zCx^`@E7tyU$BJ}{=8B2isenVjB77uBNm9f_=Dm+H^2)=z=+~# zmsr22e>j3}J*lYF^I5ajxDy8k5V~guX`jk@_2`&p;E{5yj!ViI!uoxV1m zOw)JEO7ThLq6Iy^C0{-0ogVam*vCBrM*1&DVT*^qCfg@aIBI1NG$wU7$mEl-E9AMj zQ3{AUI!VU!s&Wq-WOez-Zydj2-4-(QJewvt9~oa*t^ijkEV|q2lkcLd;BVArK5DK| zx(FSsy)R>+%xq)ytL4uc)0fIY(I}=Y)u=>cobp`&-(S6UpGCS@E(+vgVoT{|6ijZs zXW$|}IVn5(RHDkAoh>KacH;16zvYo0tEPmh>0PB;jBcZfc84ek^=!=cThpZbgdoQ} zd718ci_4}dPwHmE+0ujZ_K7;G#bj%ddV)b zg?4jw`+Ar!D$%`rid66D@*PThj18T8j$LavsB*zJ2F22?3HvU2>~3?XHodGxJ_&W! zJJZcoBTL<_i?5G()eglvSq&dcW;B-{cYL*wIS-QtMaMnlMw81PwWImjjl`$@_cwaB zBH7#VfDAHuT;Ty7Hm}pSlYq#a36*Psq0L>beUHkP$l`+1mYZn7yF@TFcXmg*T^jyt zt?TuMsfepVn2oH&J#Z<8Jb_|ieN@+uNBye2gVprWirK-HreE*jM=j6c@qknZfG&J= z9Iwh8G$6)}M~~PmmV{VD{Z!wgITq|72*$zhm(p%?I{LsifD^uv-eOpL%VgVupHrAT zmTp)z3yg?Y(M&qiv(N~aUm_nsFeu0UD(d^3f+%6Yqf$r0BdS)lb#0u3`U^Gn$MIVs zr7c?rW>TCQpa#3DR9$?@=8t54Wvx`gEt5t=KSyxn@<`rC+%F*(BVG>~BjW}+sjHRM zdM=$z87IaoFHG#m8N4>_>YHCX^pa~V1*o-IHoqcL_TUa7|45j)>8UHz)JfN)C@O!p zHUHU%tP~%qoip7iQ+%{@?@1moh^bjB3b`1rMW~@s=iZt_^yu902V-ULTwzHl5<+%x zY2KTm)@l0*`kh2?*HrC6dDWy1-EyfUX|*5R37Jf_i1|BDKFwU-o5(`-%HTDS=$?xY z2hA=mFdFU08DWm?H64*Fts{k(^wCu&wR@-3^DvBlVYX3PL%bg-^B)2{CV>xrlNnDN z#IJZnL;}K^CHn82pXEAX2_6T?mKbc{eC0HA@JnU>`pI(f>0n~Y*qF2 zyt{L6DP@dJ#dD{Fc)(FhUUEvyIsOWho79#Sx?Ge#Ng1<0xk!3G;!*L<1m97ytm?{I zlPgn+H03qJa~W6-EGzq%7Gn*!vQAe#F&rd~C@S%D0wJwzc{>OX;yUAunB(4*@O9%A zBV=w%p#9Jml5&wyb}WHExkWJ2REJM4BJ1ha2sE|=g|?=6kh^#xlcIR0JL+b8= zMeCo{+fL{RI~{B9*+T5p%S7gM`|wkKOwEZnkr%udYG%^4F!e;h`w@Y>Q~GeXeC^>E zh7h0q-xyYs%X>5F3uJOzD<5?A1+S`B>|Ye?FSE z5n|O5aRk^wXl+&t6o)>&m83V``^NWR1$U|e#CC*So?69yG_2*FdNnz#8{=M%bus!w z$#sBIKn>)C(G#@D#CSgwe7NO62cC)<7J6cKEqox&8ODeCm(qpIuaz4ZejA^`>Ueq<3uBvOxT|R+a5;Z@x zUu@M}e`wq$Dv@T+i>K|m+f|KInvwL?VAlfIPbp3r1ka=EO_JF)8rFN&)=f3)*{KXp zrIo1WkLg-@EiCW|l?7idS>~#lm~%|dpf?wSElb&vBgYnX1v5%1mtkagw@SOjWP-}m zMfvphgbM057v$}fbe~*P|05_0|)fUaj}uqoYG$8%hEjOpd6Q#+Sf)jGLhbZ)ft z22D=o0Ae5jxSzUVtNc8)CI7WG=pu8fOfSCX=3LLNtgH^0Utc$@o#*g0f;2Si$C-)j zH&bM_eC)Hnr007=&VP>bgosKj^YZrzab+%Yr@NI!8kX*M!V&tAI*aF{Z`-UP8k=!b zy5H|@CA{AD)lOk%YRiuJ;`I=3h{&4WKV&Q`gt~-MyS*ywBZv5TY6_eFKk@kyGpms++WZYE3 zts2vAUWTTGWN}i5^uQFw#lY?W2$2XevNyJa=y$fHte#%N5h+wQE<1D;7P{Z8TyPkE zaZ@rRDxB0G+R~ySv#*WWmK~h;pPx-&ax#i>p8KlNY;xzrtY^1@vMDl9Mp)!Ju-7^t z5`Mt&$ao*-oH!M&+EtrYMi+!H#tc`VT8{{fgK3MsJ+nS9J=OQox4SP0pPB>1f7Dl+ zt|@3)@oYfHV}g@6qRGPZI!r)4P(y+tD3Q6{e-+$L$?8 zC_uZDoRSR&OU-Z$j%y!0n{VDv%~3Q=4n^*eD72Wu5hw%3#i8 zzk%+kB}Ba}dE|z=%TupnoBAOx%6B_)SB%^NB30^%IIU|(;80oT7ELdJipIA>kcfnsZs+jV>_1s^<{uqbZ@(&8dook9GaPkpzES+MH-x`O-&lBi5ua$=5D$M#5 zwO?92OJ6K;pTsh)A$xu?FkKE~-&#Mzz3=s?;a9cjR=0zv3;XVSZSjEL`-=IHjj*vY z^90FBiTDY5a;Q2-S4`Pc$5s-h=|!dv!RDOI(DCl5%#2sPRukd!=TdM*P@@9|-l)bku3!Mj`u(T$Js!Aknv)=mZ)|u09}fs+NmPC~BX}TkIAqXpJUSx>*h{fuSFWR+M>;~wj8ni z0Q2*B_e$^W3-%`wDASXq3ZMWDgA4WdQv09r`DMQe@BfVY^#&BwPj&h)Q-3P{leGSi zwg19FLH!ih|FX!Z;-7i`i`4$_$$kpNe_8)i@y}#`l-~b6(;vGB`{c&|!t^^S{@?Tb zJU#zqf`7sDOPc@pEPrf`^Ix$1UaJ51Jb!FW$zSmNlJ5UcS(g8T<(HKI?^*sBD?FJ0 z>ft|1`~Q>aH+A~&b?ZM9*S}2piRs^K$CK3mw?X_H^7q>4pSt#67X6g9c>2f5zf|sj zM*Uu!_)|Ci%gmoLC}zJ@)PDy4KKK4JPx8xtrcHhc8UKv?eRAfH9dyO{W1jvu53J7@lzRT`iGkMQ#~tf!B~)1qU;`t$BT0OU}D0ssI2 literal 0 HcmV?d00001 diff --git a/example/snapshot1.json b/example/snapshots/snapshot1.json similarity index 100% rename from example/snapshot1.json rename to example/snapshots/snapshot1.json diff --git a/requirements.txt b/requirements.txt index 2357fe8..9d4492f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,9 @@ Django==5.0.6 django-bootstrap5==24.2 django-extensions==3.2.3 djangorestframework==3.15.1 -py-dmidecode==0.1.3 python-decouple==3.3 +py-dmidecode==0.1.3 +pandas==2.2.2 +xlrd==2.0.1 +odfpy==1.4.1 + diff --git a/reset.sh b/reset.sh index a3bd06b..3b634ae 100644 --- a/reset.sh +++ b/reset.sh @@ -1,4 +1,4 @@ rm db/* ./manage.py migrate ./manage.py add_user user@example.org 1234 -./manage.py up_snapshots example/ user@example.org +./manage.py up_snapshots example/snapshots/ user@example.org -- 2.30.2 From 468abb2c2f9f4ac3796603256f08d62a7531d345 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 5 Aug 2024 15:06:34 +0200 Subject: [PATCH 22/26] add evidences in details of device --- device/models.py | 20 ++++++++++++++++---- device/templates/details.html | 9 +++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/device/models.py b/device/models.py index ce874fd..f1b1ee7 100644 --- a/device/models.py +++ b/device/models.py @@ -43,11 +43,11 @@ class Device: self.get_hids() self.get_evidences() self.get_lots() - + def get_annotations(self): if self.annotations: return self.annotations - + self.annotations = Annotation.objects.filter( type=Annotation.Type.SYSTEM, value=self.id @@ -69,7 +69,7 @@ class Device: type=Annotation.Type.USER ) return annotations - + def get_user_documents(self): if not self.uuids: self.get_uuids() @@ -80,7 +80,7 @@ class Device: type=Annotation.Type.DOCUMENT ) return annotations - + def get_uuids(self): for a in self.get_annotations(): if a.uuid not in self.uuids: @@ -125,6 +125,18 @@ class Device: # owner=user # ).annotate(num_lots=models.Count('lot')).filter(num_lots=0) + @property + def is_websnapshot(self): + if not self.last_evidence: + self.get_last_evidence() + return self.last_evidence.doc['type'] == "WebSnapshot" + + @property + def last_user_evidence(self): + if not self.last_evidence: + self.get_last_evidence() + return self.last_evidence.doc['kv'].items() + @property def manufacturer(self): if not self.last_evidence: diff --git a/device/templates/details.html b/device/templates/details.html index 577e823..3881c1a 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -49,6 +49,14 @@
      {{ object.type }}
      + {% if object.is_websnapshot %} + {% for k, v in object.last_user_evidence %} +
      +
      {{ k }}
      +
      {{ v|default:"" }}
      +
      + {% endfor %} + {% else %}
      Manufacturer
      {{ object.manufacturer|default:"" }}
      @@ -63,6 +71,7 @@
      Serial Number
      {{ object.last_evidence.doc.device.serialNumber|default:"" }}
      + {% endif %}
      Identifiers
      -- 2.30.2 From 247ba5bd15fbbb3d0e8c737c306afad616d60e2e Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 5 Aug 2024 15:07:29 +0200 Subject: [PATCH 23/26] refactor of create a new placeholder from excel or form --- device/forms.py | 65 +++++------------------ device/templates/new_device.html | 2 +- evidence/forms.py | 82 +++-------------------------- utils/device.py | 89 ++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 129 deletions(-) create mode 100644 utils/device.py diff --git a/device/forms.py b/device/forms.py index e83aed2..b6c1d21 100644 --- a/device/forms.py +++ b/device/forms.py @@ -1,11 +1,6 @@ -import json -import uuid -import hashlib -import datetime - from django import forms -from evidence.models import Annotation -from evidence.xapian import index +from utils.device import create_annotation, create_doc, create_index + DEVICE_TYPES = [ ("Desktop", "Desktop"), @@ -28,7 +23,7 @@ DEVICE_TYPES = [ class DeviceForm(forms.Form): type = forms.ChoiceField(choices = DEVICE_TYPES, required=False) amount = forms.IntegerField(required=False, initial=1) - tag = forms.CharField(required=False) + customer_id = forms.CharField(required=False) name = forms.CharField(required=False) value = forms.CharField(required=False) @@ -42,63 +37,29 @@ class BaseDeviceFormSet(forms.BaseFormSet): def save(self, user, commit=True): self.user = user - doc = {} - device = {} - kv = {} - self.uuid = str(uuid.uuid4()) - tag = hashlib.sha3_256(self.uuid.encode()).hexdigest() + row = {} for f in self.forms: d = f.cleaned_data if not d: continue + if d.get("type"): - device["type"] = d["type"] + row["type"] = d["type"] if d.get("amount"): - device["amount"] = d["amount"] + row["amount"] = d["amount"] if d.get("name"): - kv[d["name"]] = d.get("value", '') - if d.get("tag"): - tag = d["tag"] - - if not device: - return - - doc["device"] = device - - if kv: - doc["kv"] = kv - - date = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S") - - if doc: - doc["uuid"] = self.uuid - doc["endTime"] = date - doc["software"] = "DeviceHub" - doc["CUSTOMER_ID"] = tag - doc["type"] = "WebSnapshot" - + row[d["name"]] = d.get("value", '') + if d.get("customer_id"): + row['CUSTOMER_ID']= d["customer_id"] + doc = create_doc(row) if not commit: return doc - self.index(doc) - self.create_annotations(tag) + create_index(doc) + create_annotation(doc, user, commit=commit) return doc - def index(self, doc): - snap = json.dumps(doc) - index(self.uuid, snap) - - def create_annotations(self, tag): - Annotation.objects.create( - uuid=self.uuid, - owner=self.user, - type=Annotation.Type.SYSTEM, - key='CUSTOM_ID', - value=tag - ) - - DeviceFormSet = forms.formset_factory(form=DeviceForm, formset=BaseDeviceFormSet, extra=1) diff --git a/device/templates/new_device.html b/device/templates/new_device.html index 0d6cf7c..bdb2911 100644 --- a/device/templates/new_device.html +++ b/device/templates/new_device.html @@ -61,7 +61,7 @@
      - {% bootstrap_field form.0.tag %} + {% bootstrap_field form.0.customer_id %}
      {% for f in form %} diff --git a/evidence/forms.py b/evidence/forms.py index 6e6ad8a..ae2630d 100644 --- a/evidence/forms.py +++ b/evidence/forms.py @@ -1,16 +1,13 @@ import json -import uuid -import hashlib -import datetime 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.forms import MultipleFileField from device.models import Device from evidence.parse import Build -from evidence.xapian import index from evidence.models import Annotation @@ -104,10 +101,8 @@ class ImportForm(forms.Form): self.exception(_("The file you try to import is empty!")) for n in data_pd.keys(): - # import pdb; pdb.set_trace() if 'type' not in [x.lower() for x in data_pd[n]]: raise ValidationError("You need a column with name 'type'") - for k, v in data_pd[n].items(): if k.lower() == "type": @@ -118,83 +113,18 @@ class ImportForm(forms.Form): return data + def save(self, commit=True): table = [] for row in self.rows: - table.append(self.create_annotation(row)) + doc = create_doc(row) + annotation = create_annotation(doc, self.user) + table.append((doc, annotation)) if commit: for doc, cred in table: cred.save() - self.index(doc) + create_index(doc) return table return - - def create_annotation(self, row): - doc = self.create_doc(row) - if not doc: - return [] - - data = { - 'uuid': doc['uuid'], - 'owner': self.user, - 'type': Annotation.Type.SYSTEM, - 'key': 'CUSTOM_ID', - 'value': doc['CUSTOMER_ID'], - } - - return [doc, Annotation(**data)] - - def index(self, doc): - _uuid = doc['uuid'] - ev = json.dumps(doc) - index(_uuid, ev) - - def create_doc(self, row): - doc = {} - device = {"manufacturer": "", "model": ""} - kv = {} - _uuid = str(uuid.uuid4()) - tag = hashlib.sha3_256(_uuid.encode()).hexdigest() - - - for k, v in row.items(): - if k.upper() == "CUSTOM_ID": - tag = v - - if not v: - continue - - if k.lower() == "type": - device["type"] = v - elif k.lower() == "amount": - try: - device["amount"] = int(v) - except Exception: - device["amount"] = 1 - - else: - kv[k] = v - - if 'amount' not in row.keys(): - device["amount"] = 1 - - if not device: - return - - doc["device"] = device - - if kv: - doc["kv"] = kv - - date = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S") - - if doc: - doc["uuid"] = _uuid - doc["endTime"] = date - doc["software"] = "DeviceHub" - doc["CUSTOMER_ID"] = tag - doc["type"] = "WebSnapshot" - - return doc diff --git a/utils/device.py b/utils/device.py new file mode 100644 index 0000000..2e41597 --- /dev/null +++ b/utils/device.py @@ -0,0 +1,89 @@ +import json +import uuid +import hashlib +import datetime + +from django.core.exceptions import ValidationError +from evidence.xapian import index +from evidence.models import Annotation +from device.models import Device + +def create_doc(data): + if not data: + return + + doc = {} + device = {"manufacturer": "", "model": "", "amount": 1} + kv = {} + _uuid = str(uuid.uuid4()) + customer_id = hashlib.sha3_256(_uuid.encode()).hexdigest() + + + for k, v in data.items(): + if not v: + continue + + if k.upper() == "CUSTOMER_ID": + customer_id = v + continue + + if k.lower() == "type": + if v not in Device.Types.values: + raise ValidationError("{} is not a valid device".format(v)) + + device["type"] = v + + elif k.lower() == "amount": + try: + amount = int(v) + device["amount"] = amount + except Exception: + pass + + else: + kv[k] = v + + if not device: + return + + doc["device"] = device + + if kv: + doc["kv"] = kv + + date = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S") + + if doc: + doc["uuid"] = _uuid + doc["endTime"] = date + doc["software"] = "DeviceHub" + doc["CUSTOMER_ID"] = customer_id + doc["type"] = "WebSnapshot" + + return doc + + +def create_annotation(doc, user, commit=False): + if not doc or not doc.get('uuid') or not doc.get("CUSTOMER_ID"): + return [] + + data = { + 'uuid': doc['uuid'], + 'owner': user, + 'type': Annotation.Type.SYSTEM, + 'key': 'CUSTOMER_ID', + 'value': doc['CUSTOMER_ID'], + } + if commit: + return Annotation.objects.create(**data) + + return Annotation(**data) + + +def create_index(doc): + if not doc or not doc.get('uuid'): + return [] + + _uuid = doc['uuid'] + ev = json.dumps(doc) + index(_uuid, ev) -- 2.30.2 From 71d9e5481c691f2adf687bbfbe2a3bfdbb9ab62a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 3 Sep 2024 16:41:27 +0200 Subject: [PATCH 24/26] fix --- evidence/xapian.py | 2 +- reset.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/evidence/xapian.py b/evidence/xapian.py index 222afe3..e38a8ab 100644 --- a/evidence/xapian.py +++ b/evidence/xapian.py @@ -32,7 +32,7 @@ def index(uuid, snap): matches = search(uuid, limit=1) if matches.size() > 0: return - except xapian.DatabaseNotFoundError: + except (xapian.DatabaseNotFoundError, xapian.DatabaseOpeningError): pass database = xapian.WritableDatabase("db", xapian.DB_CREATE_OR_OPEN) diff --git a/reset.sh b/reset.sh index 3b634ae..e9c2543 100644 --- a/reset.sh +++ b/reset.sh @@ -1,4 +1,4 @@ rm db/* -./manage.py migrate -./manage.py add_user user@example.org 1234 -./manage.py up_snapshots example/snapshots/ user@example.org +python3 manage.py migrate +python3 manage.py add_user user@example.org 1234 +python3 manage.py up_snapshots example/snapshots/ user@example.org -- 2.30.2 From 343600a5403010770d8e0931a8ebf35511ff6361 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 3 Sep 2024 18:41:53 +0200 Subject: [PATCH 25/26] migrations --- device/migrations/0001_initial.py | 404 ++++++++++++++++++ ...rand_alter_device_devicehub_id_and_more.py | 33 ++ ...nent_type_remove_computer_type_and_more.py | 73 ++++ 3 files changed, 510 insertions(+) create mode 100644 device/migrations/0001_initial.py create mode 100644 device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py create mode 100644 device/migrations/0003_remove_component_type_remove_computer_type_and_more.py diff --git a/device/migrations/0001_initial.py b/device/migrations/0001_initial.py new file mode 100644 index 0000000..22d9017 --- /dev/null +++ b/device/migrations/0001_initial.py @@ -0,0 +1,404 @@ +# Generated by Django 5.0.6 on 2024-06-11 09:20 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name="Device", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("created", models.DateTimeField(auto_now_add=True)), + ("updated", models.DateTimeField(auto_now=True)), + ("type", models.CharField(max_length=32)), + ("model", models.CharField(blank=True, max_length=64, null=True)), + ( + "manufacturer", + models.CharField(blank=True, max_length=64, null=True), + ), + ( + "serial_number", + models.CharField(blank=True, max_length=64, null=True), + ), + ("part_number", models.CharField(blank=True, max_length=64, null=True)), + ("brand", models.TextField(blank=True, null=True)), + ("generation", models.SmallIntegerField(blank=True, null=True)), + ("version", models.TextField(blank=True, null=True)), + ("production_date", models.DateTimeField(blank=True, null=True)), + ("variant", models.TextField(blank=True, null=True)), + ("devicehub_id", models.TextField(blank=True, null=True, unique=True)), + ("dhid_bk", models.CharField(blank=True, max_length=64, null=True)), + ("phid_bk", models.CharField(blank=True, max_length=64, null=True)), + ("family", models.CharField(blank=True, max_length=64, null=True)), + ("hid", models.CharField(blank=True, max_length=64, null=True)), + ("chid", models.CharField(blank=True, max_length=64, null=True)), + ("active", models.BooleanField(default=True)), + ( + "owner", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + ), + ), + ], + ), + migrations.CreateModel( + name="Component", + fields=[ + ( + "device", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + primary_key=True, + serialize=False, + to="device.device", + ), + ), + ( + "type", + models.CharField( + choices=[ + ("GraphicCard", "Graphiccard"), + ("DataStorage", "Datastorage"), + ("Motherboard", "Motherboard"), + ("NetworkAdapter", "Networkadapter"), + ("Processor", "Processor"), + ("RamModule", "Rammodule"), + ("SoundCard", "Soundcard"), + ("Display", "Display"), + ("Battery", "Battery"), + ("Camera", "Camera"), + ], + max_length=32, + ), + ), + ], + ), + migrations.CreateModel( + name="Computer", + fields=[ + ( + "device", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + primary_key=True, + serialize=False, + to="device.device", + ), + ), + ("chassis", models.TextField(blank=True, null=True)), + ("system_uuid", models.UUIDField()), + ("sku", models.TextField(blank=True, null=True)), + ( + "type", + models.CharField( + choices=[ + ("Desktop", "Desktop"), + ("Laptop", "Laptop"), + ("Server", "Server"), + ], + default="Laptop", + max_length=32, + ), + ), + ], + ), + migrations.CreateModel( + name="PhysicalProperties", + fields=[ + ( + "device", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + primary_key=True, + serialize=False, + to="device.device", + ), + ), + ("weight", models.FloatField(blank=True, null=True)), + ("width", models.FloatField(blank=True, null=True)), + ("height", models.FloatField(blank=True, null=True)), + ("depth", models.FloatField(blank=True, null=True)), + ("color", models.CharField(blank=True, max_length=20, null=True)), + ("image", models.CharField(blank=True, max_length=64, null=True)), + ], + ), + migrations.CreateModel( + name="SoundCard", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "component", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="device.component", + ), + ), + ], + ), + migrations.CreateModel( + name="RamModule", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("size", models.IntegerField(blank=True, null=True)), + ("speed", models.SmallIntegerField(blank=True, null=True)), + ( + "interface", + models.CharField( + choices=[ + ("SDRAM", "Sdram"), + ("DDR SDRAM", "Ddr"), + ("DDR2 SDRAM", "Ddr2"), + ("DDR3 SDRAM", "Ddr3"), + ("DDR4 SDRAM", "Ddr4"), + ("DDR5 SDRAM", "Ddr5"), + ("DDR6 SDRAM", "Ddr6"), + ("LPDDR3", "Lpddr3"), + ], + max_length=32, + ), + ), + ( + "format", + models.CharField( + choices=[("DIMM", "Dimm"), ("SODIMM", "Sodimm")], max_length=32 + ), + ), + ( + "component", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="device.component", + ), + ), + ], + ), + migrations.CreateModel( + name="Processor", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("speed", models.FloatField(blank=True, null=True)), + ("cores", models.SmallIntegerField(blank=True, null=True)), + ("threads", models.SmallIntegerField(blank=True, null=True)), + ("address", models.SmallIntegerField(blank=True, null=True)), + ( + "component", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="device.component", + ), + ), + ], + ), + migrations.CreateModel( + name="NetworkAdapter", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("speed", models.IntegerField(blank=True, null=True)), + ("wireless", models.BooleanField(default=False)), + ( + "component", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="device.component", + ), + ), + ], + ), + migrations.CreateModel( + name="Motherboard", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("slots", models.SmallIntegerField(blank=True, null=True)), + ("usb", models.SmallIntegerField(blank=True, null=True)), + ("firewire", models.SmallIntegerField(blank=True, null=True)), + ("serial", models.SmallIntegerField(blank=True, null=True)), + ("pcmcia", models.SmallIntegerField(blank=True, null=True)), + ("bios_date", models.DateTimeField()), + ("ram_slots", models.SmallIntegerField(blank=True, null=True)), + ("ram_max_size", models.IntegerField(blank=True, null=True)), + ( + "component", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="device.component", + ), + ), + ], + ), + migrations.CreateModel( + name="GraphicCard", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("memory", models.IntegerField(blank=True, null=True)), + ( + "component", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="device.component", + ), + ), + ], + ), + migrations.CreateModel( + name="Display", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "component", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="device.component", + ), + ), + ], + ), + migrations.CreateModel( + name="DataStorage", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("size", models.IntegerField(blank=True, null=True)), + ( + "interface", + models.CharField( + choices=[ + ("ATA", "Ata"), + ("USB", "Usb"), + ("PCI", "Pci"), + ("NVME", "Nvme"), + ], + max_length=32, + ), + ), + ( + "type", + models.CharField( + choices=[ + ("HardDrive", "Harddrive"), + ("SolidStateDrive", "Solidstatedrive"), + ], + max_length=32, + ), + ), + ( + "component", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="device.component", + ), + ), + ], + ), + migrations.CreateModel( + name="Battery", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "component", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="device.component", + ), + ), + ], + ), + migrations.AddField( + model_name="component", + name="computer", + field=models.OneToOneField( + null=True, + on_delete=django.db.models.deletion.CASCADE, + to="device.computer", + ), + ), + ] diff --git a/device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py b/device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py new file mode 100644 index 0000000..1d02fb7 --- /dev/null +++ b/device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py @@ -0,0 +1,33 @@ +# Generated by Django 5.0.6 on 2024-07-03 11:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("device", "0001_initial"), + ] + + operations = [ + migrations.AlterField( + model_name="device", + name="brand", + field=models.CharField(blank=True, max_length=64, null=True), + ), + migrations.AlterField( + model_name="device", + name="devicehub_id", + field=models.CharField(blank=True, max_length=64, null=True, unique=True), + ), + migrations.AlterField( + model_name="device", + name="variant", + field=models.CharField(blank=True, max_length=64, null=True), + ), + migrations.AlterField( + model_name="device", + name="version", + field=models.CharField(blank=True, max_length=64, null=True), + ), + ] diff --git a/device/migrations/0003_remove_component_type_remove_computer_type_and_more.py b/device/migrations/0003_remove_component_type_remove_computer_type_and_more.py new file mode 100644 index 0000000..d57d6bc --- /dev/null +++ b/device/migrations/0003_remove_component_type_remove_computer_type_and_more.py @@ -0,0 +1,73 @@ +# Generated by Django 5.0.6 on 2024-07-03 12:33 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("device", "0002_alter_device_brand_alter_device_devicehub_id_and_more"), + ] + + operations = [ + migrations.RemoveField( + model_name="component", + name="type", + ), + migrations.RemoveField( + model_name="computer", + name="type", + ), + migrations.RemoveField( + model_name="datastorage", + name="type", + ), + migrations.AlterField( + model_name="computer", + name="chassis", + field=models.CharField( + blank=True, + choices=[ + ("Tower", "Tower"), + ("All in one", "Allinone"), + ("Microtower", "Microtower"), + ("Netbook", "Netbook"), + ("Laptop", "Laptop"), + ("Tablet", "Tabler"), + ("Server", "Server"), + ("Non-physical device", "Virtual"), + ], + max_length=32, + null=True, + ), + ), + migrations.AlterField( + model_name="computer", + name="sku", + field=models.CharField(blank=True, max_length=32, null=True), + ), + migrations.AlterField( + model_name="device", + name="type", + field=models.CharField( + choices=[ + ("Desktop", "Desktop"), + ("Laptop", "Laptop"), + ("Server", "Server"), + ("GraphicCard", "Graphiccard"), + ("HardDrive", "Harddrive"), + ("SolidStateDrive", "Solidstatedrive"), + ("Motherboard", "Motherboard"), + ("NetworkAdapter", "Networkadapter"), + ("Processor", "Processor"), + ("RamModule", "Rammodule"), + ("SoundCard", "Soundcard"), + ("Display", "Display"), + ("Battery", "Battery"), + ("Camera", "Camera"), + ], + default="Laptop", + max_length=32, + ), + ), + ] -- 2.30.2 From 21feaea3de42171d92c19a52983800dc82e57958 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 3 Sep 2024 18:45:51 +0200 Subject: [PATCH 26/26] revert migrations --- device/migrations/0001_initial.py | 404 ------------------ ...rand_alter_device_devicehub_id_and_more.py | 33 -- ...nent_type_remove_computer_type_and_more.py | 73 ---- 3 files changed, 510 deletions(-) delete mode 100644 device/migrations/0001_initial.py delete mode 100644 device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py delete mode 100644 device/migrations/0003_remove_component_type_remove_computer_type_and_more.py diff --git a/device/migrations/0001_initial.py b/device/migrations/0001_initial.py deleted file mode 100644 index 22d9017..0000000 --- a/device/migrations/0001_initial.py +++ /dev/null @@ -1,404 +0,0 @@ -# Generated by Django 5.0.6 on 2024-06-11 09:20 - -import django.db.models.deletion -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name="Device", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("created", models.DateTimeField(auto_now_add=True)), - ("updated", models.DateTimeField(auto_now=True)), - ("type", models.CharField(max_length=32)), - ("model", models.CharField(blank=True, max_length=64, null=True)), - ( - "manufacturer", - models.CharField(blank=True, max_length=64, null=True), - ), - ( - "serial_number", - models.CharField(blank=True, max_length=64, null=True), - ), - ("part_number", models.CharField(blank=True, max_length=64, null=True)), - ("brand", models.TextField(blank=True, null=True)), - ("generation", models.SmallIntegerField(blank=True, null=True)), - ("version", models.TextField(blank=True, null=True)), - ("production_date", models.DateTimeField(blank=True, null=True)), - ("variant", models.TextField(blank=True, null=True)), - ("devicehub_id", models.TextField(blank=True, null=True, unique=True)), - ("dhid_bk", models.CharField(blank=True, max_length=64, null=True)), - ("phid_bk", models.CharField(blank=True, max_length=64, null=True)), - ("family", models.CharField(blank=True, max_length=64, null=True)), - ("hid", models.CharField(blank=True, max_length=64, null=True)), - ("chid", models.CharField(blank=True, max_length=64, null=True)), - ("active", models.BooleanField(default=True)), - ( - "owner", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - ), - ), - ], - ), - migrations.CreateModel( - name="Component", - fields=[ - ( - "device", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - primary_key=True, - serialize=False, - to="device.device", - ), - ), - ( - "type", - models.CharField( - choices=[ - ("GraphicCard", "Graphiccard"), - ("DataStorage", "Datastorage"), - ("Motherboard", "Motherboard"), - ("NetworkAdapter", "Networkadapter"), - ("Processor", "Processor"), - ("RamModule", "Rammodule"), - ("SoundCard", "Soundcard"), - ("Display", "Display"), - ("Battery", "Battery"), - ("Camera", "Camera"), - ], - max_length=32, - ), - ), - ], - ), - migrations.CreateModel( - name="Computer", - fields=[ - ( - "device", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - primary_key=True, - serialize=False, - to="device.device", - ), - ), - ("chassis", models.TextField(blank=True, null=True)), - ("system_uuid", models.UUIDField()), - ("sku", models.TextField(blank=True, null=True)), - ( - "type", - models.CharField( - choices=[ - ("Desktop", "Desktop"), - ("Laptop", "Laptop"), - ("Server", "Server"), - ], - default="Laptop", - max_length=32, - ), - ), - ], - ), - migrations.CreateModel( - name="PhysicalProperties", - fields=[ - ( - "device", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - primary_key=True, - serialize=False, - to="device.device", - ), - ), - ("weight", models.FloatField(blank=True, null=True)), - ("width", models.FloatField(blank=True, null=True)), - ("height", models.FloatField(blank=True, null=True)), - ("depth", models.FloatField(blank=True, null=True)), - ("color", models.CharField(blank=True, max_length=20, null=True)), - ("image", models.CharField(blank=True, max_length=64, null=True)), - ], - ), - migrations.CreateModel( - name="SoundCard", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="RamModule", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("size", models.IntegerField(blank=True, null=True)), - ("speed", models.SmallIntegerField(blank=True, null=True)), - ( - "interface", - models.CharField( - choices=[ - ("SDRAM", "Sdram"), - ("DDR SDRAM", "Ddr"), - ("DDR2 SDRAM", "Ddr2"), - ("DDR3 SDRAM", "Ddr3"), - ("DDR4 SDRAM", "Ddr4"), - ("DDR5 SDRAM", "Ddr5"), - ("DDR6 SDRAM", "Ddr6"), - ("LPDDR3", "Lpddr3"), - ], - max_length=32, - ), - ), - ( - "format", - models.CharField( - choices=[("DIMM", "Dimm"), ("SODIMM", "Sodimm")], max_length=32 - ), - ), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="Processor", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("speed", models.FloatField(blank=True, null=True)), - ("cores", models.SmallIntegerField(blank=True, null=True)), - ("threads", models.SmallIntegerField(blank=True, null=True)), - ("address", models.SmallIntegerField(blank=True, null=True)), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="NetworkAdapter", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("speed", models.IntegerField(blank=True, null=True)), - ("wireless", models.BooleanField(default=False)), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="Motherboard", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("slots", models.SmallIntegerField(blank=True, null=True)), - ("usb", models.SmallIntegerField(blank=True, null=True)), - ("firewire", models.SmallIntegerField(blank=True, null=True)), - ("serial", models.SmallIntegerField(blank=True, null=True)), - ("pcmcia", models.SmallIntegerField(blank=True, null=True)), - ("bios_date", models.DateTimeField()), - ("ram_slots", models.SmallIntegerField(blank=True, null=True)), - ("ram_max_size", models.IntegerField(blank=True, null=True)), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="GraphicCard", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("memory", models.IntegerField(blank=True, null=True)), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="Display", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="DataStorage", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("size", models.IntegerField(blank=True, null=True)), - ( - "interface", - models.CharField( - choices=[ - ("ATA", "Ata"), - ("USB", "Usb"), - ("PCI", "Pci"), - ("NVME", "Nvme"), - ], - max_length=32, - ), - ), - ( - "type", - models.CharField( - choices=[ - ("HardDrive", "Harddrive"), - ("SolidStateDrive", "Solidstatedrive"), - ], - max_length=32, - ), - ), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.CreateModel( - name="Battery", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "component", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="device.component", - ), - ), - ], - ), - migrations.AddField( - model_name="component", - name="computer", - field=models.OneToOneField( - null=True, - on_delete=django.db.models.deletion.CASCADE, - to="device.computer", - ), - ), - ] diff --git a/device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py b/device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py deleted file mode 100644 index 1d02fb7..0000000 --- a/device/migrations/0002_alter_device_brand_alter_device_devicehub_id_and_more.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-03 11:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("device", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="device", - name="brand", - field=models.CharField(blank=True, max_length=64, null=True), - ), - migrations.AlterField( - model_name="device", - name="devicehub_id", - field=models.CharField(blank=True, max_length=64, null=True, unique=True), - ), - migrations.AlterField( - model_name="device", - name="variant", - field=models.CharField(blank=True, max_length=64, null=True), - ), - migrations.AlterField( - model_name="device", - name="version", - field=models.CharField(blank=True, max_length=64, null=True), - ), - ] diff --git a/device/migrations/0003_remove_component_type_remove_computer_type_and_more.py b/device/migrations/0003_remove_component_type_remove_computer_type_and_more.py deleted file mode 100644 index d57d6bc..0000000 --- a/device/migrations/0003_remove_component_type_remove_computer_type_and_more.py +++ /dev/null @@ -1,73 +0,0 @@ -# Generated by Django 5.0.6 on 2024-07-03 12:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("device", "0002_alter_device_brand_alter_device_devicehub_id_and_more"), - ] - - operations = [ - migrations.RemoveField( - model_name="component", - name="type", - ), - migrations.RemoveField( - model_name="computer", - name="type", - ), - migrations.RemoveField( - model_name="datastorage", - name="type", - ), - migrations.AlterField( - model_name="computer", - name="chassis", - field=models.CharField( - blank=True, - choices=[ - ("Tower", "Tower"), - ("All in one", "Allinone"), - ("Microtower", "Microtower"), - ("Netbook", "Netbook"), - ("Laptop", "Laptop"), - ("Tablet", "Tabler"), - ("Server", "Server"), - ("Non-physical device", "Virtual"), - ], - max_length=32, - null=True, - ), - ), - migrations.AlterField( - model_name="computer", - name="sku", - field=models.CharField(blank=True, max_length=32, null=True), - ), - migrations.AlterField( - model_name="device", - name="type", - field=models.CharField( - choices=[ - ("Desktop", "Desktop"), - ("Laptop", "Laptop"), - ("Server", "Server"), - ("GraphicCard", "Graphiccard"), - ("HardDrive", "Harddrive"), - ("SolidStateDrive", "Solidstatedrive"), - ("Motherboard", "Motherboard"), - ("NetworkAdapter", "Networkadapter"), - ("Processor", "Processor"), - ("RamModule", "Rammodule"), - ("SoundCard", "Soundcard"), - ("Display", "Display"), - ("Battery", "Battery"), - ("Camera", "Camera"), - ], - default="Laptop", - max_length=32, - ), - ), - ] -- 2.30.2