From 1a9f274cda63d993b19d118ff0e1f07826e9f8e8 Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Fri, 21 Feb 2025 17:24:42 -0500
Subject: [PATCH] dont auth if pc_admin is disabled

---
 zefie_wtvp_minisrv/includes/classes/WTVAdmin.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/zefie_wtvp_minisrv/includes/classes/WTVAdmin.js b/zefie_wtvp_minisrv/includes/classes/WTVAdmin.js
index 43fd2608..a39db4ce 100644
--- a/zefie_wtvp_minisrv/includes/classes/WTVAdmin.js
+++ b/zefie_wtvp_minisrv/includes/classes/WTVAdmin.js
@@ -185,6 +185,7 @@ class WTVAdmin {
                             allowed_ssid = true;
                             Object.keys(self.minisrv_config.services[self.service_name].authorized_ssids[k]).forEach(function (j) {
                                 if (self.isInSubnet(self.clientAddress, self.minisrv_config.services[self.service_name].authorized_ssids[k][j])) {
+                                    if (allowed_ip) return;
                                     allowed_ip = true;
                                 }
                             });
@@ -194,9 +195,15 @@ class WTVAdmin {
             }
         } else {
             if (this.pcservices) {
+                if (!this.minisrv_config.config.pc_admin.enabled) {
+                    if (justchecking) return false;
+                    else return this.rejectConnection(false);
+                }
+
                 if (this.minisrv_config.config.pc_admin.ip_whitelist) {
                     var self = this;
                     Object.keys(this.minisrv_config.config.pc_admin.ip_whitelist).forEach(function (k) {
+                        if (allowed_ip) return;
                         allowed_ip = self.isInSubnet(self.clientAddress, self.minisrv_config.config.pc_admin.ip_whitelist[k]);
                     });
                 }