sync

cccs-mog · Sep 23, 2024 · a0e9a77 · a0e9a77
1 parent 03acb68
commit a0e9a77
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/web/submission/views.py b/web/submission/views.py
@@ -465,10 +465,11 @@ def index(request, task_id=None, resubmit_hash=None):
                                 paths.append(path)
 
                 if not paths:
-                    # Self Extracted support folder
-                    path = os.path.join(settings.CUCKOO_PATH, "storage", "analyses", str(task_id), "selfextracted", hash)
-                    if path_exists(path):
-                        paths.append(path)
+                    for folder_name in ("selfextracted", "files"):
+                        # Self Extracted support folder
+                        path = os.path.join(settings.CUCKOO_PATH, "storage", "analyses", str(task_id), folder_name, hash)
+                        if path_exists(path):
+                            paths.append(path)
 
                 if not paths:
                     details["errors"].append({hash: "File not found on hdd for resubmission"})

diff --git a/web/templates/analysis/generic/_file_info.html b/web/templates/analysis/generic/_file_info.html
@@ -5,7 +5,7 @@
         {% if tab_name == "static" %}
             style="table-layout: fixed;"
         {% else %}
-           style="table-layout: fixed; width: 50%;margin-left: auto;margin-right: auto;"
+            style="table-layout: fixed; width: 50%;margin-left: auto;margin-right: auto;"
         {% endif %}
         >
 
@@ -176,17 +176,17 @@
         {% if file.yara %}
         <tr>
             <th>
-             {% if config.yara_detail %}
+            {% if config.yara_detail %}
                 <a class="btn btn-secondary btn-sm" data-toggle="collapse" href="#yara_{{file.sha256}}" role="button" aria-expanded="false" aria-controls="yara_{{file.sha256}}"  data-bs-toggle="tooltip" title="Display Yara details"><span class="fas fa-file-lines"></span> Yara</a>
-             {% else %}
+            {% else %}
                 Yara
             {% endif %}
             </th>
             <td>
                 <ul style="margin-bottom: 0;">
                 {% for sign in file.yara %}
                     <li>
-                    {{sign.name}} - {{sign.meta.description}}
+                    <a href="/analysis/search/yaraname:{{sign.name}}">{{sign.name}}</a>  - {{sign.meta.description}}
                     {% if sign.meta.author %}
                         - Author: {{sign.meta.author}}
                     {% endif %}
@@ -209,7 +209,7 @@
                 <ul style="margin-bottom: 0;">
                 {% for sign in file.cape_yara %}
                     <li>
-                    {{sign.name}}
+                    <a href="/analysis/search/capeyara:{{sign.name}}">{{sign.name}}</a>
                     {% if sign.meta.cape_type %} - {{sign.meta.cape_type}}
                     {% elif sign.meta.description %} - {{sign.meta.description}}
                     {% endif %}

diff --git a/web/templates/analysis/generic/_subfile_info.html b/web/templates/analysis/generic/_subfile_info.html
@@ -172,7 +172,7 @@
                 <ul style="margin-bottom: 0;">
                 {% for sign in sub_file.yara %}
                     <li>
-                    {{sign.name}} - {{sign.meta.description}}
+                    <a href="/analysis/search/yaraname:{{sign.name}}">{{sign.name}}</a>  - {{sign.meta.description}}
                     {% if sign.meta.author %}
                         - Author: {{sign.meta.author}}
                     {% endif %}
@@ -195,7 +195,7 @@
                 <ul style="margin-bottom: 0;">
                 {% for sign in sub_file.cape_yara %}
                     <li>
-                    {{sign.name}}
+                    <a href="/analysis/search/capeyara:{{sign.name}}">{{sign.name}}</a>
                     {% if sign.meta.cape_type %} - {{sign.meta.cape_type}}
                     {% elif sign.meta.description %} - {{sign.meta.description}}
                     {% endif %}