'); + }).join('
'); + } + return prop.map(line => `${line}
`).join(''); + } + if (typeof prop === 'object') { + return Object.entries(prop) + .map(([key, value]) => `${key}: ${value}`) + .join('
'); + } + return prop || 'None'; +} + +$(document).ready(function(){ + $("#PanelManual").hide(); + $('.ip_address').mask('0ZZ.0ZZ.0ZZ.0ZZ', { + translation: { + 'Z': { + pattern: /[0-9]/, optional: true + } + }, + placeholder: "___.___.___.___" + }); + $('.mac_address').mask('FF:FF:FF:FF:FF:FF', { + translation: { + 'F': { + pattern: /[0-9a-fA-F]/, optional: false + } + }, + placeholder: "__:__:__:__:__:__" + }); +}); + +$(document).ready(function() { + $('.cidr').mask('099.099.099.099/099', { + translation: { + '0': { pattern: /[0-9]/ } + }, + placeholder: "___.___.___.___/___" + }); +}); + +$('#wg-upload,#wg-manual').on('click', function (e) { + if (this.id == 'wg-upload') { + $('#PanelManual').hide(); + $('#PanelUpload').show(); + } else if (this.id == 'wg-manual') { + $('#PanelUpload').hide(); + $('#PanelManual').show(); + } +}); + +$(".custom-file-input").on("change", function() { + var fileName = $(this).val().split("\\").pop(); + $(this).siblings(".custom-file-label").addClass("selected").html(fileName); +}); + +// Event listener for Bootstrap's form validation +window.addEventListener('load', function() { + // Fetch all the forms we want to apply custom Bootstrap validation styles to + var forms = document.getElementsByClassName('needs-validation'); + // Loop over them and prevent submission + var validation = Array.prototype.filter.call(forms, function(form) { + form.addEventListener('submit', function(event) { + if (form.checkValidity() === false) { + event.preventDefault(); + event.stopPropagation(); + } + form.classList.add('was-validated'); + }, false); + }); +}, false); + +function showSessionExpiredModal() { + $('#sessionTimeoutModal').modal('show'); +} + +$(document).on("click", "#js-session-expired-login", function(e) { + const loginModal = $('#modal-admin-login'); + const redirectUrl = window.location.pathname; + window.location.href = `/login?action=${encodeURIComponent(redirectUrl)}`; +}); + +// show modal login on page load +$(document).ready(function () { + const params = new URLSearchParams(window.location.search); + const redirectUrl = $('#redirect-url').val() || params.get('action') || '/'; + $('#modal-admin-login').modal('show'); + $('#redirect-url').val(redirectUrl); + $('#username').focus(); + $('#username').addClass("focusedInput"); +}); + +// DHCP or Static IP option group +$('#chkstatic').on('change', function() { + if (this.checked) { + setStaticFieldsEnabled(); + } +}); + +$('#chkdhcp').on('change', function() { + this.checked ? setStaticFieldsDisabled() : null; +}); + + +$('input[name="dhcp-iface"]').change(function() { + if ($('input[name="dhcp-iface"]:checked').val() == '1') { + setDhcpFieldsEnabled(); + } else { + setDhcpFieldsDisabled(); + } +}); + + +function setStaticFieldsEnabled() { + $('#txtipaddress').prop('required', true); + $('#txtsubnetmask').prop('required', true); + $('#txtgateway').prop('required', true); + + $('#txtipaddress').removeAttr('disabled'); + $('#txtsubnetmask').removeAttr('disabled'); + $('#txtgateway').removeAttr('disabled'); +} + +function setStaticFieldsDisabled() { + $('#txtipaddress').prop('disabled', true); + $('#txtsubnetmask').prop('disabled', true); + $('#txtgateway').prop('disabled', true); + + $('#txtipaddress').removeAttr('required'); + $('#txtsubnetmask').removeAttr('required'); + $('#txtgateway').removeAttr('required'); +} + +function setDhcpFieldsEnabled() { + $('#txtrangestart').prop('required', true); + $('#txtrangeend').prop('required', true); + $('#txtrangeleasetime').prop('required', true); + $('#cbxrangeleasetimeunits').prop('required', true); + + $('#txtrangestart').removeAttr('disabled'); + $('#txtrangeend').removeAttr('disabled'); + $('#txtrangeleasetime').removeAttr('disabled'); + $('#cbxrangeleasetimeunits').removeAttr('disabled'); + $('#txtdns1').removeAttr('disabled'); + $('#txtdns2').removeAttr('disabled'); + $('#txtmetric').removeAttr('disabled'); +} + +function setDhcpFieldsDisabled() { + $('#txtrangestart').removeAttr('required'); + $('#txtrangeend').removeAttr('required'); + $('#txtrangeleasetime').removeAttr('required'); + $('#cbxrangeleasetimeunits').removeAttr('required'); + + $('#txtrangestart').prop('disabled', true); + $('#txtrangeend').prop('disabled', true); + $('#txtrangeleasetime').prop('disabled', true); + $('#cbxrangeleasetimeunits').prop('disabled', true); + $('#txtdns1').prop('disabled', true); + $('#txtdns2').prop('disabled', true); + $('#txtmetric').prop('disabled', true); +} + +// Static Array method +Array.range = (start, end) => Array.from({length: (end - start)}, (v, k) => k + start); + +$(document).on("click", ".js-toggle-password", function(e) { + var button = $(e.currentTarget); + var field = $(button.data("bsTarget")); + if (field.is(":input")) { + e.preventDefault(); + + if (!button.data("__toggle-with-initial")) { + $("i", button).removeClass("fas fa-eye").addClass(button.attr("data-toggle-with")); + } + + if (field.attr("type") === "password") { + field.attr("type", "text"); + } else { + $("i", button).removeClass("fas fa-eye-slash").addClass("fas fa-eye"); + field.attr("type", "password"); + } + } +}); + +$(function() { + $('#theme-select').change(function() { + var theme = themes[$( "#theme-select" ).val() ]; + + var hasDarkTheme = theme === 'custom.php'; + var nightModeChecked = $("#night-mode").prop("checked"); + + if (nightModeChecked && hasDarkTheme) { + if (theme === "custom.php") { + set_theme("dark.css"); + } + } else { + set_theme(theme); + } + }); +}); + +function set_theme(theme) { + $('link[title="main"]').attr('href', 'app/css/' + theme); + // persist selected theme in cookie + setCookie('theme',theme,90); +} + +$(function() { + var currentTheme = getCookie('theme'); + // Check if the current theme is a dark theme + var isDarkTheme = currentTheme === 'dark.css'; + + $('#night-mode').prop('checked', isDarkTheme); + $('#night-mode').change(function() { + var state = $(this).is(':checked'); + var currentTheme = getCookie('theme'); + + if (state == true) { + if (currentTheme == 'custom.php') { + set_theme('dark.css'); + } + } else { + if (currentTheme == 'dark.css') { + set_theme('custom.php'); + } + } + }); +}); + +function setCookie(cname, cvalue, exdays) { + var d = new Date(); + d.setTime(d.getTime() + (exdays*24*60*60*1000)); + var expires = "expires="+ d.toUTCString(); + document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/"; +} + +function getCookie(cname) { + var regx = new RegExp(cname + "=([^;]+)"); + var value = regx.exec(document.cookie); + return (value != null) ? unescape(value[1]) : null; +} + +// Define themes +var themes = { + "default": "custom.php", + "hackernews" : "hackernews.css" +} + +// Adds active class to current nav-item +$(window).bind("load", function() { + var url = window.location; + $('.sb-nav-link-icon a').filter(function() { + return this.href == url; + }).parent().addClass('active'); +}); + +// Sets focus on a specified tab +document.addEventListener("DOMContentLoaded", function () { + const params = new URLSearchParams(window.location.search); + const targetTab = params.get("tab"); + if (targetTab) { + let tabElement = document.querySelector(`[data-bs-toggle="tab"][href="#${targetTab}"]`); + if (tabElement) { + let tab = new bootstrap.Tab(tabElement); + tab.show(); + } + } +}); + +function disableValidation(form) { + form.removeAttribute("novalidate"); + form.classList.remove("needs-validation"); + form.querySelectorAll("[required]").forEach(function (field) { + field.removeAttribute("required"); + }); +} + +function updateActivityLED() { + const threshold_bytes = 300; + fetch('app/net_activity') + .then(res => res.text()) + .then(data => { + const activity = parseInt(data.trim()); + const leds = document.querySelectorAll('.hostapd-led'); + + if (!isNaN(activity)) { + leds.forEach(led => { + if (activity > threshold_bytes) { + led.classList.add('led-pulse'); + setTimeout(() => { + led.classList.remove('led-pulse'); + }, 50); + } else { + led.classList.remove('led-pulse'); + } + }); + } + }) + .catch(() => { /* ignore fetch errors */ }); +} +setInterval(updateActivityLED, 100); + +$(document).ready(function() { + const $htmlElement = $('html'); + const $modeswitch = $('#night-mode'); + $modeswitch.on('change', function() { + const isChecked = $(this).is(':checked'); + const newTheme = isChecked ? 'dark' : 'light'; + $htmlElement.attr('data-bs-theme', newTheme); + localStorage.setItem('bsTheme', newTheme); + }); +}); + +$(document) + .ajaxSend(setCSRFTokenHeader) + .ready(contentLoaded) + .ready(loadWifiStations()); + +// To auto-close Bootstrap alerts; time is in milliseconds +const alertTimeout = parseInt(getCookie('alert_timeout'), 10); + +if (!isNaN(alertTimeout) && alertTimeout > 0) { + window.setTimeout(function() { + $(".alert").fadeTo(500, 0).slideUp(500, function(){ + $(this).remove(); + }); + }, alertTimeout); +} + diff --git a/app/js/bandwidthcharts.js b/app/js/vendor/bandwidthcharts.js similarity index 100% rename from app/js/bandwidthcharts.js rename to app/js/vendor/bandwidthcharts.js diff --git a/app/js/dashboardchart.js b/app/js/vendor/dashboardchart.js similarity index 100% rename from app/js/dashboardchart.js rename to app/js/vendor/dashboardchart.js diff --git a/app/js/huebee.js b/app/js/vendor/huebee.js similarity index 100% rename from app/js/huebee.js rename to app/js/vendor/huebee.js diff --git a/app/js/vendor/speedtestUI.js b/app/js/vendor/speedtestUI.js new file mode 100644 index 00000000..e97b7c09 --- /dev/null +++ b/app/js/vendor/speedtestUI.js @@ -0,0 +1,189 @@ +function I(i){return document.getElementById(i);} + +const origin=window.location.origin; +const host=window.location.host; +var SPEEDTEST_SERVERS=[ + { + "name":"RaspAP Speedtest server (US)", + "server":"https://speedtest.raspap.com/", + "dlURL":"backend/garbage.php", + "ulURL":"backend/empty.php", + "pingURL":"backend/empty.php", + "getIpURL":"backend/getIP.php" + }, + { + "name":"RaspAP ("+host+")", + "server":origin, + "dlURL":"dist/speedtest/backend/garbage.php", + "ulURL":"dist/speedtest/backend/empty.php", + "pingURL":"dist/speedtest/backend/empty.php", + "getIpURL":"dist/speedtest/backend/getIP.php" + } +]; + +//INITIALIZE SPEEDTEST +var s=new Speedtest(); //create speedtest object +s.setParameter("telemetry_level","basic"); //enable telemetry + +//SERVER AUTO SELECTION +function initServers(){ + var noServersAvailable=function(){ + I("message").innerHTML="No servers available"; + } + var runServerSelect=function(){ + s.selectServer(function(server){ + if(server!=null){ //at least 1 server is available + I("loading").className="hidden"; //hide loading message + //populate server list for manual selection + for(var i=0;i
+
+
+
diff --git a/config/blocklists.json b/config/blocklists.json
index 7138c451..1a3a5e45 100644
--- a/config/blocklists.json
+++ b/config/blocklists.json
@@ -1,17 +1,45 @@
{
- "StevenBlack/hosts": [
- "StevenBlack/hosts (default)"
- ],
- "badmojr/hosts": [
- "badmojr/1Hosts (Mini)",
- "badmojr/1Hosts (Lite)",
- "badmojr/1Hosts (Pro)",
- "badmojr/1Hosts (Xtra)"
- ],
- "OISD/domains": [
- "oisd/big (default)",
- "oisd/small",
- "oisd/nsfw"
- ]
+ "StevenBlack/hosts": {
+ "StevenBlack/hosts (default)": {
+ "list_url": "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts",
+ "dest_file": "hostnames.txt"
+ }
+ },
+ "HaGeZi/hosts": {
+ "hagezi/hosts (Light)": {
+ "list_url": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/hosts/light.txt",
+ "dest_file": "hostnames.txt"
+ },
+ "hagezi/hosts (Normal)": {
+ "list_url": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/hosts/multi.txt",
+ "dest_file": "hostnames.txt"
+ },
+ "hagezi/hosts (Pro)": {
+ "list_url": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/hosts/pro.txt",
+ "dest_file": "hostnames.txt"
+ },
+ "hagezi/hosts (Pro++)": {
+ "list_url": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/hosts/pro.plus.txt",
+ "dest_file": "hostnames.txt"
+ },
+ "hagezi/hosts (Ultimate)": {
+ "list_url": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/hosts/ultimate.txt",
+ "dest_file": "hostnames.txt"
+ }
+ },
+ "OISD/domains": {
+ "oisd/big (default)": {
+ "list_url": "https://big.oisd.nl/dnsmasq",
+ "dest_file": "domains.txt"
+ },
+ "oisd/small": {
+ "list_url": "https://small.oisd.nl/dnsmasq",
+ "dest_file": "domains.txt"
+ },
+ "oisd/nsfw": {
+ "list_url": "https://nsfw.oisd.nl/dnsmasq",
+ "dest_file": "domains.txt"
+ }
+ }
}
diff --git a/config/config.php b/config/config.php
index 178081b1..2dd0223c 100755
--- a/config/config.php
+++ b/config/config.php
@@ -32,6 +32,7 @@ define('RASPI_OPENVPN_CLIENT_CONFIG', '/etc/openvpn/client/client.conf');
define('RASPI_OPENVPN_CLIENT_LOGIN', '/etc/openvpn/client/login.conf');
define('RASPI_WIREGUARD_PATH', '/etc/wireguard/');
define('RASPI_WIREGUARD_CONFIG', RASPI_WIREGUARD_PATH.'wg0.conf');
+define('RASPI_IPTABLES_CONF', RASPI_CONFIG.'/networking/iptables_rules.json');
define('RASPI_TORPROXY_CONFIG', '/etc/tor/torrc');
define('RASPI_LIGHTTPD_CONFIG', '/etc/lighttpd/lighttpd.conf');
define('RASPI_ACCESS_CHECK_IP', '1.1.1.1');
@@ -40,6 +41,10 @@ define('RASPI_ACCESS_CHECK_DNS', 'one.one.one.one');
// Constant for the GitHub API latest release endpoint
define('RASPI_API_ENDPOINT', 'https://api.github.com/repos/RaspAP/raspap-webgui/releases/latest');
+// Captive portal detection - returns 204 or 200 is successful
+define('RASPI_ACCESS_CHECK_URL', 'http://detectportal.firefox.com');
+define('RASPI_ACCESS_CHECK_URL_CODE', 200);
+
// Constant for the 5GHz wireless regulatory domain
define("RASPI_5GHZ_CHANNEL_MIN", 100);
define("RASPI_5GHZ_CHANNEL_MAX", 192);
diff --git a/config/defaults.json b/config/defaults.json
index a0e1b190..8713d5dd 100644
--- a/config/defaults.json
+++ b/config/defaults.json
@@ -1,66 +1,114 @@
{
- "dhcp": {
- "wlan0": {
- "static ip_address": [ "10.3.141.1/24" ],
- "static routers": [ "10.3.141.1" ],
- "static domain_name_server": [ "1.1.1.1 8.8.8.8" ],
- "subnetmask": [ "255.255.255.0" ]
+ "hostapd":{
+ "modes":{
+ "n":{
+ "settings":[
+ "hw_mode=g",
+ "ieee80211n=1",
+ "wmm_enabled=1"
+ ]
+ },
+ "ac":{
+ "settings":[
+ "hw_mode=a",
+ "# N",
+ "ieee80211n=1",
+ "require_ht=1",
+ "ht_capab=[MAX-AMSDU-3839][HT40+][SHORT-GI-20][SHORT-GI-40][DSSS_CCK-40]",
+ "# AC",
+ "ieee80211ac=1",
+ "require_vht=1",
+ "ieee80211d=0",
+ "ieee80211h=0",
+ "vht_capab=[MAX-AMSDU-3839][SHORT-GI-80]",
+ "vht_oper_chwidth=1",
+ "vht_oper_centr_freq_seg0_idx={VHT_FREQ_IDX}"
+ ]
+ },
+ "g":{
+ "settings":[
+ "hw_mode=g",
+ "ieee80211n=0"
+ ]
+ },
+ "a":{
+ "settings":[
+ "hw_mode=a",
+ "ieee80211n=0"
+ ]
+ },
+ "b":{
+ "settings":[
+ "hw_mode=b",
+ "ieee80211n=0"
+ ]
+ }
},
- "wlan1": {
- "static ip_address": [ "10.9.141.1/24" ],
- "static routers": [ "10.9.141.1" ],
- "static domain_name_server": [ "1.1.1.1 8.8.8.8" ],
- "subnetmask": [ "255.255.255.0" ]
+ "dhcp":{
+ "wlan0":{
+ "static ip_address":[ "10.3.141.1/24" ],
+ "static routers":[ "10.3.141.1" ],
+ "static domain_name_server":[ "1.1.1.1 8.8.8.8" ],
+ "subnetmask":[ "255.255.255.0" ]
+ },
+ "wlan1":{
+ "static ip_address":[ "10.9.141.1/24" ],
+ "static routers":[ "10.9.141.1" ],
+ "static domain_name_server":[ "1.1.1.1 8.8.8.8" ],
+ "subnetmask":[ "255.255.255.0" ]
+ },
+ "uap0":{
+ "static ip_address":[ "192.168.50.1/24" ],
+ "static routers":[ "192.168.50.1" ],
+ "static domain_name_server":[ "1.1.1.1 8.8.8.8" ],
+ "subnetmask":[ "255.255.255.0" ]
+ },
+ "options":{
+ "# RaspAP default configuration":null,
+ "hostname":null,
+ "clientid":null,
+ "persistent":null,
+ "option rapid_commit":null,
+ "option domain_name_servers, domain_name, domain_search, host_name":null,
+ "option classless_static_routes":null,
+ "option ntp_servers":null,
+ "require dhcp_server_identifier":null,
+ "slaac private":null,
+ "nohook lookup-hostname":null
+ }
},
- "uap0": {
- "static ip_address": [ "192.168.50.1/24" ],
- "static routers": [ "192.168.50.1" ],
- "static domain_name_server": [ "1.1.1.1 8.8.8.8" ],
- "subnetmask": [ "255.255.255.0" ]
+ "dnsmasq":{
+ "wlan0":{
+ "dhcp-range":[ "10.3.141.50,10.3.141.254,255.255.255.0,12h" ]
+ },
+ "wlan1":{
+ "dhcp-range":[ "10.9.141.50,10.9.141.254,255.255.255.0,12h" ]
+ },
+ "uap0":{
+ "dhcp-range":[ "192.168.50.50,192.168.50.150,12h" ]
+ }
},
- "options": {
- "# RaspAP default configuration": null,
- "hostname": null,
- "clientid": null,
- "persistent": null,
- "option rapid_commit": null,
- "option domain_name_servers, domain_name, domain_search, host_name": null,
- "option classless_static_routes": null,
- "option ntp_servers": null,
- "require dhcp_server_identifier": null,
- "slaac private": null,
- "nohook lookup-hostname": null
- }
- },
- "dnsmasq": {
- "wlan0": {
- "dhcp-range": [ "10.3.141.50,10.3.141.254,255.255.255.0,12h" ]
- },
- "wlan1": {
- "dhcp-range": [ "10.9.141.50,10.9.141.254,255.255.255.0,12h" ]
- },
- "uap0": {
- "dhcp-range": [ "192.168.50.50,192.168.50.150,12h" ]
- }
- },
- "wireguard": {
- "server": {
- "Address": [ "10.8.2.1/24" ],
- "ListenPort": [ "51820" ],
- "DNS": [ "9.9.9.9" ],
- "PostUp": [ "iptables -A FORWARD -i wlan0 -o wg0 -j ACCEPT; iptables -A FORWARD -i wg0 -o wlan0 -m state --state RELATED,ESTABLISHED -j ACCEPT; iptables -t nat -A POSTROUTING -o wg0 -j MASQUERADE" ],
- "PostDown": [ "iptables -D FORWARD -i wlan0 -o wg0 -j ACCEPT; iptables -D FORWARD -i wg0 -o wlan0 -m state --state RELATED,ESTABLISHED -j ACCEPT; iptables -t nat -D POSTROUTING -o wg0 -j MASQUERADE" ]
- },
- "peer": {
- "Address": [ "10.8.1.2/24" ],
- "Endpoint": [ "10.8.2.1:51820" ],
- "ListenPort": [ "21841" ],
- "AllowedIPs": ["10.8.2.0/24"],
- "PersistentKeepalive": [ "15" ]
- }
- },
- "txpower": {
- "dbm": [ "auto", "30", "20", "17", "10", "6", "3", "1", "0" ]
+ "wireguard":{
+ "server":{
+ "Address":[ "10.8.2.1/24" ],
+ "ListenPort":[ "51820" ],
+ "DNS":[ "9.9.9.9" ],
+ "PostUp":[ "iptables -A FORWARD -i wlan0 -o wg0 -j ACCEPT; iptables -A FORWARD -i wg0 -o wlan0 -m state --state RELATED,ESTABLISHED -j ACCEPT; iptables -t nat -A POSTROUTING -o wg0 -j MASQUERADE" ],
+ "PostDown":[ "iptables -D FORWARD -i wlan0 -o wg0 -j ACCEPT; iptables -D FORWARD -i wg0 -o wlan0 -m state --state RELATED,ESTABLISHED -j ACCEPT; iptables -t nat -D POSTROUTING -o wg0 -j MASQUERADE" ],
+ "PostUpEx":[ "iptables -I OUTPUT ! -o %i -m mark ! --mark $(wg show %i fwmark) -m addrtype ! --dst-type LOCAL ! -d %s -j REJECT" ],
+ "PreDown":[ "iptables -D OUTPUT ! -o %i -m mark ! --mark $(wg show %i fwmark) -m addrtype ! --dst-type LOCAL ! -d %s -j REJECT" ]
+ },
+ "peer":{
+ "Address":[ "10.8.1.2/24" ],
+ "Endpoint":[ "10.8.2.1:51820" ],
+ "ListenPort":[ "21841" ],
+ "AllowedIPs":[ "10.8.2.0/24" ],
+ "PersistentKeepalive":[ "15" ]
+ }
+ },
+ "txpower": {
+ "dbm": [ "auto", "30", "20", "17", "10", "6", "3", "1", "0" ]
+ }
}
}
diff --git a/crowdin.yml b/crowdin.yml
deleted file mode 100644
index 63ff1718..00000000
--- a/crowdin.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-files:
- - source: /locale/en_US/LC_MESSAGES/messages.po
- translation: /locale/%locale_with_underscore%/LC_MESSAGES/%original_file_name%
diff --git a/dist/sb-admin/js/scripts.js b/dist/sb-admin/js/scripts.js
index 873276da..39067c08 100644
--- a/dist/sb-admin/js/scripts.js
+++ b/dist/sb-admin/js/scripts.js
@@ -13,9 +13,9 @@ window.addEventListener('DOMContentLoaded', event => {
const sidebarToggle = document.body.querySelector('#sidebarToggle');
if (sidebarToggle) {
// Uncomment below to persist sidebar toggle between refreshes
- if (localStorage.getItem('sb|sidebar-toggle') === 'true') {
- document.body.classList.toggle('sb-sidenav-toggled');
- }
+ // if (localStorage.getItem('sb|sidebar-toggle') === 'true') {
+ // document.body.classList.toggle('sb-sidenav-toggled');
+ // }
sidebarToggle.addEventListener('click', event => {
event.preventDefault();
document.body.classList.toggle('sb-sidenav-toggled');
diff --git a/dist/speedtest/backend/empty.php b/dist/speedtest/backend/empty.php
new file mode 100755
index 00000000..3c4547bf
--- /dev/null
+++ b/dist/speedtest/backend/empty.php
@@ -0,0 +1,14 @@
+ 1024) {
+ return 1024;
+ }
+
+ return (int) $_GET['ckSize'];
+}
+
+/**
+ * @return void
+ */
+function sendHeaders()
+{
+ header('HTTP/1.1 200 OK');
+
+ if (isset($_GET['cors'])) {
+ header('Access-Control-Allow-Origin: *');
+ header('Access-Control-Allow-Methods: GET, POST');
+ }
+
+ // Indicate a file download
+ header('Content-Description: File Transfer');
+ header('Content-Type: application/octet-stream');
+ header('Content-Disposition: attachment; filename=random.dat');
+ header('Content-Transfer-Encoding: binary');
+
+ // Cache settings: never cache this request
+ header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0, s-maxage=0');
+ header('Cache-Control: post-check=0, pre-check=0', false);
+ header('Pragma: no-cache');
+}
+
+// Determine how much data we should send
+$chunks = getChunkCount();
+
+// Generate data
+if (function_exists('random_bytes')) {
+ $data = random_bytes(1048576);
+} else {
+ $data = openssl_random_pseudo_bytes(1048576);
+}
+
+// Deliver chunks of 1048576 bytes
+sendHeaders();
+for ($i = 0; $i < $chunks; $i++) {
+ echo $data;
+ flush();
+}
diff --git a/dist/speedtest/backend/getIP.php b/dist/speedtest/backend/getIP.php
new file mode 100755
index 00000000..c5147400
--- /dev/null
+++ b/dist/speedtest/backend/getIP.php
@@ -0,0 +1,325 @@
+ $processedString,
+ 'rawIspInfo' => $rawIspInfo ?: '',
+ ]
+ );
+}
+
+$ip = getClientIp();
+
+$localIpInfo = getLocalOrPrivateIpInfo($ip);
+// local ip, no need to fetch further information
+if (is_string($localIpInfo)) {
+ sendResponse($ip, $localIpInfo);
+ exit;
+}
+
+if (!isset($_GET['isp'])) {
+ sendResponse($ip);
+ exit;
+}
+
+$rawIspInfo = getIspInfo($ip);
+$isp = getIsp($rawIspInfo);
+$distance = getDistance($rawIspInfo);
+
+sendResponse($ip, $isp, $distance, $rawIspInfo);
diff --git a/dist/speedtest/backend/getIP_ipInfo_apikey.php b/dist/speedtest/backend/getIP_ipInfo_apikey.php
new file mode 100755
index 00000000..e200c3f1
--- /dev/null
+++ b/dist/speedtest/backend/getIP_ipInfo_apikey.php
@@ -0,0 +1,4 @@
+* {
+ display: block;
+ width: 100%;
+ height: auto;
+ margin: 0.25em 0;
+}
+
+#privacyPolicy {
+ position: fixed;
+ top: 2em;
+ bottom: 2em;
+ left: 2em;
+ right: 2em;
+ overflow-y: auto;
+ margin: 0 auto;
+ width: 50%;
+ height: auto;
+ box-shadow: 0 0 3em 1em #333;
+ z-index: 999999;
+ text-align: left;
+ background-color: #FFFFFF;
+ padding: 1em;
+ border-radius: 0.3em;
+ color: #858796;
+}
+
+#privacyPolicy h4, h5 {
+ color: #212529;
+}
+
+a.privacy {
+ text-align: center;
+ font-size: 0.8em;
+ color: #808080;
+ display: block;
+}
+
+@media all and (max-width:40em) {
+ body {
+ font-size: 0.8em;
+ }
+}
+
+div.visible {
+ animation: fadeIn 0.4s;
+ display: block;
+}
+
+div.hidden {
+ animation: fadeOut 0.4s;
+ display: none;
+}
+
+div.centered {
+ margin: 0 auto;
+}
+
+@keyframes fadeIn {
+ 0% {
+ opacity: 0;
+ }
+
+ 100% {
+ opacity: 1;
+ }
+}
+
+@keyframes fadeOut {
+ 0% {
+ display: block;
+ opacity: 1;
+ }
+
+ 100% {
+ display: block;
+ opacity: 0;
+ }
+}
diff --git a/dist/speedtest/speedtest.js b/dist/speedtest/speedtest.js
new file mode 100755
index 00000000..1197cb4f
--- /dev/null
+++ b/dist/speedtest/speedtest.js
@@ -0,0 +1,327 @@
+/*
+ LibreSpeed - Main
+ by Federico Dossena
+ https://github.com/librespeed/speedtest/
+ GNU LGPLv3 License
+*/
+
+function Speedtest() {
+ this._serverList = []; //when using multiple points of test, this is a list of test points
+ this._selectedServer = null; //when using multiple points of test, this is the selected server
+ this._settings = {}; //settings for the speedtest worker
+ this._state = 0; //0=adding settings, 1=adding servers, 2=server selection done, 3=test running, 4=done
+}
+
+Speedtest.prototype = {
+ constructor: Speedtest,
+ /**
+ * Returns the state of the test: 0=adding settings, 1=adding servers, 2=server selection done, 3=test running, 4=done
+ */
+ getState: function() {
+ return this._state;
+ },
+ /**
+ * Change one of the test settings from their defaults.
+ * - parameter: string with the name of the parameter that you want to set
+ * - value: new value for the parameter
+ *
+ * Invalid values or nonexistant parameters will be ignored by the speedtest worker.
+ */
+ setParameter: function(parameter, value) {
+ if (this._state == 3)
+ throw "You cannot change the test settings while running the test";
+ this._settings[parameter] = value;
+ if(parameter === "telemetry_extra"){
+ this._originalExtra=this._settings.telemetry_extra;
+ }
+ },
+ /**
+ * Used internally to check if a server object contains all the required elements.
+ * Also fixes the server URL if needed.
+ */
+ _checkServerDefinition: function(server) {
+ try {
+ if (typeof server.name !== "string")
+ throw "Name string missing from server definition (name)";
+ if (typeof server.server !== "string")
+ throw "Server address string missing from server definition (server)";
+ if (server.server.charAt(server.server.length - 1) != "/")
+ server.server += "/";
+ if (server.server.indexOf("//") == 0)
+ server.server = location.protocol + server.server;
+ if (typeof server.dlURL !== "string")
+ throw "Download URL string missing from server definition (dlURL)";
+ if (typeof server.ulURL !== "string")
+ throw "Upload URL string missing from server definition (ulURL)";
+ if (typeof server.pingURL !== "string")
+ throw "Ping URL string missing from server definition (pingURL)";
+ if (typeof server.getIpURL !== "string")
+ throw "GetIP URL string missing from server definition (getIpURL)";
+ } catch (e) {
+ throw "Invalid server definition";
+ }
+ },
+ /**
+ * Add a test point (multiple points of test)
+ * server: the server to be added as an object. Defined in app/js/speedtestUI.js
+ */
+ addTestPoint: function(server) {
+ this._checkServerDefinition(server);
+ if (this._state == 0) this._state = 1;
+ if (this._state != 1) throw "You can't add a server after server selection";
+ this._settings.mpot = true;
+ this._serverList.push(server);
+ },
+ /**
+ * Same as addTestPoint, but you can pass an array of servers
+ */
+ addTestPoints: function(list) {
+ for (var i = 0; i < list.length; i++) this.addTestPoint(list[i]);
+ },
+ /**
+ * Load a JSON server list from URL (multiple points of test)
+ * url: the url where the server list can be fetched. Must be an array with objects containing the following elements:
+ * result: callback to be called when the list is loaded correctly. An array with the loaded servers will be passed to this function, or null if it failed
+ */
+ loadServerList: function(url,result) {
+ if (this._state == 0) this._state = 1;
+ if (this._state != 1) throw "You can't add a server after server selection";
+ this._settings.mpot = true;
+ var xhr = new XMLHttpRequest();
+ xhr.onload = function(){
+ try{
+ var servers=JSON.parse(xhr.responseText);
+ for(var i=0;i
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+