From 43ea3c0f4324db41d87b1cbdcf57acd021402016 Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Fri, 14 Oct 2022 14:47:21 -0700 Subject: [PATCH] HOTFIX: Split certificate analysis out, suppression list fixes (#2052) --- mobsf/static/others/js/suppression.js | 32 ++++--- mobsf/templates/pdf/android_report.html | 62 ++++++------- .../android_binary_analysis.html | 92 ++++++++++++------- 3 files changed, 109 insertions(+), 77 deletions(-) diff --git a/mobsf/static/others/js/suppression.js b/mobsf/static/others/js/suppression.js index fb5d4bb6..6e4dcc82 100644 --- a/mobsf/static/others/js/suppression.js +++ b/mobsf/static/others/js/suppression.js @@ -133,21 +133,23 @@ function get_files(type, files){ } function list_suppressions(){ - action(document.location.origin + list_suppressions_url, { checksum: hash }, function(json) { - if (json.status==="ok") { + $(document).ready(function () { + action(document.location.origin + list_suppressions_url, { checksum: hash }, function(json) { + if (json.status==="ok") { - var tbl = $('#sup_table').DataTable(); - tbl.clear().draw(); - $(function() { - $.each(json.message, function(i, item) { - typ = item.SUPPRESS_TYPE - rule_ids = get_rules(typ, item.SUPPRESS_RULE_ID) - files = get_files(typ, item.SUPPRESS_FILES) - tbl.row.add([typ, rule_ids, files]).draw(false) - }); - }); - } else { - Swal.fire("Failed to list Suppression rules") - } + var tbl = $('#sup_table').DataTable(); + tbl.clear().draw(); + $(function() { + $.each(json.message, function(i, item) { + typ = item.SUPPRESS_TYPE + rule_ids = get_rules(typ, item.SUPPRESS_RULE_ID) + files = get_files(typ, item.SUPPRESS_FILES) + tbl.row.add([typ, rule_ids, files]).draw(false) + }); + }); + } else { + Swal.fire("Failed to list Suppression rules") + } + }); }); } \ No newline at end of file diff --git a/mobsf/templates/pdf/android_report.html b/mobsf/templates/pdf/android_report.html index 877d58a2..6d856130 100755 --- a/mobsf/templates/pdf/android_report.html +++ b/mobsf/templates/pdf/android_report.html @@ -198,35 +198,6 @@ {% if certificate_analysis.certificate_info %}

{{ certificate_analysis.certificate_info }}

- - - - - - - - - - - {% for find in certificate_analysis.certificate_findings %} - - - - - - {% endfor %} - -
TITLESEVERITYDESCRIPTION
{{ find.2 }} - {% if find.0 == 'high' %} - high - {% elif find.0 == 'secure' %} - secure - {% elif find.0 == 'warning' %} - warning - {% elif find.0 == 'info' %} - info - {% endif %} - {{ find.1 }}
{% else %} Failed to read Code Signing Certificate or none available. @@ -430,7 +401,6 @@ {% endif %} -

NETWORK SECURITY

@@ -468,7 +438,37 @@ {% endfor %}
- +

CERTIFICATE ANALYSIS

+ + + + + + + + + + {% if 'certificate_findings' in certificate_analysis %} + {% for find in certificate_analysis.certificate_findings %} + + + + + + {% endfor %} + {% endif %} + +
TITLESEVERITYDESCRIPTION
{{ find.2 }} + {% if find.0 == 'high' %} + high + {% elif find.0 == 'secure' %} + secure + {% elif find.0 == 'warning' %} + warning + {% elif find.0 == 'info' %} + info + {% endif %} + {{ find.1 }}

MANIFEST ANALYSIS

diff --git a/mobsf/templates/static_analysis/android_binary_analysis.html b/mobsf/templates/static_analysis/android_binary_analysis.html index fd559573..ed694947 100755 --- a/mobsf/templates/static_analysis/android_binary_analysis.html +++ b/mobsf/templates/static_analysis/android_binary_analysis.html @@ -125,6 +125,14 @@

+
  • + + +

    + Certificate Analysis +

    +     +
  • @@ -671,37 +679,6 @@

    {% if certificate_analysis %} 
    {{ certificate_analysis.certificate_info }}
    - -
    -
    • - - - - - - - - - {% for find in certificate_analysis.certificate_findings %} - - - - - - {% endfor %} - -
    TITLESEVERITYDESCRIPTION
    {{ find.2 }} - {% if find.0 == 'high' %} - high - {% elif find.0 == 'secure' %} - secure - {% elif find.0 == 'warning' %} - warning - {% elif find.0 == 'info' %} - info - {% endif %} - {{ find.1 }}
    - {% else %} Failed to read Code Signing Certificate. {% endif %} @@ -947,6 +924,59 @@ + + + +
    +
    +
    +
    +
    +
    +

    + CERTIFICATE ANALYSIS +

    +
    + + + + + + + + + + + {% if certificate_analysis %} + {% for find in certificate_analysis.certificate_findings %} + + + + + + {% endfor %} + {% endif %} + +
    TITLESEVERITYDESCRIPTION
    {{ find.2 }} + {% if find.0 == 'high' %} + high + {% elif find.0 == 'secure' %} + secure + {% elif find.0 == 'warning' %} + warning + {% elif find.0 == 'info' %} + info + {% endif %} + {{ find.1 }}
    +
    +
    +
    +
    + +
    +
    +
    +