Merge pull request #917 from cvandeplas/main

fix: [modules] Gracefully accept no hashlookup fixes #916
pull/918/head
Raphaël Vinot 2024-05-21 15:07:08 +02:00 committed by GitHub
commit ac2c5b16cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 7 deletions

5
cache/run_redis.sh vendored
View File

@ -5,6 +5,9 @@ set -x
if [ -f ../../valkey/src/valkey-server ]; then if [ -f ../../valkey/src/valkey-server ]; then
../../valkey/src/valkey-server ./cache.conf ../../valkey/src/valkey-server ./cache.conf
else elif [ -f ../../redis/src/redis-server ]; then
../../redis/src/redis-server ./cache.conf ../../redis/src/redis-server ./cache.conf
else
echo "Warning: using system redis-server. Valkey-server or redis-server from source is recommended." >&2
/usr/bin/redis-server ./cache.conf
fi fi

View File

@ -5,6 +5,9 @@ set -x
if [ -f ../../valkey/src/valkey-server ]; then if [ -f ../../valkey/src/valkey-server ]; then
../../valkey/src/valkey-server ./indexing.conf ../../valkey/src/valkey-server ./indexing.conf
else elif [ -f ../../redis/src/redis-server ]; then
../../redis/src/redis-server ./indexing.conf ../../redis/src/redis-server ./indexing.conf
else
echo "Warning: using system redis-server. Valkey-server or redis-server from source is recommended." >&2
/usr/bin/redis-server ./indexing.conf
fi fi

View File

@ -962,10 +962,14 @@ def urls_rendered_page(tree_uuid: str) -> WerkzeugResponse | str | Response:
@app.route('/tree/<string:tree_uuid>/hashlookup', methods=['GET']) @app.route('/tree/<string:tree_uuid>/hashlookup', methods=['GET'])
def hashlookup(tree_uuid: str) -> str | WerkzeugResponse | Response: def hashlookup(tree_uuid: str) -> str | WerkzeugResponse | Response:
merged, total_ressources = lookyloo.merge_hashlookup_tree(tree_uuid) try:
# We only want unique URLs for the template merged, total_ressources = lookyloo.merge_hashlookup_tree(tree_uuid)
for sha1, entries in merged.items(): # We only want unique URLs for the template
entries['nodes'] = {node.name for node in entries['nodes']} for sha1, entries in merged.items():
entries['nodes'] = {node.name for node in entries['nodes']}
except Exception: # error or module not enabled
merged = {}
total_ressources = 0
return render_template('hashlookup.html', base_tree_uuid=tree_uuid, merged=merged, total_ressources=total_ressources) return render_template('hashlookup.html', base_tree_uuid=tree_uuid, merged=merged, total_ressources=total_ressources)

View File

@ -1,4 +1,8 @@
<div> <div>
{% if not merged %}
No result data available or hashlookup module not enabled.
{%else%}
<b>Total Hits</b>: {{ merged|length }}</br> <b>Total Hits</b>: {{ merged|length }}</br>
<b>Total ressources</b>: {{total_ressources}}</br></br> <b>Total ressources</b>: {{total_ressources}}</br></br>
{% for sha1, entries in merged.items() %} {% for sha1, entries in merged.items() %}
@ -25,4 +29,5 @@
</dd> </dd>
</dl> </dl>
{% endfor %} {% endfor %}
{%endif%}
</div> </div>

View File

@ -434,7 +434,7 @@
</div> </div>
{% endif %} {% endif %}
<a id="help" href="https://www.lookyloo.eu/docs/main/usage.html#_investigate_a_capture" role="button" title="Lookyloo Manual">?</a> <a id="help" href="https://www.lookyloo.eu/docs/main/usage.html#_investigate_a_capture" role="button" title="Lookyloo Manual" target="_blank">?</a>
</div> </div>
</div> </div>