From 58dbd749f80300f56f6f9bb738a9b03aa354cb65 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca@haid.in>
Date: Mon, 19 Feb 2024 12:51:34 +0100
Subject: [PATCH 1/2] fixed raspberry authentication for getConfig and removed
 IP verifiing

---
 application/RaspberryDisplay/RaspberryDisplayController.php | 5 ++---
 application/RaspberryDisplay/RaspberryDisplayModel.php      | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/RaspberryDisplay/RaspberryDisplayController.php b/application/RaspberryDisplay/RaspberryDisplayController.php
index e3f20ce30..949a0ac5e 100644
--- a/application/RaspberryDisplay/RaspberryDisplayController.php
+++ b/application/RaspberryDisplay/RaspberryDisplayController.php
@@ -60,10 +60,9 @@ class RaspberryDisplayController extends mfBaseController
     }
 
     protected function getConfig() {
-        $ip = $_SERVER['REMOTE_ADDR'];
         $hostname = $this->request->hostname;
 
-        $displays = RaspberryDisplayModel::getByHostnameAndIp($hostname, $ip);
+        $displays = RaspberryDisplayModel::getByHostname($hostname);
 
         if ($displays === null) {
             die("No display found for this hostname and ip:" . $hostname . " X " . $ip);
@@ -82,7 +81,7 @@ class RaspberryDisplayController extends mfBaseController
     protected function apiAction() {
         $do = $this->request->do;
 
-        if (!$this->me->is("employee") && !in_array($do, ["getDisplays", "change", "reboot"])) {
+        if ($do !== "getConfig" && !$this->me->is("employee")) {
             $this->redirect("dashboard");
         }
 
diff --git a/application/RaspberryDisplay/RaspberryDisplayModel.php b/application/RaspberryDisplay/RaspberryDisplayModel.php
index 2ec6a4ee9..d96b40655 100644
--- a/application/RaspberryDisplay/RaspberryDisplayModel.php
+++ b/application/RaspberryDisplay/RaspberryDisplayModel.php
@@ -29,11 +29,11 @@ class RaspberryDisplayModel
         return null;
     }
 
-    public static function getByHostnameAndIp($hostname, $ip)
+    public static function getByHostname($hostname)
     {
         $db = FronkDB::singleton();
 
-        $res = $db->select("RaspberryDisplay", "*", "hostname = '$hostname' AND ip_address = '$ip'");
+        $res = $db->select("RaspberryDisplay", "*", "hostname = '$hostname'");
         //fetch 2 rows
 
         if ($db->num_rows($res)) {

From 0f95b744f075e33a21af29d79f056fc196b5a57e Mon Sep 17 00:00:00 2001
From: Luca Haid <luca@haid.in>
Date: Mon, 19 Feb 2024 12:51:58 +0100
Subject: [PATCH 2/2] fixed error

---
 application/RaspberryDisplay/RaspberryDisplayController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/RaspberryDisplay/RaspberryDisplayController.php b/application/RaspberryDisplay/RaspberryDisplayController.php
index 949a0ac5e..65c11e9c9 100644
--- a/application/RaspberryDisplay/RaspberryDisplayController.php
+++ b/application/RaspberryDisplay/RaspberryDisplayController.php
@@ -65,7 +65,7 @@ class RaspberryDisplayController extends mfBaseController
         $displays = RaspberryDisplayModel::getByHostname($hostname);
 
         if ($displays === null) {
-            die("No display found for this hostname and ip:" . $hostname . " X " . $ip);
+            die("No display found for this hostname and ip:" . $hostname . " X ");
         }
 
         return array_map(function ($display) {