diff --git a/Pipfile b/Pipfile index 8fa2820..8d6dd33 100644 --- a/Pipfile +++ b/Pipfile @@ -11,7 +11,6 @@ har2tree = {editable = true,git = "https://github.com/viper-framework/har2tree.g pysanejs = {editable = true,git = "https://github.com/CIRCL/PySaneJS.git"} requests = "*" flask = "*" -flask-bootstrap = "*" gunicorn = {extras = ["eventlet"],version = "*"} lookyloo = {editable = true,path = "."} cchardet = "*" @@ -19,6 +18,7 @@ redis = "*" pylookyloo = {editable = true,path = "./client"} beautifulsoup4 = "*" Jinja2 = ">=2.10.1" # CVE-2019-10906 +bootstrap-flask = "*" [requires] python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock index acf7f33..df58614 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "e45244dace1dbbaf712a9c3aefea7e4df013992eb9d4ea696998fcbfeeb95027" + "sha256": "66ef41ece712d33e666d4684670c5779fac61dad2530d5fc573e08e126663550" }, "pipfile-spec": 6, "requires": { @@ -46,6 +46,14 @@ "index": "pypi", "version": "==4.7.1" }, + "bootstrap-flask": { + "hashes": [ + "sha256:eccca4891d4fe0cd98f7118ef11599356152f53b4545579b67269b7b5bf8f18a", + "sha256:fe7de577eb4ea06273760331c3294a13f6063a275e59e899e9ebcc8b8304502c" + ], + "index": "pypi", + "version": "==1.0.10" + }, "cchardet": { "hashes": [ "sha256:079aa02a14072874d943a671ba778a9def5b0e3cedc2ac9f59308526cfb31472", @@ -174,13 +182,6 @@ ], "version": "==1.16.0" }, - "dominate": { - "hashes": [ - "sha256:4076735c0745fe771e57b2313dbb4bfeec42731816ee23cee509f66e8912aa51", - "sha256:4b9fd42d2824b79761799590697db45bf93daad511b130c50513af38da33df9b" - ], - "version": "==2.3.5" - }, "ete3": { "hashes": [ "sha256:870a3d4b496a36fbda4b13c7c6b9dfa7638384539ae93551ec7acb377fb9c385" @@ -202,13 +203,6 @@ "index": "pypi", "version": "==1.0.2" }, - "flask-bootstrap": { - "hashes": [ - "sha256:cb08ed940183f6343a64e465e83b3a3f13c53e1baabb8d72b5da4545ef123ac8" - ], - "index": "pypi", - "version": "==3.3.7.1" - }, "greenlet": { "hashes": [ "sha256:000546ad01e6389e98626c1367be58efa613fa82a1be98b0c6fc24b563acc6d0", @@ -247,7 +241,7 @@ "har2tree": { "editable": true, "git": "https://github.com/viper-framework/har2tree.git", - "ref": "ef775ee0c788ce80a0bda9efdd0c612c1dddca6c" + "ref": "a4dd3cc1a24972acbe808444a31553170c9b82c2" }, "hyperlink": { "hashes": [ @@ -489,16 +483,10 @@ }, "urllib3": { "hashes": [ - "sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39", - "sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22" + "sha256:4c291ca23bbb55c76518905869ef34bdd5f0e46af7afe6861e8375643ffee1a0", + "sha256:9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3" ], - "version": "==1.24.1" - }, - "visitor": { - "hashes": [ - "sha256:2c737903b2b6864ebc6167eef7cf3b997126f1aa94bdf590f90f1436d23e480a" - ], - "version": "==0.1.3" + "version": "==1.24.2" }, "w3lib": { "hashes": [ diff --git a/doc/img_sources/arrow.xcf b/doc/img_sources/arrow.xcf new file mode 100644 index 0000000..487fe38 Binary files /dev/null and b/doc/img_sources/arrow.xcf differ diff --git a/website/web/static/maximize1.jpg b/website/web/static/maximize1.jpg new file mode 100644 index 0000000..b14b5d2 Binary files /dev/null and b/website/web/static/maximize1.jpg differ diff --git a/website/web/static/maximize2.jpg b/website/web/static/maximize2.jpg new file mode 100644 index 0000000..2c7a95e Binary files /dev/null and b/website/web/static/maximize2.jpg differ diff --git a/website/web/static/minimize1.jpg b/website/web/static/minimize1.jpg new file mode 100644 index 0000000..50bbd6b Binary files /dev/null and b/website/web/static/minimize1.jpg differ diff --git a/website/web/static/minimize2.jpg b/website/web/static/minimize2.jpg new file mode 100644 index 0000000..2019633 Binary files /dev/null and b/website/web/static/minimize2.jpg differ diff --git a/website/web/static/tree.css b/website/web/static/tree.css index 2f79095..83d7a9d 100644 --- a/website/web/static/tree.css +++ b/website/web/static/tree.css @@ -46,6 +46,16 @@ border: 2px solid; } +#legend_container { + position: fixed; + bottom: 5px; + left: 5px; + padding-top: 5px; + padding-right: 5px; + padding-bottom: 5px; + padding-left: 5px; +} + #legend { position: fixed; bottom: 5px; @@ -90,3 +100,13 @@ font: 15px sans-serif; z-index: 2; } + +hr { + display: block; + margin-top: 0.1em; + margin-bottom: 0.5em; + margin-left: auto; + margin-right: auto; + border-style: inset; + border-width: 1px; +} diff --git a/website/web/templates/main.html b/website/web/templates/main.html index b65ea61..2802ea7 100644 --- a/website/web/templates/main.html +++ b/website/web/templates/main.html @@ -1,17 +1,30 @@ -{% extends "bootstrap/base.html" %} + + + + {% block head %} + + + + -{% block scripts %} - {{ super() }} - - -{% endblock %} + {% block styles %} + + {{ bootstrap.load_css() }} + + {% endblock %} -{% block head %} - {{ super() }} - - -{% endblock %} + Your page title + {% endblock %} + + + + {% block content %}{% endblock%} -{% block content %} - {{ super() }} -{% endblock %} + {% block scripts %} + + {{ bootstrap.load_js() }} + + + {% endblock %} + + diff --git a/website/web/templates/tree.html b/website/web/templates/tree.html index 10848ba..adcc2e7 100644 --- a/website/web/templates/tree.html +++ b/website/web/templates/tree.html @@ -10,54 +10,80 @@ {% block content %} {{super()}}
-
- JavaScript Javascript
- Cookie received Cookie received
+
+
+
+
+
+ Legend +
+
+ +
+
+
+
+ JavaScript Javascript
- Cookie read Cookie read
+ Cookie received Cookie received
- Redirect Redirect
+ Cookie read Cookie read
- Font Font
+ Redirect Redirect
- HTML HTML
+ Font Font
- JSON JSON
+ HTML HTML
- CSS CSS
+ JSON JSON
- EXE EXE
+ CSS CSS
- Image Image
+ EXE EXE
- Video Video
+ Image Image
- iFrame iFrame
+ Video Video
- Content type not set/unknown Content type not set/unknown
+ iFrame iFrame
+ Content type not set/unknown Content type not set/unknown
+
+
+
+ +
+
+ Legend +
+
+
Tree details

Root URL: {{ root_url }}
Start time: {{ start_time }}