Merge pull request 'Parsing error handling and MAC retrieval on new snapshots' (#25) from bugfix/mac_and_parsing into main

Reviewed-on: #25
Reviewed-by: cayop <cayop@noreply.localhost>

device/templates/details.html

@@ -55,8 +55,7 @@
       <div class="col-lg-3 col-md-4 label ">{% trans "Type" %}</div>
       <div class="col-lg-9 col-md-8">{{ object.type }}</div>
     </div>
-
+    {% if object.is_websnapshot and object.last_user_evidence %}
-    {% if object.is_websnapshot %}
     {% for k, v in object.last_user_evidence %}
     <div class="row">
       <div class="col-lg-3 col-md-4 label">{{ k }}</div>

evidence/forms.py

@@ -35,10 +35,14 @@ class UploadForm(forms.Form):
                 ).first()
 
                 if exist_annotation:
-                    raise ValidationError("error: {} exist".format(file_name))
+                    raise ValidationError("Error: {} already exists".format(file_name))
 
-            except Exception:
+            except json.JSONDecodeError:
-                raise ValidationError("error in: {}".format(file_name))
+                raise ValidationError("Error in parsing JSON: '{}'. Check for file integrity.".format(file_name))
+            except ValidationError as e:
+                raise e
+            except Exception as e:
+                raise ValidationError("Oops! Something went wrong in '{}': {}".format(file_name, str(e)))
 
             self.evidences.append((file_name, file_json))
 

evidence/management/commands/up_snapshots.py

@@ -1,12 +1,18 @@
-
 import os
 import json
+import logging
 
 from django.core.management.base import BaseCommand
 from django.contrib.auth import get_user_model
+from django.conf import settings
+
+from utils.save_snapshots import move_json, save_in_disk
 from evidence.parse import Build
 
 
+logger = logging.getLogger('django')
+
+
 User = get_user_model()
 
 
@@ -31,6 +37,8 @@ class Command(BaseCommand):
 
         elif os.path.isdir(path):
             self.read_directory(path)
+        else:
+            raise ValueError(f"The path {path} is neither a file nor a directory")
 
         self.parsing()
 
@@ -41,10 +49,27 @@ class Command(BaseCommand):
                 self.open(filepath)
 
     def open(self, filepath):
+        try:
             with open(filepath, 'r') as file:
                 content = json.loads(file.read())
-            self.snapshots.append(content)
+                path_name = save_in_disk(content, self.user.institution.name)
+
+                self.snapshots.append((content, path_name))
+        except json.JSONDecodeError as e:
+            raise e
+        #or we cath'em all
+        except Exception:
+            raise Exception(f"Oops! Something went wrong there")
+
 
     def parsing(self):
-        for s in self.snapshots:
+        for s, p in self.snapshots:
+            try:
                 self.devices.append(Build(s, self.user))
+                move_json(p, self.user.institution.name)
+            except Exception as err:
+                if settings.DEBUG:
+                    logger.exception("%s", err)
+                snapshot_id = s.get("uuid", "")
+                txt = "It is not possible to parse snapshot: %s"
+                logger.error(txt, snapshot_id)

evidence/parse.py

@@ -5,23 +5,15 @@ import logging
 from dmidecode import DMIParse
 from json_repair import repair_json
 
+from evidence.parse_details import get_lshw_child
 from evidence.models import Annotation
 from evidence.xapian import index
 from utils.constants import CHASSIS_DH
 
 
-logger = logging.getLogger('django')
+logger = logging.getLogger(__name__)
-
-
-def get_network_cards(child, nets):
-    if child['id'] == 'network' and "PCI:" in child.get("businfo"):
-        nets.append(child)
-    if child.get('children'):
-        [get_network_cards(x, nets) for x in child['children']]
-
 
 def get_mac(lshw):
-    nets = []
     try:
         if type(lshw) is dict:
             hw = lshw
@@ -30,19 +22,17 @@ def get_mac(lshw):
     except json.decoder.JSONDecodeError:
         hw = json.loads(repair_json(lshw))
 
-    try:
+    networks = []
-        get_network_cards(hw, nets)
+    get_lshw_child(hw, networks, 'network')
-    except Exception as ss:
-        print("WARNING!! {}".format(ss))
-        return
 
-    nets_sorted = sorted(nets, key=lambda x: x['businfo'])
+    nets_sorted = sorted(networks, key=lambda x: x['businfo'])
     # This funcion get the network card integrated in motherboard
     # integrate = [x for x in nets if "pci@0000:00:" in x.get('businfo', '')]
 
     if nets_sorted:
-        return nets_sorted[0]['serial']
+        mac = nets_sorted[0]['serial']
-
+        logger.debug("The snapshot has the following MAC: %s" , mac)
+        return mac
 
 class Build:
     def __init__(self, evidence_json, user, check=False):