mirror of https://github.com/CIRCL/lookyloo
Fix: Template Literals, correct descendent selector, unify tab size, SRI
AntoniaBK
parent
4fd73f933d
commit
6a10af6aa4
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"static": {
|
||||
"bomb.svg": "Tro3+kCLzfBNBve2gPnsmXsl+tHUQVrFz77zfrWwnAuTraehZaoAfVJgGOYdG8zceXdGLEKzXVi3GdtEXw0sYQ==",
|
||||
"capture.js": "Y6vfKnC2rQFeFSEARNb1BgMEFCTTfEr35Xs0Hy0Gnmn5JiXrSDtWxFogq8xPUpZu0AhRJRk/N/dRCGJdhvFDMA==",
|
||||
"capture.js": "Aw5XUbtz3hOs/27CRnYBJ/VRkJJvcVOAwLPD/xRnPzkdHcxn0eHTmOzN/agGk671W8BSp5mLzAJijGLKwf98Qw==",
|
||||
"check.svg": "CRqUAM/yXxgJwpfg3TeoKD+CIqQj62lxqS3zeCmdPaV3dKftk4jk5Mqc1TGxL7i61X1sgV0/f+KJLEOKTw01ww==",
|
||||
"cookie_in_url.png": "hs/oNPnrR2DkDX9Yp6Daug/QqpWJHemJE6lXpxNafjgOYooezp3DpbqKqADT7QcfcTxxUfe1iPDZJlHOrNMAcw==",
|
||||
"cookie_read.png": "mdXCeuNFPvshSwIXAJLoR1xFjXb+K2Mgu47Q1fnUAO8j1N2c/uJuE8sGuBHHbS8HOyr/CbOC6Uf3zsm9KvAs8Q==",
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ document.getElementById('multipleCaptures').addEventListener('click', function (
|
|||
document.getElementById("os").addEventListener("change", function () {
|
||||
let osSelect = document.getElementById("os");
|
||||
let os_name = osSelect.options[osSelect.selectedIndex].value.replace(/(:|\.|\[|\]|,|=|\\)/g, "\\$1").replace(/ /g, "_");
|
||||
let first_browser_name = document.querySelector("[id='" + os_name + "'] select option:first-child").value.replace(/(:|\.|\[|\]|,|=|\\)/g, "\\$1").replace(/ /g, "_");
|
||||
let first_browser_name = document.querySelector(`[id='${os_name}'] select option:first-child`).value.replace(/(:|\.|\[|\]|,|=|\\)/g, "\\$1").replace(/ /g, "_");
|
||||
|
||||
// Hide and disable everything
|
||||
document.querySelectorAll("#os option").forEach(function (option) {
|
||||
|
|
@ -55,7 +55,7 @@ document.getElementById("os").addEventListener("change", function () {
|
|||
document.querySelectorAll(".style-sub-1").forEach(function (element) {
|
||||
element.style.display = 'none';
|
||||
});
|
||||
document.querySelectorAll(".style-sub-1 > div > select").forEach(function (select) {
|
||||
document.querySelectorAll(".style-sub-1 > label > span > select").forEach(function (select) {
|
||||
select.disabled = true;
|
||||
select.querySelectorAll('option').forEach(function (option) {
|
||||
option.removeAttribute('selected');
|
||||
|
|
@ -64,7 +64,7 @@ document.getElementById("os").addEventListener("change", function () {
|
|||
document.querySelectorAll(".style-sub-2").forEach(function (element) {
|
||||
element.style.display = 'none';
|
||||
});
|
||||
document.querySelectorAll(".style-sub-2 > div > select").forEach(function (select) {
|
||||
document.querySelectorAll(".style-sub-2 > label > span > select").forEach(function (select) {
|
||||
select.disabled = true;
|
||||
select.querySelectorAll('option').forEach(function (option) {
|
||||
option.removeAttribute('selected');
|
||||
|
|
@ -72,13 +72,13 @@ document.getElementById("os").addEventListener("change", function () {
|
|||
});
|
||||
|
||||
// Re-enable and show what makes sense
|
||||
document.querySelector("[id='" + os_name + "']").style.display = 'flex';
|
||||
document.querySelectorAll("[id='" + os_name + "'] > div > select").forEach(function (select) {
|
||||
document.querySelector(`[id='${os_name}']`).style.display = 'block';
|
||||
document.querySelectorAll(`[id='${os_name}'] > label > span > select`).forEach(function (select) {
|
||||
select.disabled = false;
|
||||
select.querySelector('option:first-child').selected = true;
|
||||
});
|
||||
document.querySelector("[id='" + os_name + '_' + first_browser_name + "']").style.display = 'flex';
|
||||
document.querySelectorAll("[id='" + os_name + '_' + first_browser_name + "'] > div > select").forEach(function (select) {
|
||||
document.querySelector(`[id='${os_name}_${first_browser_name}']`).style.display = 'block';
|
||||
document.querySelectorAll(`[id='${os_name}_${first_browser_name}'] > label > span > select`).forEach(function (select) {
|
||||
select.disabled = false;
|
||||
select.querySelector('option:first-child').selected = true;
|
||||
});
|
||||
|
|
@ -91,24 +91,27 @@ document.querySelectorAll('select[name="browser"]').forEach( function(element)
|
|||
let osSelect = document.getElementById("os");
|
||||
let os_name = osSelect.options[osSelect.selectedIndex].value.replace(/(:|\.|\[|\]|,|=|\\)/g, "\\$1").replace(/ /g, "_");
|
||||
|
||||
// Hide and disable every useragent
|
||||
document.querySelectorAll(".style-sub-1 > div > select").forEach(function (select) {
|
||||
// unselect every browser select here (unknown reason)
|
||||
document.querySelectorAll(".style-sub-1 > label > span > select").forEach(function (select) {
|
||||
select.querySelectorAll('option').forEach(function (option) {
|
||||
option.removeAttribute('selected');
|
||||
});
|
||||
});
|
||||
|
||||
// Hide and disable every useragent
|
||||
document.querySelectorAll(".style-sub-2").forEach(function (element) {
|
||||
element.style.display = 'none';
|
||||
});
|
||||
document.querySelectorAll(".style-sub-2 > div > select").forEach(function (select) {
|
||||
document.querySelectorAll(".style-sub-2 > label > span > select").forEach(function (select) {
|
||||
select.disabled = true;
|
||||
select.querySelectorAll('option').forEach(function (option) {
|
||||
option.removeAttribute('selected');
|
||||
});
|
||||
});
|
||||
|
||||
// Show only the correct user-agent
|
||||
document.querySelector("[id='" + os_name + '_' + browser_name + "']").style.display = 'flex';
|
||||
document.querySelectorAll("[id='" + os_name + '_' + browser_name + "'] > div > select").forEach(function (select) {
|
||||
document.querySelector(`[id='${os_name}_${browser_name}']`).style.display = 'block';
|
||||
document.querySelectorAll(`[id='${os_name}_${browser_name}'] > label > span > select`).forEach(function (select) {
|
||||
select.disabled = false;
|
||||
select.querySelector('option:first-child').selected = true;
|
||||
});
|
||||
|
|
@ -183,14 +186,16 @@ document.getElementById('os-type').addEventListener('change', function () {
|
|||
});
|
||||
|
||||
// admin-only report-form
|
||||
const displayReportForm = function() {
|
||||
let show_form = document.getElementById("auto-report").checked;
|
||||
if(show_form) {
|
||||
document.getElementById("collapseMailConfiguration").style.display = "block";
|
||||
} else {
|
||||
document.getElementById("collapseMailConfiguration").style.display = "none";
|
||||
}
|
||||
let report_form = document.getElementById("auto-report");
|
||||
if (report_form) { // admin is logged in
|
||||
report_form.addEventListener('change', function() {
|
||||
let show_form = document.getElementById("auto-report").checked;
|
||||
if(show_form) {
|
||||
document.getElementById("collapseMailConfiguration").style.display = "block";
|
||||
} else {
|
||||
document.getElementById("collapseMailConfiguration").style.display = "none";
|
||||
}
|
||||
});
|
||||
}
|
||||
displayReportForm()
|
||||
document.getElementById("auto-report").addEventListener('change', displayReportForm);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -83,10 +83,10 @@
|
|||
|
||||
<div>
|
||||
<button class="btn btn-link" type="button" data-bs-toggle="collapse" data-bs-target="#collapseConfigBrowser"
|
||||
aria-expanded="false" aria-controls="collapseConfigBrowser">
|
||||
<p style="margin-left: -12px; margin-top: 12px; font-size: x-large; color: black; text-decoration: underline; text-decoration-color: blue;">
|
||||
<b>Browser Configuration</b>
|
||||
</p>
|
||||
aria-expanded="false" aria-controls="collapseConfigBrowser">
|
||||
<p style="margin-left: -12px; margin-top: 12px; font-size: x-large; color: black; text-decoration: underline; text-decoration-color: blue;">
|
||||
<b>Browser Configuration</b>
|
||||
</p>
|
||||
</button>
|
||||
<div class="help-tip" title="Lookyloo uses an emulated browser for all captures, click to configure the User-Agent"></div>
|
||||
</div>
|
||||
|
|
@ -145,33 +145,33 @@
|
|||
{% for os, browsers in user_agents.items() %}
|
||||
<!-- Hide the browsers that aren't part of the default os -->
|
||||
<div id="{{os.replace(' ', '_')}}" class="style-sub-1" {% if not os==default['os'] %}style="display: none;"{%endif%}>
|
||||
<label class="row mb-3">
|
||||
<span class="col-sm-2 col-form-label">Browser Type:</span>
|
||||
<span class="col-sm-10">
|
||||
<!-- Disable all the selects not related to the default os -->
|
||||
<select class="form-select" name="browser" {% if not os==default['os'] %}disabled{%endif%}>
|
||||
{% for browser in browsers.keys()|sort(reverse=True) %}
|
||||
<!-- Select the default browser -->
|
||||
<option value="{{ browser }}" {% if browser==default['browser'] %}selected{% endif %}>{{ browser }}</option>
|
||||
{% endfor%}
|
||||
</select>
|
||||
</span>
|
||||
</label>
|
||||
<label class="row mb-3">
|
||||
<span class="col-sm-2 col-form-label">Browser Type:</span>
|
||||
<span class="col-sm-10">
|
||||
<!-- Disable all the selects not related to the default os -->
|
||||
<select class="form-select" name="browser" {% if not os==default['os'] %}disabled{%endif%}>
|
||||
{% for browser in browsers.keys()|sort(reverse=True) %}
|
||||
<!-- Select the default browser -->
|
||||
<option value="{{ browser }}" {% if browser==default['browser'] %}selected{% endif %}>{{ browser }}</option>
|
||||
{% endfor%}
|
||||
</select>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
{% for browser, user_agents in browsers.items() %}
|
||||
<!-- Hide the user agents that aren't part of the default OS and browsers that aren't part of the default os -->
|
||||
<div id="{{os.replace(' ', '_')}}_{{browser.replace(' ', '_')}}" class="style-sub-2" {% if not os==default['os'] or not browser==default['browser']%} style="display: none;"{%endif%}>
|
||||
<label class="row mb-3">
|
||||
<span class="col-sm-2 col-form-label">User-Agent:</span>
|
||||
<span class="col-sm-10">
|
||||
<!-- Disable all the selects, unless it is in default os and browser -->
|
||||
<select class="form-select" name="user_agent" {% if not os==default['os'] or not browser==default['browser'] %}disabled{%endif%}>
|
||||
{% for user_agent in user_agents %}
|
||||
<!-- Select the default ua -->
|
||||
<option value="{{ user_agent }}" {% if user_agent==default['useragent'] %}selected{% endif %}>{{ user_agent }}</option>
|
||||
{% endfor%}
|
||||
</select>
|
||||
</span>
|
||||
<span class="col-sm-2 col-form-label">User-Agent:</span>
|
||||
<span class="col-sm-10">
|
||||
<!-- Disable all the selects, unless it is in default os and browser -->
|
||||
<select class="form-select" name="user_agent" {% if not os==default['os'] or not browser==default['browser'] %}disabled{%endif%}>
|
||||
{% for user_agent in user_agents %}
|
||||
<!-- Select the default ua -->
|
||||
<option value="{{ user_agent }}" {% if user_agent==default['useragent'] %}selected{% endif %}>{{ user_agent }}</option>
|
||||
{% endfor%}
|
||||
</select>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
{% endfor%}
|
||||
|
|
@ -218,9 +218,9 @@
|
|||
|
||||
<div>
|
||||
<button class="btn btn-link" type="button" data-bs-toggle="collapse" data-bs-target="#collapseConfigCapture" aria-expanded="false" aria-controls="collapseConfigCapture">
|
||||
<p style="margin-left: -12px; margin-top: 12px; font-size: x-large; color: black; text-decoration: underline; text-decoration-color: blue;">
|
||||
<b>Capture Configuration</b>
|
||||
</p>
|
||||
<p style="margin-left: -12px; margin-top: 12px; font-size: x-large; color: black; text-decoration: underline; text-decoration-color: blue;">
|
||||
<b>Capture Configuration</b>
|
||||
</p>
|
||||
</button>
|
||||
<div class="help-tip" title="Edit configuration options for the capture."></div>
|
||||
</div>
|
||||
|
|
@ -361,49 +361,49 @@
|
|||
<hr>
|
||||
|
||||
{% if current_user.is_authenticated %}
|
||||
<!-- admin only checkbox for autoreport -->
|
||||
<div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="checkbox" id="auto-report" name="auto-report" >
|
||||
<label for="auto-report" class="form-check-label">Automatically submit to investigation team</label>
|
||||
<!-- admin only checkbox for autoreport -->
|
||||
<div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="checkbox" id="auto-report" name="auto-report" >
|
||||
<label for="auto-report" class="form-check-label">Automatically submit to investigation team</label>
|
||||
</div>
|
||||
<div id="collapseMailConfiguration" class="collapse">
|
||||
<div class="card card-body">
|
||||
<div class="row mb-3">
|
||||
<label class="col-sm-3 col-form-label" for="email">Email of the sender (optional): </label>
|
||||
<div class="col-sm-9">
|
||||
<input class="form-control" type="text" id="email"
|
||||
name="email" placeholder="myself@example.com">
|
||||
</div>
|
||||
<div id="collapseMailConfiguration" class="collapse">
|
||||
<div class="card card-body">
|
||||
<div class="row mb-3">
|
||||
<label class="col-sm-3 col-form-label" for="email">Email of the sender (optional): </label>
|
||||
<div class="col-sm-9">
|
||||
<input class="form-control" type="text" id="email"
|
||||
name="email" placeholder="myself@example.com">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<label class="col-sm-3 col-form-label" for="recipient-mail">
|
||||
Email of the recipient (optional): </label>
|
||||
<div class="col-sm-9">
|
||||
<input class="form-control" type="text" id="recipient-mail"
|
||||
name="recipient-mail" placeholder="to-someone@example.com">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<label class="col-sm-3 col-form-label" for="comment">Comment (optional): </label>
|
||||
<div class="col-sm-9">
|
||||
<textarea class="form-control" id="comment" name="comment" rows="3"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<label class="col-sm-3 col-form-label" for="recipient-mail">
|
||||
Email of the recipient (optional): </label>
|
||||
<div class="col-sm-9">
|
||||
<input class="form-control" type="text" id="recipient-mail"
|
||||
name="recipient-mail" placeholder="to-someone@example.com">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<label class="col-sm-3 col-form-label" for="comment">Comment (optional): </label>
|
||||
<div class="col-sm-9">
|
||||
<textarea class="form-control" id="comment" name="comment" rows="3"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
{% endif %}
|
||||
|
||||
<center>
|
||||
<b>
|
||||
{% if default_public %}
|
||||
By default, the capture is public. If you do not want that, untick the box at the top of the form.
|
||||
{% else %}
|
||||
By default, the capture is private (not visible on the index page). If you want it to be public tick the box at the top of the form.
|
||||
{% endif %}
|
||||
{% if default_public %}
|
||||
By default, the capture is public. If you do not want that, untick the box at the top of the form.
|
||||
{% else %}
|
||||
By default, the capture is private (not visible on the index page). If you want it to be public tick the box at the top of the form.
|
||||
{% endif %}
|
||||
</b>
|
||||
<br>
|
||||
<br>
|
||||
|
|
@ -416,7 +416,7 @@
|
|||
{% block scripts %}
|
||||
{{ super() }}
|
||||
<script src='{{ url_for('static', filename='capture.js') }}'
|
||||
{{get_sri('static', 'capture.js')}}
|
||||
crossorigin="anonymous"></script>
|
||||
{{get_sri('static', 'capture.js')}}
|
||||
crossorigin="anonymous"></script>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue