Replace csrf and explicit HTTPAuth includes with autoload.php

ajax/adblock/update_blocklist.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 if (isset($_POST['blocklist_id'])) {

ajax/bandwidth/get_bandwidth.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 $interface = filter_input(INPUT_GET, 'inet', FILTER_SANITIZE_SPECIAL_CHARS);

ajax/bandwidth/get_bandwidth_hourly.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 if (filter_input(INPUT_GET, 'tu') == 'h') {

ajax/logging/clearlog.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/functions.php';
 

ajax/networking/do_sys_reset.php

@@ -1,15 +1,14 @@
 <?php
-
+require_once '../../includes/autoload.php';
 require_once '../../includes/config.php';
 require_once '../../includes/session.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/session.php';
 require_once '../../includes/functions.php';
 
 if (isset($_POST['csrf_token'])) {
-    if (csrfValidateRequest() && !CSRFValidate()) {
-        handleInvalidCSRFToken();
+    if ($token->csrfValidateRequest() && !$token->CSRFValidate()) {
+        $token->handleInvalidCSRFToken();
     }
     $return = 0;
     $path = "../../config";
@@ -33,5 +32,6 @@ if (isset($_POST['csrf_token'])) {
     echo json_encode($jsonData);
 
 } else {
-    handleInvalidCSRFToken();
+    $token->handleInvalidCSRFToken();
 }
+

ajax/networking/get_all_interfaces.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 exec("ls /sys/class/net | grep -v lo", $interfaces);

ajax/networking/get_channel.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 exec('cat '. RASPI_HOSTAPD_CONFIG, $hostapdconfig);

ajax/networking/get_frequencies.php

@@ -1,10 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
-require_once '../../src/RaspAP/Parsers/IwParser.php';
 require_once '../../includes/authenticate.php';
 
 if (isset($_POST['interface'])) {

ajax/networking/get_ip_summary.php

@@ -1,10 +1,8 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/functions.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 if (isset($_POST['interface'])) {

ajax/networking/get_netcfg.php

@@ -1,10 +1,9 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
+require_once '../../includes/functions.php';
 
 $interface = $_POST['iface'];
 

ajax/networking/get_nl80211_band.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/locale.php';
 

ajax/networking/get_wgcfg.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 // fetch wg client.conf

ajax/networking/get_wgkey.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 $entity = escapeshellcmd($_POST['entity']);

ajax/networking/wifi_stations.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/defaults.php';
 require_once '../../includes/functions.php';

ajax/openvpn/activate_ovpncfg.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/functions.php';
 

ajax/openvpn/del_ovpncfg.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/functions.php';
 

ajax/plugins/do_plugin_install.php

@@ -1,11 +1,8 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
-require_once '../../src/RaspAP/Plugins/PluginInstaller.php';
 
 $pluginInstaller = \RaspAP\Plugins\PluginInstaller::getInstance();
 $plugin_uri = $_POST['plugin_uri'] ?? null;

ajax/session/do_check_session.php

@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 $lastActivity = $_SESSION['lastActivity'] ?? time();