CIRCL
/
lookyloo
mirror of https://github.com/CIRCL/lookyloo
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: Avoid captures without url(s) or document

pull/526/head
Raphaël Vinot 2022-09-27 11:33:36 +02:00
parent 33d30a3f4c
commit 5cd8169735
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/archiver.py
View File

@ -77,16 +77,18 @@ class Archiver(AbstractManager):
def _update_all_capture_indexes(self): def _update_all_capture_indexes(self):
'''Run that after the captures are in the proper directories''' '''Run that after the captures are in the proper directories'''
# Recent captures # Recent captures
self.logger.info('Update recent indexes')
directories_to_index = {capture_dir.parent.parent for capture_dir in get_captures_dir().rglob('uuid')} directories_to_index = {capture_dir.parent.parent for capture_dir in get_captures_dir().rglob('uuid')}
for directory_to_index in directories_to_index: for directory_to_index in directories_to_index:
self.logger.info(f'Updating index for {directory_to_index}') self.logger.debug(f'Updating index for {directory_to_index}')
self._update_index(directory_to_index) self._update_index(directory_to_index)
self.logger.info('Recent indexes updated') self.logger.info('Recent indexes updated')
# Archived captures # Archived captures
self.logger.info('Update archives indexes')
directories_to_index = {capture_dir.parent.parent for capture_dir in self.archived_captures_dir.rglob('uuid')} directories_to_index = {capture_dir.parent.parent for capture_dir in self.archived_captures_dir.rglob('uuid')}
for directory_to_index in directories_to_index: for directory_to_index in directories_to_index:
self.logger.info(f'Updating index for {directory_to_index}') self.logger.debug(f'Updating index for {directory_to_index}')
self._update_index(directory_to_index) self._update_index(directory_to_index)
self.logger.info('Archived indexes updated') self.logger.info('Archived indexes updated')

20
website/web/templates/capture.html
View File

@ -53,7 +53,7 @@
<div class="row input-group mb-3"> <div class="row input-group mb-3">
<label for="url" class="col-sm-1 col-form-label">URL:</label> <label for="url" class="col-sm-1 col-form-label">URL:</label>
<input type="text" class="form-control col-auto" name="url" id=singleCaptureField <input type="text" class="form-control col-auto" name="url" id=singleCaptureField
placeholder="URL to capture" value="{{predefined_url_to_capture}}"> placeholder="URL to capture" value="{{predefined_url_to_capture}}" required>
<textarea class="form-control col-auto d-none" placeholder="URLs to capture, one per line" <textarea class="form-control col-auto d-none" placeholder="URLs to capture, one per line"
name="urls" id=multipleCapturesField></textarea> name="urls" id=multipleCapturesField></textarea>
@ -298,17 +298,35 @@
<script src='{{ url_for('static', filename='capture.js') }}' <script src='{{ url_for('static', filename='capture.js') }}'
integrity="{{get_sri('static', 'capture.js')}}" integrity="{{get_sri('static', 'capture.js')}}"
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script>
$('#nav-url-tab').on('click', function(e) {
document.getElementById("singleCaptureField").required = true;
document.getElementById("document").required = false;
$("#singleCaptureField").removeClass("d-none");
document.getElementById('multipleCaptures').checked = false;
$("#multipleCapturesField").addClass("d-none");
});
$('#nav-doc-tab').on('click', function(e) {
document.getElementById("document").required = true;
document.getElementById("multipleCapturesField").required = false;
document.getElementById("singleCaptureField").required = false;
});
</script>
<script> <script>
$('#multipleCaptures').on('click', function(e) { $('#multipleCaptures').on('click', function(e) {
if (document.getElementById('multipleCaptures').checked == true) { if (document.getElementById('multipleCaptures').checked == true) {
document.getElementById('singleCaptureField').value = ''; document.getElementById('singleCaptureField').value = '';
$("#singleCaptureField").addClass("d-none"); $("#singleCaptureField").addClass("d-none");
document.getElementById("singleCaptureField").required = false;
$("#multipleCapturesField").removeClass("d-none"); $("#multipleCapturesField").removeClass("d-none");
document.getElementById("multipleCapturesField").required = true;
} }
else { else {
document.getElementById('multipleCapturesField').value = ''; document.getElementById('multipleCapturesField').value = '';
$("#singleCaptureField").removeClass("d-none"); $("#singleCaptureField").removeClass("d-none");
document.getElementById("singleCaptureField").required = true;
$("#multipleCapturesField").addClass("d-none"); $("#multipleCapturesField").addClass("d-none");
document.getElementById("multipleCapturesField").required = false;
} }
}) })
</script> </script>