AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-10 08:38:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: [correlation] fix UI cve, decoded tags

Browse source
This commit is contained in:
Terrtia 2023-04-06 16:18:06 +02:00
parent 9cf979fae3
commit 2e11b04b6c
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
4 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/lib/objects/ail_objects.py
View file

@ -158,7 +158,7 @@ def get_object_card_meta(obj_type, subtype, id, related_btc=False):
meta["vt"] = obj.get_meta_vt() meta["vt"] = obj.get_meta_vt()
meta["vt"]["status"] = obj.is_vt_enabled() meta["vt"]["status"] = obj.is_vt_enabled()
# TAGS MODAL # TAGS MODAL
if obj.get_type() == 'screenshot' or obj.get_type() == 'decoded': if obj.get_type() == 'screenshot' or obj.get_type() == 'decoded' or obj.get_type() == 'cve':
meta["add_tags_modal"] = Tag.get_modal_add_tags(obj.id, obj.get_type(), obj.get_subtype(r_str=True)) meta["add_tags_modal"] = Tag.get_modal_add_tags(obj.id, obj.get_type(), obj.get_subtype(r_str=True))
return meta return meta

7
var/www/blueprints/correlation.py
View file

@ -124,7 +124,8 @@ def show_correlation():
"correlation_id": obj_id, "correlation_id": obj_id,
"max_nodes": max_nodes, "mode": mode, "max_nodes": max_nodes, "mode": mode,
"filter": filter_types, "filter_str": ",".join(filter_types), "filter": filter_types, "filter_str": ",".join(filter_types),
"metadata": ail_objects.get_object_meta(obj_type, subtype, obj_id, flask_context=True) "metadata": ail_objects.get_object_meta(obj_type, subtype, obj_id,
options={'tags'}, flask_context=True)
} }
if subtype: if subtype:
dict_object["metadata"]['type_id'] = subtype dict_object["metadata"]['type_id'] = subtype
@ -156,7 +157,9 @@ def get_description():
return Response(json.dumps({"status": "error", "reason": "404 Not Found"}, indent=2, sort_keys=True), mimetype='application/json'), 404 return Response(json.dumps({"status": "error", "reason": "404 Not Found"}, indent=2, sort_keys=True), mimetype='application/json'), 404
# object exist # object exist
else: else:
res = ail_objects.get_object_meta(object_type, type_id, correlation_id, flask_context=True) res = ail_objects.get_object_meta(object_type, type_id, correlation_id, options={'tags'}, flask_context=True)
if 'tags' in res:
res['tags'] = list(res['tags'])
return jsonify(res) return jsonify(res)
@correlation.route('/correlation/graph_node_json') @correlation.route('/correlation/graph_node_json')

36
var/www/templates/correlation/metadata_card_cve.html
View file

@ -1,9 +1,9 @@
<link href="{{ url_for('static', filename='css/tags.css') }}" rel="stylesheet" type="text/css" /> <link href="{{ url_for('static', filename='css/tags.css') }}" rel="stylesheet" type="text/css" />
<script src="{{ url_for('static', filename='js/tags.js') }}"></script> <script src="{{ url_for('static', filename='js/tags.js') }}"></script>
{#{% with modal_add_tags=dict_object['metadata_card']['add_tags_modal']%}#} {% with modal_add_tags=dict_object['metadata_card']['add_tags_modal']%}
{# {% include 'modals/add_tags.html' %}#} {% include 'modals/add_tags.html' %}
{#{% endwith %}#} {% endwith %}
{% include 'modals/edit_tag.html' %} {% include 'modals/edit_tag.html' %}
@ -99,21 +99,21 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{# <li class="list-group-item py-0">#} <li class="list-group-item py-0">
{# <br>#} <br>
{# <div class="mb-3">#} <div class="mb-3">
{# Tags:#} Tags:
{# {% for tag in dict_object["metadata"]['tags'] %}#} {% for tag in dict_object["metadata"]['tags'] %}
{# <button class="btn btn-{{ bootstrap_label[loop.index0 % 5] }}" data-toggle="modal" data-target="#edit_tags_modal"#} <button class="btn btn-{{ bootstrap_label[loop.index0 % 5] }}" data-toggle="modal" data-target="#edit_tags_modal"
{# data-tagid="{{ tag }}" data-objtype="decoded" data-objid="{{ dict_object["correlation_id"] }}">#} data-tagid="{{ tag }}" data-objtype="decoded" data-objsubtype="" data-objid="{{ dict_object["correlation_id"] }}">
{# {{ tag }}#} {{ tag }}
{# </button>#} </button>
{# {% endfor %}#} {% endfor %}
{# <button type="button" class="btn btn-light" data-toggle="modal" data-target="#add_tags_modal">#} <button type="button" class="btn btn-light" data-toggle="modal" data-target="#add_tags_modal">
{# <i class="far fa-plus-square"></i>#} <i class="far fa-plus-square"></i>
{# </button>#} </button>
{# </div>#} </div>
{# </li>#} </li>
</ul> </ul>
{% with obj_type='cve', obj_id=dict_object['correlation_id'], obj_subtype='' %} {% with obj_type='cve', obj_id=dict_object['correlation_id'], obj_subtype='' %}

10
var/www/templates/correlation/show_correlation.html
View file

@ -535,16 +535,16 @@ if (d.popover) {
}); });
desc = desc + "</dl>" desc = desc + "</dl>"
if (data["img"]) { if (data["tags"]) {
desc = desc + "<img src={{ url_for('objects_item.screenshot', filename="") }}" + data["img"] +" class=\"img-thumbnail\" />";
}
if (data["tags"]) {
data["tags"].forEach(function(tag) { data["tags"].forEach(function(tag) {
desc = desc + "<span class=\"badge badge-warning\">"+ sanitize_text(tag) +"</span>"; desc = desc + "<span class=\"badge badge-warning\">"+ sanitize_text(tag) +"</span>";
}); });
} }
if (data["img"]) {
desc = desc + "<img src={{ url_for('objects_item.screenshot', filename="") }}" + data["img"] +" class=\"img-thumbnail\" />";
}
desc = desc + "</div>" desc = desc + "</div>"
div.html(desc) div.html(desc)
.style("left", (d3_pageX) + "px") .style("left", (d3_pageX) + "px")