mirror of
https://github.com/ail-project/ail-framework.git
synced 2024-11-26 15:57:16 +00:00
fix: [correlation] fix UI cve, decoded tags
This commit is contained in:
parent
9cf979fae3
commit
2e11b04b6c
4 changed files with 29 additions and 26 deletions
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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')
|
||||||
|
|
|
@ -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='' %}
|
||||||
|
|
|
@ -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")
|
||||||
|
|
Loading…
Reference in a new issue