Develop

.github/workflows/build.yml

@@ -0,0 +1,15 @@
+name: Build and Publish
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build:
+    uses: mikopbx/.github-workflows/.github/workflows/extension-publish.yml@master
+    with:
+      initial_version: "1.39"
+    secrets: inherit

App/Controllers/ModulePT1CCoreController.php

@@ -5,12 +5,13 @@
  * Proprietary and confidential
  * Written by Alexey Portnov, 11 2018
  */
+
+
 namespace Modules\ModulePT1CCore\App\Controllers;
 use MikoPBX\AdminCabinet\Controllers\BaseController;
 use MikoPBX\Modules\PbxExtensionUtils;
 use Modules\ModulePT1CCore\App\Forms\ModulePT1CCoreForm;
 use Modules\ModulePT1CCore\Models\ModulePT1CCore;
-use MikoPBX\Common\Models\Providers;
 
 class ModulePT1CCoreController extends BaseController
 {
@@ -54,36 +55,43 @@ public function indexAction(): void
     /**
      * Save settings AJAX action
      */
+    /**
+     * Whitelist of fields allowed for mass assignment.
+     */
+    private const ALLOWED_FIELDS = [
+        'interception_extension',
+        'conference_extension',
+        'get_peer_info_extension',
+        'get_auth_extension',
+        'get_statuses_extension',
+        'get_cdr_extension',
+        'listen_recordings_extension',
+        'get_recordings_extension',
+    ];
+
     public function saveAction() :void
     {
         if ( ! $this->request->isPost()) {
             return;
         }
+
+        // CSRF protection (compatible with Phalcon 4 and 5)
+        if ($this->di->has('security') && !$this->security->checkToken()) {
+            $this->flash->error('Invalid CSRF token');
+            $this->view->success = false;
+            return;
+        }
+
         $data   = $this->request->getPost();
         $record = ModulePT1CCore::findFirst();
 
         if ($record === null) {
             $record = new ModulePT1CCore();
         }
         $this->db->begin();
-        foreach ($record as $key => $value) {
-            switch ($key) {
-                case 'id':
-                    break;
-                case 'checkbox_field':
-                case 'toggle_field':
-                    if (array_key_exists($key, $data)) {
-                        $record->$key = ($data[$key] === 'on') ? '1' : '0';
-                    } else {
-                        $record->$key = '0';
-                    }
-                    break;
-                default:
-                    if (array_key_exists($key, $data)) {
-                        $record->$key = $data[$key];
-                    } else {
-                        $record->$key = '';
-                    }
+        foreach (self::ALLOWED_FIELDS as $key) {
+            if (array_key_exists($key, $data)) {
+                $record->$key = $data[$key];
             }
         }
 

App/Forms/ModulePT1CCoreForm.php

@@ -9,13 +9,7 @@
 namespace Modules\ModulePT1CCore\App\Forms;
 
 use Phalcon\Forms\Form;
-use Phalcon\Forms\Element\Text;
-use Phalcon\Forms\Element\Numeric;
-use Phalcon\Forms\Element\Password;
-use Phalcon\Forms\Element\Check;
-use Phalcon\Forms\Element\TextArea;
 use Phalcon\Forms\Element\Hidden;
-use Phalcon\Forms\Element\Select;
 
 
 class ModulePT1CCoreForm extends Form

App/Views/index.volt

@@ -1,6 +1,10 @@
 <form class="ui large grey segment form" id="module_pt1c_core-form">
     <div class="ui grey top right attached label" id="status">{{ t._("module_pt1c_coreDisconnected") }}</div>
     {{ form.render('id') }}
+    {% if security is defined %}
+    {{ security.getToken() }}
+    {{ security.getTokenKey() }}
+    {% endif %}
     <h3 class="ui header">{{ t._('module_pt1c_core_LinksRussian') }}</h3>
         <div class="ui bulleted link list">
             <a class="item" href="https://wiki.miko.ru/#s_i_telefonija_redakcija_1">{{ t._('module_pt1c_core_WikiDocsRussian') }}</a>

Lib/MikoPBXVersion.php

@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * MikoPBX - free phone system for small business
+ * Copyright © 2017-2024 Alexey Portnov and Nikolay Beketov
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+namespace Modules\ModulePT1CCore\Lib;
+
+use MikoPBX\Common\Models\PbxSettings;
+
+class MikoPBXVersion
+{
+    /**
+     * Return true if current version of PBX based on Phalcon 5+
+     * @return bool
+     */
+    public static function isPhalcon5Version(): bool
+    {
+        $pbxVersion = PbxSettings::getValueByKey('PBXVersion');
+        return version_compare($pbxVersion, '2024.2.30', '>');
+    }
+
+    /**
+     * Return Di interface for the current version of PBX
+     * @return \Phalcon\Di\DiInterface|null
+     */
+    public static function getDefaultDi()
+    {
+        if (self::isPhalcon5Version()) {
+            return  \Phalcon\Di\Di::getDefault();
+        } else {
+            return  \Phalcon\Di::getDefault();
+        }
+    }
+
+    /**
+     * Return Validation class for the current version of PBX
+     * @return class-string<\Phalcon\Filter\Validation>|class-string<\Phalcon\Validation>
+     */
+    public static function getValidationClass(): string
+    {
+        if (self::isPhalcon5Version()) {
+            return  \Phalcon\Filter\Validation::class;
+        } else {
+            return  \Phalcon\Validation::class;
+        }
+    }
+
+    /**
+     * Return Uniqueness class for the current version of PBX
+     * @return class-string<\Phalcon\Filter\Validation\Validator\Uniqueness>|class-string<\Phalcon\Validation\Validator\Uniqueness>
+     */
+    public static function getUniquenessClass(): string
+    {
+        if (self::isPhalcon5Version()) {
+            return  \Phalcon\Filter\Validation\Validator\Uniqueness::class;
+        } else {
+            return  \Phalcon\Validation\Validator\Uniqueness::class;
+        }
+    }
+
+    /**
+     * Return Text class for the current version of PBX
+     *
+     * @return class-string<\MikoPBX\Common\Library\Text>|class-string<\Phalcon\Text>
+     */
+    public static function getTextClass(): string
+    {
+        if (self::isPhalcon5Version()) {
+            return   \MikoPBX\Common\Library\Text::class;
+        } else {
+            return  \Phalcon\Text::class;
+        }
+    }
+
+    /**
+     * Return Logger class for the current version of PBX
+     *
+     * @return class-string<\Phalcon\Logger\Logger>|class-string<\Phalcon\Logger>
+     */
+    public static function getLoggerClass(): string
+    {
+        if (self::isPhalcon5Version()) {
+            return  \Phalcon\Logger\Logger::class;
+        } else {
+            return  \Phalcon\Logger::class;
+        }
+    }
+}

Lib/PT1CCoreConf.php

@@ -46,9 +46,10 @@ public function onAfterPbxStarted(): void
         if (is_file('/var/etc/http_auth')) {
             return;
         }
-        $user_name = md5(random_bytes(20));
-        $pass      = md5(random_bytes(12));
+        $user_name = bin2hex(random_bytes(16));
+        $pass      = bin2hex(random_bytes(16));
         file_put_contents('/var/etc/http_auth', "{$user_name}:{$pass}");
+        chmod('/var/etc/http_auth', 0600);
     }
 
 
@@ -194,6 +195,7 @@ public function createNginxLocations(): string
     public function getPBXCoreRESTAdditionalRoutes(): array
     {
         return [
+            [GetController::class, 'getRecordsPathByIdAction', '/pbxcore/api/cdr/records-path', 'get', '/', true],
             [GetController::class, 'getDataAction', '/pbxcore/api/cdr/get_data', 'get', '/', true],
             [GetController::class, 'recordsAction', '/pbxcore/api/cdr/records', 'get', '/', true],
             [PostController::class,'callAction',    '/pbxcore/api/fax/upload/{actionName}',   'post','/', true],
@@ -205,7 +207,7 @@ public function getPBXCoreRESTAdditionalRoutes(): array
      *
      * @return string
      */
-    public function generateFail2BanJails():string
+    public function generateFail2BanFilters():string
     {
         return "[INCLUDES]\n" .
             "before = common.conf\n" .
@@ -216,6 +218,20 @@ public function generateFail2BanJails():string
             "ignoreregex =\n";
     }
 
+    /**
+     * Generates additional fail2ban jail conf rules
+     * Detects auth failures for:
+     * - REST API login attempts
+     * - Media file access attempts
+     * - WebSocket connection attempts
+     *
+     * @return string
+     */
+    public function generateFail2BanJails(): string
+    {
+        return "#";
+    }
+
     /**
      * Returns array of additional firewall rules for module
      *

Lib/PT1CCoreMain.php

@@ -2,11 +2,7 @@
 
 namespace Modules\ModulePT1CCore\Lib;
 
-
-use MikoPBX\Core\System\Util;
-use MikoPBX\Core\Workers\Cron\WorkerSafeScriptsCore;
 use MikoPBX\Modules\PbxExtensionBase;
-use MikoPBX\Modules\PbxExtensionUtils;
 use MikoPBX\PBXCoreREST\Lib\PBXApiResult;
 
 class PT1CCoreMain extends PbxExtensionBase