From d04db67d2db26dcebf118d84c9bc4a04b5f6159c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Fri, 22 May 2020 17:36:22 +0200 Subject: [PATCH] Improve hostname popup --- lookyloo/modules.py | 24 +++++++- website/web/__init__.py | 10 +++- website/web/templates/hostname_popup.html | 70 +++++++++++------------ website/web/templates/scrape.html | 18 +++--- 4 files changed, 72 insertions(+), 50 deletions(-) diff --git a/lookyloo/modules.py b/lookyloo/modules.py index d3345d2..5c33388 100644 --- a/lookyloo/modules.py +++ b/lookyloo/modules.py @@ -19,8 +19,28 @@ from pysanejs import SaneJS class SaneJavaScript(): skip_lookup: Dict[str, str] = { - "717ea0ff7f3f624c268eccb244e24ec1305ab21557abb3d6f1a7e183ff68a2d28f13d1d2af926c9ef6d1fb16dd8cbe34cd98cacf79091dddc7874dcee21ecfdc": "1*1px gif", - "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e": "Empty file" + "717ea0ff7f3f624c268eccb244e24ec1305ab21557abb3d6f1a7e183ff68a2d28f13d1d2af926c9ef6d1fb16dd8cbe34cd98cacf79091dddc7874dcee21ecfdc": "This is a 1*1 pixel GIF", + "e508d5d17e94d14b126164082342a9ca4774f404e87a3dd56c26812493ee18d9c3d6daacca979134a94a003066aca24116de874596d00d1e52130c1283d54209": "This is a 1*1 pixel GIF", + "2d073e10ae40fde434eb31cbedd581a35cd763e51fb7048b88caa5f949b1e6105e37a228c235bc8976e8db58ed22149cfccf83b40ce93a28390566a28975744a": "This is a 1*1 pixel GIF", + "84e24a70b78e9de9c9d0dfeb49f3f4247dbc1c715d8844471ee40669270682e199d48f5fbec62bd984c9c0270534b407c4d2561dd6c05adec3c83c1534f32d5c": "This is a 1*1 pixel GIF", + "d5da26b5d496edb0221df1a4057a8b0285d15592a8f8dc7016a294df37ed335f3fde6a2252962e0df38b62847f8b771463a0124ef3f84299f262ed9d9d3cee4c": "This is a 1*1 pixel GIF", + "f7a5f748f4c0d3096a3ca972886fe9a9dff5dce7792779ec6ffc42fa880b3815e2e4c3bdea452352f3844b81864c9bfb7861f66ac961cfa66cb9cb4febe568e8": "This is a 1*1 pixel GIF", + "b2ca25a3311dc42942e046eb1a27038b71d689925b7d6b3ebb4d7cd2c7b9a0c7de3d10175790ac060dc3f8acf3c1708c336626be06879097f4d0ecaa7f567041": "This is a 1*1 pixel GIF", + "b8d82d64ec656c63570b82215564929adad167e61643fd72283b94f3e448ef8ab0ad42202f3537a0da89960bbdc69498608fc6ec89502c6c338b6226c8bf5e14": "This is a 1*1 pixel GIF", + "2991c3aa1ba61a62c1cccd990c0679a1fb8dccd547d153ec0920b91a75ba20820de1d1c206f66d083bf2585d35050f0a39cd7a3e11c03882dafec907d27a0180": "This is a 1*1 pixel GIF", + "b1a6cfa7b21dbb0b281d241af609f3ba7f3a63e5668095bba912bf7cfd7f0320baf7c3b0bfabd0f8609448f39902baeb145ba7a2d8177fe22a6fcea03dd29be1": "This is a 1*1 pixel GIF", + "ebfe0c0df4bcc167d5cb6ebdd379f9083df62bef63a23818e1c6adf0f64b65467ea58b7cd4d03cf0a1b1a2b07fb7b969bf35f25f1f8538cc65cf3eebdf8a0910": "This is a 1*1 pixel GIF", + "1d68b92e8d822fe82dc7563edd7b37f3418a02a89f1a9f0454cca664c2fc2565235e0d85540ff9be0b20175be3f5b7b4eae1175067465d5cca13486aab4c582c": "This is a 1*1 pixel GIF", + "ac44da7f455bfae52b883639964276026fb259320902aa813d0333e021c356a7b3e3537b297f9a2158e588c302987ce0854866c039d1bb0ffb27f67560739db2": "This is a 1*1 pixel GIF", + "921944dc10fbfb6224d69f0b3ac050f4790310fd1bcac3b87c96512ad5ed9a268824f3f5180563d372642071b4704c979d209baf40bc0b1c9a714769aba7dfc7": "This is a 1*1 pixel GIF", + "89dfc38ec77cf258362e4db7c8203cae8a02c0fe4f99265b0539ec4f810c84f8451e22c9bef1ebc59b4089af7e93e378e053c542a5967ec4912d4c1fc5de22f0": "This is a 1*1 pixel GIF", + "280ea4383ee6b37051d91c5af30a5ce72aa4439340fc6d31a4fbe7ba8a8156eb7893891d5b2371b9fc4934a78f08de3d57e5b63fa9d279a317dcbefb8a07a6b0": "This is a 1*1 pixel GIF", + "3844065e1dd778a05e8cc39901fbf3191ded380d594359df137901ec56ca52e03d57eb60acc2421a0ee74f0733bbb5d781b7744685c26fb013a236f49b02fed3": "This is a 1*1 pixel GIF", + "bd9ab35dde3a5242b04c159187732e13b0a6da50ddcff7015dfb78cdd68743e191eaf5cddedd49bef7d2d5a642c217272a40e5ba603fe24ca676a53f8c417c5d": "This is a 1*1 pixel GIF", + "d052ecec2839340876eb57247cfc2e777dd7f2e868dc37cd3f3f740c8deb94917a0c9f2a4fc8229987a0b91b04726de2d1e9f6bcbe3f9bef0e4b7e0d7f65ea12": "This is a 1*1 pixel GIF", + "8717074ddf1198d27b9918132a550cb4ba343794cc3d304a793f9d78c9ff6c4929927b414141d40b6f6ad296725520f4c63edeb660ed530267766c2ab74ee4a9": "This is a 1*1 pixel GIF", + "f1c33e72643ce366fd578e3b5d393799e8c9ea27b180987826af43b4fc00b65a4eaae5e6426a23448956fee99e3108c6a86f32fb4896c156e24af0571a11c498": "This is a 1*1 pixel PNG", + "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e": "This is an empty file" } def __init__(self, config: Dict[str, Any]): diff --git a/website/web/__init__.py b/website/web/__init__.py index 15ef17b..0575b56 100644 --- a/website/web/__init__.py +++ b/website/web/__init__.py @@ -155,8 +155,14 @@ def hostnode_popup(tree_uuid: str, node_uuid: str): for url in hostnode.urls: if lookyloo.sanejs.available and hasattr(url, 'body_hash') and url.body_hash in lookups: url.add_feature('sane_js_details', lookups[url.body_hash]) - if lookups[url.body_hash] and isinstance(lookups[url.body_hash], list): - url.add_feature('sane_js_details_to_print', f'{" ".join(lookups[url.body_hash][0].split("|"))} and {len(lookups[url.body_hash])-1} other files') + if lookups[url.body_hash]: + if isinstance(lookups[url.body_hash], list): + libname, version, path = lookups[url.body_hash][0].split("|") + other_files = len(lookups[url.body_hash]) + url.add_feature('sane_js_details_to_print', (libname, version, path, other_files)) + else: + # Predefined generic file + url.add_feature('sane_js_details_to_print', lookups[url.body_hash]) urls.append(url) return render_template('hostname_popup.html', tree_uuid=tree_uuid, diff --git a/website/web/templates/hostname_popup.html b/website/web/templates/hostname_popup.html index b598402..d82702e 100644 --- a/website/web/templates/hostname_popup.html +++ b/website/web/templates/hostname_popup.html @@ -17,42 +17,38 @@ Get URLs as text

Click on the URL to get the content of the response

-
- - - - - - {% for alt, path in keys.items() %} - - {% endfor %} - - - - {% for url in urls %} - - - - {% for key in keys.keys() %} - + - {% endfor %} - -
URLKnown file{{ alt }}
- {{ url.name }} -
- {% if url.sane_js_details_to_print %} - {{ url.sane_js_details_to_print }} - {% else %} - {{ url.sane_js_details }} - {% endif %} -
- {% if url[key] %} - X - {% else%} - - - {%endif%} -
-
+ + {% if url.body %} +
+ Body size: {{ url.body.getbuffer().nbytes}} +
+ {% else %} + Empty body. + {%endif%} + {% if url.sane_js_details_to_print %} +
+ {% if url.sane_js_details_to_print is string %} + {{ url.sane_js_details_to_print }} + {% else %} + This file is known as part of {{ url.sane_js_details_to_print[0] }} + version {{ url.sane_js_details_to_print[1] }}: {{ url.sane_js_details_to_print[2] }}. + {% if url.sane_js_details_to_print[3] > 1%} + It is also present in {{ url.sane_js_details_to_print[3] -1 }} other libraries. + {%endif%} + {%endif%} +
+ {% endif %} + + {% endfor %} + {% endblock %} diff --git a/website/web/templates/scrape.html b/website/web/templates/scrape.html index 6d5c640..cef6f5f 100644 --- a/website/web/templates/scrape.html +++ b/website/web/templates/scrape.html @@ -9,6 +9,14 @@
+
+
+
+ + +
+
+
@@ -33,14 +41,6 @@
-
-
-
- - -
-
-
@@ -89,7 +89,7 @@ {% endfor%} {% endfor%}
-
+
{% endblock %}