From ae9cd1d3558724d015b7e57c983244f2c2d10cb1 Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Tue, 19 Nov 2019 09:02:25 +0100
Subject: [PATCH] chg: [Corrrelation UI] add 404 return

---
 bin/lib/Correlate_object.py       | 14 ++++++++++++++
 bin/lib/Decoded.py                |  3 +++
 var/www/blueprints/correlation.py | 32 ++++++++++++++++++-------------
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/bin/lib/Correlate_object.py b/bin/lib/Correlate_object.py
index 16b29d8f..e8e8b975 100755
--- a/bin/lib/Correlate_object.py
+++ b/bin/lib/Correlate_object.py
@@ -34,6 +34,20 @@ def get_all_correlation_objects():
     '''
     return ['domain', 'paste']
 
+def exist_object(object_type, correlation_id, type_id=None):
+    if object_type == 'domain':
+        return Domain.verify_if_domain_exist(correlation_id)
+    elif object_type == 'paste':
+        return Item.exist_item(correlation_id)
+    elif object_type == 'decoded':
+        return Decoded.exist_decoded(correlation_id)
+    elif object_type == 'pgp':
+        return Pgp.pgp._exist_corelation_field(type_id, correlation_id)
+    elif object_type == 'cryptocurrency':
+        return Cryptocurrency.cryptocurrency._exist_corelation_field(type_id, correlation_id)
+    else:
+        return False
+
 def get_object_metadata(object_type, correlation_id, type_id=None):
     if object_type == 'domain':
         return Domain.Domain(correlation_id).get_domain_metadata()
diff --git a/bin/lib/Decoded.py b/bin/lib/Decoded.py
index 1618b034..ce619fb5 100755
--- a/bin/lib/Decoded.py
+++ b/bin/lib/Decoded.py
@@ -39,6 +39,9 @@ def nb_decoded_item_size(sha1_string):
     else:
         return int(nb)
 
+def exist_decoded(sha1_string):
+    return r_serv_metadata.exists('metadata_hash:{}'.format(sha1_string))
+
 def get_decoded_metadata(sha1_string, nb_seen=False, size=False):
     metadata_dict = {}
     metadata_dict['first_seen'] = r_serv_metadata.hget('metadata_hash:{}'.format(sha1_string), 'first_seen')
diff --git a/var/www/blueprints/correlation.py b/var/www/blueprints/correlation.py
index 819e6f3f..f17f3637 100644
--- a/var/www/blueprints/correlation.py
+++ b/var/www/blueprints/correlation.py
@@ -10,7 +10,7 @@ import sys
 import json
 import random
 
-from flask import Flask, render_template, jsonify, request, Blueprint, redirect, url_for, Response
+from flask import Flask, render_template, jsonify, request, Blueprint, redirect, url_for, Response, abort
 from flask_login import login_required, current_user, login_user, logout_user
 
 sys.path.append('modules')
@@ -171,18 +171,24 @@ def show_correlation():
         correlation_names = sanitise_correlation_names(request.args.get('correlation_names'))
         correlation_objects = sanitise_correlation_objects(request.args.get('correlation_objects'))
 
-        dict_object = {"object_type": object_type, "correlation_id": correlation_id}
-        dict_object["max_nodes"] = max_nodes
-        dict_object["mode"] = mode
-        dict_object["correlation_names"] = correlation_names
-        dict_object["correlation_names_str"] = ",".join(correlation_names)
-        dict_object["correlation_objects"] = correlation_objects
-        dict_object["correlation_objects_str"] = ",".join(correlation_objects)
-        dict_object["metadata"] = Correlate_object.get_object_metadata(object_type, correlation_id, type_id=type_id)
-        if type_id:
-            dict_object["metadata"]['type_id'] = type_id
-        dict_object["metadata_card"] = get_card_metadata(object_type, correlation_id, type_id=type_id)
-        return render_template("show_correlation.html", dict_object=dict_object, bootstrap_label=bootstrap_label)
+        # check if correlation_id exist
+        if not Correlate_object.exist_object(object_type, correlation_id, type_id=type_id):
+            abort(404) # return 404
+        # oject exist
+        else:
+            dict_object = {"object_type": object_type, "correlation_id": correlation_id}
+            dict_object["max_nodes"] = max_nodes
+            dict_object["mode"] = mode
+            dict_object["correlation_names"] = correlation_names
+            dict_object["correlation_names_str"] = ",".join(correlation_names)
+            dict_object["correlation_objects"] = correlation_objects
+            dict_object["correlation_objects_str"] = ",".join(correlation_objects)
+            dict_object["metadata"] = Correlate_object.get_object_metadata(object_type, correlation_id, type_id=type_id)
+            if type_id:
+                dict_object["metadata"]['type_id'] = type_id
+            dict_object["metadata_card"] = get_card_metadata(object_type, correlation_id, type_id=type_id)
+            return render_template("show_correlation.html", dict_object=dict_object, bootstrap_label=bootstrap_label)
+
 
 @correlation.route('/correlation/graph_node_json')
 @login_required