mirror of https://github.com/CIRCL/lookyloo
new: Wait page when a capture is queued/ongoing
parent
b6ea1c24db
commit
ca0bd97689
|
@ -22,7 +22,8 @@ from werkzeug.security import generate_password_hash, check_password_hash
|
||||||
|
|
||||||
from pymisp import MISPEvent
|
from pymisp import MISPEvent
|
||||||
|
|
||||||
from lookyloo.helpers import get_homedir, update_user_agents, get_user_agents, get_config, get_taxonomies, load_cookies
|
from lookyloo.helpers import (get_homedir, update_user_agents, get_user_agents, get_config,
|
||||||
|
get_taxonomies, load_cookies, CaptureStatus)
|
||||||
from lookyloo.lookyloo import Lookyloo, Indexing
|
from lookyloo.lookyloo import Lookyloo, Indexing
|
||||||
from lookyloo.exceptions import NoValidHarFile, MissingUUID
|
from lookyloo.exceptions import NoValidHarFile, MissingUUID
|
||||||
from .proxied import ReverseProxied
|
from .proxied import ReverseProxied
|
||||||
|
@ -466,8 +467,15 @@ def tree(tree_uuid: str, node_uuid: Optional[str]=None):
|
||||||
try:
|
try:
|
||||||
cache = lookyloo.capture_cache(tree_uuid)
|
cache = lookyloo.capture_cache(tree_uuid)
|
||||||
except MissingUUID:
|
except MissingUUID:
|
||||||
flash(f'Unable to find this UUID ({tree_uuid}). The capture may still be ongoing, try again later.', 'error')
|
status = lookyloo.get_capture_status(tree_uuid)
|
||||||
return redirect(url_for('index'))
|
if status == CaptureStatus.UNKNOWN:
|
||||||
|
flash(f'Unable to find this UUID ({tree_uuid}).', 'error')
|
||||||
|
return redirect(url_for('index'))
|
||||||
|
elif status == CaptureStatus.QUEUED:
|
||||||
|
message = "The capture it queued, but didn't start yet."
|
||||||
|
elif status == CaptureStatus.ONGOING:
|
||||||
|
message = "The capture it ongoing."
|
||||||
|
return render_template('tree_wait.html', message=message, tree_uuid=tree_uuid)
|
||||||
|
|
||||||
if not cache:
|
if not cache:
|
||||||
flash('Invalid cache.', 'error')
|
flash('Invalid cache.', 'error')
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
{% extends "main.html" %}
|
||||||
|
{% block title %}Ongoing capture...{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="container">
|
||||||
|
</br>
|
||||||
|
</br>
|
||||||
|
</br>
|
||||||
|
</br>
|
||||||
|
</br>
|
||||||
|
</br>
|
||||||
|
<center>
|
||||||
|
<b>{{ message }}
|
||||||
|
</br>
|
||||||
|
Please wait...
|
||||||
|
</b>
|
||||||
|
|
||||||
|
</center>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<meta http-equiv="refresh" content="10;url={{url_for('tree', tree_uuid=tree_uuid)}}" />
|
||||||
|
{% endblock %}
|
Loading…
Reference in New Issue