Fix manual attributes sanitizing

Fix search extensions algoritm
mikopbx · Sep 19, 2024 · 48b96ee · 48b96ee
1 parent e991ebd
commit 48b96ee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/AdminCabinet/Controllers/ExtensionsController.php b/src/AdminCabinet/Controllers/ExtensionsController.php
@@ -133,10 +133,10 @@ private function prepareConditionsForSearchPhrases(string $searchPhrase, array &
             $parameters['conditions'] = 'Users.email LIKE :SearchEmail:';
             $parameters['bind']['SearchEmail'] = "%{$email}%"; // Use partial matching for email
         } elseif (strpos($searchPhrase, 'number:') === 0) {
-            // If the search phrase starts with 'number:', search by Extensions.number using a LIKE query
+            // If the search phrase starts with 'number:', search by Extensions.number using a query
             $number = substr($searchPhrase, 7); // Remove 'number:' prefix
-            $parameters['conditions'] = 'Extensions.number LIKE :SearchNumber:';
-            $parameters['bind']['SearchNumber'] = "%{$number}%"; // Use partial matching for number
+            $parameters['conditions'] = 'Extensions.number = :SearchNumber:';
+            $parameters['bind']['SearchNumber'] = $number;
         } elseif (strpos($searchPhrase, 'mobile:') === 0) {
             // If the search phrase starts with 'mobile:', search by ExternalExtensions.mobile using a LIKE query$mobile = substr($searchPhrase, 7); // Remove 'mobile:' prefix
             $mobile = substr($searchPhrase, 7); // Remove 'number:' prefix

diff --git a/src/PBXCoreREST/Controllers/BaseController.php b/src/PBXCoreREST/Controllers/BaseController.php
@@ -25,7 +25,6 @@
 use MikoPBX\Common\Providers\BeanstalkConnectionWorkerApiProvider;
 use MikoPBX\Core\System\BeanstalkClient;
 use MikoPBX\PBXCoreREST\Http\Response;
-use MikoPBX\PBXCoreREST\Lib\PBXApiResult;
 use MikoPBX\PBXCoreREST\Lib\PbxExtensionsProcessor;
 use Phalcon\Filter;
 use Phalcon\Mvc\Controller;

diff --git a/src/PBXCoreREST/Controllers/Extensions/PostController.php b/src/PBXCoreREST/Controllers/Extensions/PostController.php
@@ -22,6 +22,7 @@
 
 use MikoPBX\PBXCoreREST\Controllers\BaseController;
 use MikoPBX\PBXCoreREST\Lib\ExtensionsManagementProcessor;
+use Phalcon\Filter;
 
 /**
  * Handles the POST requests for extensions data.
@@ -57,6 +58,16 @@ public function callAction(string $actionName): void
         // Fetching parameters from POST request
         $postData = self::sanitizeData($this->request->getPost(), $this->filter);
 
+        // Do not sanitize the sip_manualattributes field
+        if ($this->request->getPost('sip_manualattributes') !== '') {
+            $postData['sip_manualattributes'] = $this->request->getPost('sip_manualattributes', FILTER::FILTER_TRIM);
+        }
+
+        // Do not sanitize passwords
+        if ($this->request->getPost('sip_secret') !== '') {
+            $postData['sip_secret'] = $this->request->getPost('sip_secret');
+        }
+
         $this->sendRequestToBackendWorker(ExtensionsManagementProcessor::class, $actionName, $postData);
     }
 }