new: Display proxy if passed to the CaptureSettings

Fix #695
pull/699/head
Raphaël Vinot 2023-05-15 16:33:43 +02:00
parent 4f07b1253e
commit 95f05a3da1
3 changed files with 19 additions and 2 deletions

View File

@ -263,6 +263,16 @@ class Lookyloo():
json.dump(meta, f)
return meta
def get_capture_settings(self, capture_uuid: str, /) -> CaptureSettings:
cache = self.capture_cache(capture_uuid)
if not cache:
return {}
cs_file = cache.capture_dir / 'capture_settings.json'
if cs_file.exists():
with cs_file.open('r') as f:
return json.load(f)
return {}
def categories_capture(self, capture_uuid: str, /) -> Dict[str, Any]:
'''Get all the categories related to a capture, in MISP Taxonomies format'''
categ_file = self._captures_index[capture_uuid].capture_dir / 'categories'

View File

@ -727,6 +727,7 @@ def tree(tree_uuid: str, node_uuid: Optional[str]=None):
b64_thumbnail = lookyloo.get_screenshot_thumbnail(tree_uuid, for_datauri=True)
screenshot_size = lookyloo.get_screenshot(tree_uuid).getbuffer().nbytes
meta = lookyloo.get_meta(tree_uuid)
capture_settings = lookyloo.get_capture_settings(tree_uuid)
hostnode_to_highlight = None
if node_uuid:
try:
@ -770,7 +771,8 @@ def tree(tree_uuid: str, node_uuid: Optional[str]=None):
auto_trigger_modules=auto_trigger_modules,
confirm_message=confirm_message if confirm_message else 'Tick to confirm.',
parent_uuid=cache.parent,
has_redirects=True if cache.redirects else False)
has_redirects=True if cache.redirects else False,
capture_settings=capture_settings)
except NoValidHarFile:
flash(f'Unable to build a tree for {tree_uuid}: {cache.error}.', 'warning')

View File

@ -455,13 +455,18 @@
<dd class="col-sm-10">{{ info.referer }}</dd>
{%endif%}
{% if meta %}
{% for k, v in meta.items() if k not in ['user_agent'] %}
<dt class="col-sm-2">{{k.title()}}</dt>
<dd class="col-sm-10">{{ v }}</dd>
{% endfor %}
{%endif%}
{% if capture_settings %}
{% for k, v in capture_settings.items() if v and k in ['proxy']%}
<dt class="col-sm-2">{{k.title()}}</dt>
<dd class="col-sm-10">{{ v }}</dd>
{% endfor %}
{%endif%}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>