From 98cbaad1adacd526d957df732d551604e99aaa9c Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Fri, 12 May 2023 09:59:18 +0200
Subject: [PATCH] fix: [cves] catch cve search errors

---
 bin/lib/objects/Cves.py                       | 26 ++---
 .../correlation/metadata_card_cve.html        | 95 ++++++++++---------
 2 files changed, 64 insertions(+), 57 deletions(-)

diff --git a/bin/lib/objects/Cves.py b/bin/lib/objects/Cves.py
index e0315d58..07c3b8fb 100755
--- a/bin/lib/objects/Cves.py
+++ b/bin/lib/objects/Cves.py
@@ -76,17 +76,21 @@ class Cve(AbstractDaterangeObject):
         self._add(date, item_id)
 
     def get_cve_search(self):
-        response = requests.get(f'https://cvepremium.circl.lu/api/cve/{self.id}', timeout=10)
-        if response.status_code == 200:
-            json_response = response.json()
-            # 'summary'
-            # 'references'
-            # 'last-modified'
-            # 'Published'
-            # 'Modified'
-            return json_response
-        else:
-            return {'error': f'{response.status_code}'}
+        try:
+            response = requests.get(f'https://cvepremium.circl.lu/api/cve/{self.id}', timeout=10)
+            if response.status_code == 200:
+                json_response = response.json()
+                # 'summary'
+                # 'references'
+                # 'last-modified'
+                # 'Published'
+                # 'Modified'
+                return json_response
+            else:
+                return {'error': f'{response.status_code}'}
+        except requests.exceptions.ConnectionError:
+            return {'error': f'Connection Error'}
+
 
 # TODO  ADD SEARCH FUNCTION
 
diff --git a/var/www/templates/correlation/metadata_card_cve.html b/var/www/templates/correlation/metadata_card_cve.html
index 1e64008c..d1cfab9f 100644
--- a/var/www/templates/correlation/metadata_card_cve.html
+++ b/var/www/templates/correlation/metadata_card_cve.html
@@ -47,57 +47,60 @@
 				</div>
 			</li>
             {% if dict_object["metadata_card"]["cve_search"] %}
-                <li class="list-group-item py-0">
-                    <table class="table table-sm table-hover">
-                        <tbody>
-                        <tr>
-                            <td><b>Summary</b></td>
-                            <td>{{ dict_object["metadata_card"]["cve_search"].get("summary") }}</td>
-                        </tr>
-                        <tr>
-                            <td><b>Published</b></td>
-                            <td>{{ dict_object["metadata_card"]["cve_search"].get("Published") }}</td>
-                        </tr>
-                        <tr>
-                            <td><b>Modified</b></td>
-                            <td>{{ dict_object["metadata_card"]["cve_search"].get("Modified") }}</td>
-                        </tr>
-                        <tr>
-                            <td><b>last-modified</b></td>
-                            <td>{{ dict_object["metadata_card"]["cve_search"].get("last-modified") }}</td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </li>
+                {% if 'error' in dict_object["metadata_card"]["cve_search"] %}
+                    <b class="text-danger my-2"><i class="fas fa-exclamation-triangle"></i> CVE Search Error: {{ dict_object["metadata_card"]["cve_search"]["error"] }}</b>
+                {% else %}
+                    <li class="list-group-item py-0">
+                        <table class="table table-sm table-hover">
+                            <tbody>
+                            <tr>
+                                <td><b>Summary</b></td>
+                                <td>{{ dict_object["metadata_card"]["cve_search"].get("summary") }}</td>
+                            </tr>
+                            <tr>
+                                <td><b>Published</b></td>
+                                <td>{{ dict_object["metadata_card"]["cve_search"].get("Published") }}</td>
+                            </tr>
+                            <tr>
+                                <td><b>Modified</b></td>
+                                <td>{{ dict_object["metadata_card"]["cve_search"].get("Modified") }}</td>
+                            </tr>
+                            <tr>
+                                <td><b>last-modified</b></td>
+                                <td>{{ dict_object["metadata_card"]["cve_search"].get("last-modified") }}</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </li>
 
-                {% if dict_object["metadata_card"]["cve_search"].get("references") %}
-                    <div id="accordion" class="mb-2">
-                        <div class="card">
-                            <div class="card-header bg-dark" id="headingRefs">
-                                <h5 class="mb-0">
-                                    <button class="btn btn-link collapsed w-100" data-toggle="collapse" data-target="#collapseRefs" aria-expanded="false" aria-controls="collapseRefs">
-                                        <span class="row">
-                                            <div class="col-10 text-left">
-                                                References <span class="badge badge-primary badge-pill">{{ dict_object["metadata_card"]["cve_search"]["references"] | length }}</span>
-                                            </div>
-                                            <div class="col-2 text-right"><i class="fas fa-chevron-circle-down"></i></div>
-                                        </span>
-                                    </button>
-                                </h5>
-                            </div>
-                            <div id="collapseRefs" class="collapse" aria-labelledby="headingRefs" data-parent="#accordion">
-                                <div class="card-body">
-                                    <ul>
-                                        {% for ref in dict_object["metadata_card"]["cve_search"].get("references") %}
-                                            <li>{{ ref }}</li>
-                                        {% endfor %}
-                                    </ul>
+                    {% if dict_object["metadata_card"]["cve_search"].get("references") %}
+                        <div id="accordion" class="mb-2">
+                            <div class="card">
+                                <div class="card-header bg-dark" id="headingRefs">
+                                    <h5 class="mb-0">
+                                        <button class="btn btn-link collapsed w-100" data-toggle="collapse" data-target="#collapseRefs" aria-expanded="false" aria-controls="collapseRefs">
+                                            <span class="row">
+                                                <div class="col-10 text-left">
+                                                    References <span class="badge badge-primary badge-pill">{{ dict_object["metadata_card"]["cve_search"]["references"] | length }}</span>
+                                                </div>
+                                                <div class="col-2 text-right"><i class="fas fa-chevron-circle-down"></i></div>
+                                            </span>
+                                        </button>
+                                    </h5>
+                                </div>
+                                <div id="collapseRefs" class="collapse" aria-labelledby="headingRefs" data-parent="#accordion">
+                                    <div class="card-body">
+                                        <ul>
+                                            {% for ref in dict_object["metadata_card"]["cve_search"].get("references") %}
+                                                <li>{{ ref }}</li>
+                                            {% endfor %}
+                                        </ul>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
+                    {% endif %}
                 {% endif %}
-
             {% endif %}
             <li class="list-group-item py-0">
 				<br>