diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..199e0e6 --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/App/Controllers/ModulePT1CCoreController.php b/App/Controllers/ModulePT1CCoreController.php index a747f17..8b710f5 100644 --- a/App/Controllers/ModulePT1CCoreController.php +++ b/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,11 +55,33 @@ 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(); @@ -66,24 +89,9 @@ public function saveAction() :void $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]; } } diff --git a/App/Forms/ModulePT1CCoreForm.php b/App/Forms/ModulePT1CCoreForm.php index d221448..cabb6d7 100644 --- a/App/Forms/ModulePT1CCoreForm.php +++ b/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 diff --git a/App/Views/index.volt b/App/Views/index.volt index 3881180..117b731 100644 --- a/App/Views/index.volt +++ b/App/Views/index.volt @@ -1,6 +1,10 @@
{{ t._("module_pt1c_coreDisconnected") }}
{{ form.render('id') }} + {% if security is defined %} + {{ security.getToken() }} + {{ security.getTokenKey() }} + {% endif %}

{{ t._('module_pt1c_core_LinksRussian') }}

{{ t._('module_pt1c_core_WikiDocsRussian') }} diff --git a/Lib/MikoPBXVersion.php b/Lib/MikoPBXVersion.php new file mode 100644 index 0000000..a6c67bc --- /dev/null +++ b/Lib/MikoPBXVersion.php @@ -0,0 +1,102 @@ +. + */ +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; + } + } +} diff --git a/Lib/PT1CCoreConf.php b/Lib/PT1CCoreConf.php index 34a28ac..594e5ca 100644 --- a/Lib/PT1CCoreConf.php +++ b/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 * diff --git a/Lib/PT1CCoreMain.php b/Lib/PT1CCoreMain.php index 311cb49..e69a496 100644 --- a/Lib/PT1CCoreMain.php +++ b/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 diff --git a/Lib/RestAPI/Controllers/GetController.php b/Lib/RestAPI/Controllers/GetController.php index c4fcdc6..85a4e5d 100644 --- a/Lib/RestAPI/Controllers/GetController.php +++ b/Lib/RestAPI/Controllers/GetController.php @@ -8,7 +8,6 @@ namespace Modules\ModulePT1CCore\Lib\RestAPI\Controllers; use MikoPBX\Core\System\BeanstalkClient; -use MikoPBX\Core\System\Util; use MikoPBX\Core\Workers\WorkerCdr; use MikoPBX\PBXCoreREST\Controllers\BaseController; @@ -18,16 +17,39 @@ class GetController extends BaseController * Последовательная загрузка данных из cdr таблицы. * /pbxcore/api/cdr/getData MIKO AJAM * curl 'http://127.0.0.1:80/pbxcore/api/cdr/get_data?offset=0&limit=1'; + * curl 'http://127.0.0.1:80/pbxcore/api/cdr/get_data?offset=0&limit=5&dst[0]=201&dst[1]=202'; + * curl 'http://127.0.0.1:80/pbxcore/api/cdr/get_data?offset=0&limit=5&src[0]=301'; + * curl 'http://127.0.0.1:80/pbxcore/api/cdr/get_data?offset=0&limit=5&dst[0]=201&src[0]=301'; + * curl 'http://127.0.0.1:80/pbxcore/api/cdr/get_data?offset=0&limit=5&format=json'; + * curl 'http://127.0.0.1:80/pbxcore/api/cdr/get_data?offset=0&limit=5&format=1c'; */ public function getDataAction(): void { $offset = $this->request->get('offset'); $limit = $this->request->get('limit'); - $limit = ($limit > 600) ? 600 : $limit; + $limit = ($limit > 2000) ? 2000 : $limit; + $format = $this->request->get('format', 'string', 'xml'); + + $conditions = 'id>:id:'; + $bind = ['id' => $offset]; + + // Фильтр по dst_num + $dst = $this->request->get('dst'); + if (is_array($dst) && !empty($dst)) { + $conditions .= ' AND dst_num IN ({dst:array})'; + $bind['dst'] = array_values($dst); + } + + // Фильтр по src_num + $src = $this->request->get('src'); + if (is_array($src) && !empty($src)) { + $conditions .= ' AND src_num IN ({src:array})'; + $bind['src'] = array_values($src); + } $filter = [ - 'id>:id:', - 'bind' => ['id' => $offset], + $conditions, + 'bind' => $bind, 'order' => 'id', 'limit' => $limit, 'miko_result_in_file' => true, @@ -44,20 +66,102 @@ public function getDataAction(): void $arr_data = json_decode(file_get_contents($result), true); @unlink($result); } - $xml_output = "\n"; - $xml_output .= "\n"; - if (is_array($arr_data)) { + if (!is_array($arr_data)) { + $arr_data = []; + } + $output = $this->formatCdrOutput($arr_data, $format); + $this->response->setContent($output); + } + $this->response->sendRaw(); + } + + /** + * Форматирование CDR-данных в указанный формат. + * + * @param array $arr_data массив CDR-записей + * @param string $format формат вывода: xml, json, 1c + * @return string + */ + private function formatCdrOutput(array $arr_data, string $format): string + { + switch ($format) { + case 'json': + return json_encode($arr_data, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); + case '1c': + $lines = []; + foreach ($arr_data as $data) { + $keys = implode(',', array_keys($data)); + $values = []; + foreach ($data as $val) { + $values[] = '"' . str_replace('"', '""', $val) . '"'; + } + $lines[] = 'New Structure("' . $keys . '", ' . implode(', ', $values) . ')'; + } + return implode("\n", $lines); + default: + $xml = "\n"; + $xml .= "\n"; foreach ($arr_data as $data) { $attributes = ''; foreach ($data as $tmp_key => $tmp_val) { $attributes .= sprintf('%s="%s" ', $tmp_key, rawurlencode($tmp_val)); } - $xml_output .= "\n"; + $xml .= "\n"; } + $xml .= ''; + return $xml; + } + } + + /** + * Получаем список файлов записей по идентификаторам. + * curl 'http://127.0.0.1/pbxcore/api/cdr/records-path?id[]=mikopbx-1751624009.210&id[]=mikopbx-1751622380.183&id[]=mikopbx-1751377388.208' + * @return void + */ + public function getRecordsPathByIdAction(): void + { + $id = $this->request->get('id'); + if(is_string($id)){ + $id = [$id]; + } + $result = array_fill_keys($id, []); + $filter = [ + 'columns' => 'linkedid,recordingfile,start,answer,src_num,dst_num', + 'linkedid IN ({linkedid:array}) AND recordingfile <> ""', + 'bind' => [ + 'linkedid' => $id + ], + 'miko_result_in_file' => true, + ]; + + $client = new BeanstalkClient(WorkerCdr::SELECT_CDR_TUBE); + $message = $client->request(json_encode($filter), 2); + if ($message === false) { + $this->response->setContent(''); + } else { + $filename = json_decode($message, true); + $arr_data = []; + if (is_string($filename) && file_exists($filename)) { + $arr_data = json_decode(file_get_contents($filename), true); + @unlink($filename); } - $xml_output .= ''; - $this->response->setContent($xml_output); + foreach ($arr_data as $cdrData){ + if(!file_exists($cdrData['recordingfile'])){ + continue; + } + // Создаём объект DateTime + $date = \DateTime::createFromFormat('Y-m-d H:i:s.u', $cdrData['start']); + $formatted = $date->format('Y-m-d_H-i-s'); + $result[$cdrData['linkedid']][] = [ + 'file' => $cdrData['recordingfile'], + 'start' => $formatted, + 'src' => $cdrData['src_num'], + 'dst' => $cdrData['dst_num'] + ]; + } + } + print_r(json_encode($result, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); $this->response->sendRaw(); } @@ -66,10 +170,29 @@ public function getDataAction(): void * /pbxcore/api/cdr/records MIKO AJAM * curl 'http://172.16.156.223/pbxcore/api/cdr/records?view=/storage/usbdisk1/mikoziapbx/voicemailarchive/monitor/2018/05/05/16/mikozia-1525527966.4_oWgzQFMPRA.mp3' */ + /** + * Allowed directories for serving recording files. + */ + private const ALLOWED_RECORD_DIRS = [ + '/storage/usbdisk1/mikopbx/astspool/monitor/', + ]; + public function recordsAction(): void { $filename = $this->request->get('view'); - $extension = strtolower(substr(strrchr($filename, '.'), 1)); + + // Validate path: resolve symlinks and ensure it's within allowed directories + $realPath = realpath($filename); + if ($realPath === false || !$this->isPathAllowed($realPath)) { + openlog('miko_ajam', LOG_PID | LOG_PERROR, LOG_AUTH); + $remoteAddr = $_SERVER['REMOTE_ADDR'] ?? 'unknown'; + syslog(LOG_WARNING, "From {$remoteAddr}. Denied access to: {$filename}"); + closelog(); + $this->sendError(403); + return; + } + + $extension = strtolower(substr(strrchr($realPath, '.'), 1)); $type = ''; switch ($extension) { case 'mp3': @@ -81,29 +204,47 @@ public function recordsAction(): void case 'gsm': $type = 'audio/x-gsm'; break; + case 'webm': + $type = 'audio/webm'; + break; } - $size = @filesize($filename); + $size = filesize($realPath); if ( ! $size || $type === '') { openlog('miko_ajam', LOG_PID | LOG_PERROR, LOG_AUTH); - $user_agent = $_SERVER['HTTP_USER_AGENT'] ?? 'Undefined'; - syslog(LOG_WARNING, "From {$_SERVER['REMOTE_ADDR']}. UserAgent: ({$user_agent}). File not found."); + $remoteAddr = $_SERVER['REMOTE_ADDR'] ?? 'unknown'; + syslog(LOG_WARNING, "From {$remoteAddr}. File not found or invalid type."); closelog(); $this->sendError(404); return; } - $fp = fopen($filename, 'rb'); + $fp = fopen($realPath, 'rb'); if ($fp) { - $this->response->setHeader('Content-Description', 'mp3 file'); - $this->response->setHeader('Content-Disposition', 'attachment; filename=' . basename($filename)); + $this->response->setHeader('Content-Description', 'audio file'); + $this->response->setHeader('Content-Disposition', 'attachment; filename=' . basename($realPath)); $this->response->setHeader('Content-type', $type); $this->response->setHeader('Content-Transfer-Encoding', 'binary'); + $this->response->setHeader('X-Content-Type-Options', 'nosniff'); $this->response->setContentLength($size); $this->response->sendHeaders(); fpassthru($fp); + fclose($fp); } else { $this->sendError(404); } } + + /** + * Check if the resolved path is within allowed directories. + */ + private function isPathAllowed(string $realPath): bool + { + foreach (self::ALLOWED_RECORD_DIRS as $allowedDir) { + if (strpos($realPath, $allowedDir) === 0) { + return true; + } + } + return false; + } } \ No newline at end of file diff --git a/Lib/RestAPI/Controllers/PostController.php b/Lib/RestAPI/Controllers/PostController.php index a0fd90c..f96bed1 100644 --- a/Lib/RestAPI/Controllers/PostController.php +++ b/Lib/RestAPI/Controllers/PostController.php @@ -26,12 +26,11 @@ namespace Modules\ModulePT1CCore\Lib\RestAPI\Controllers; -use MikoPBX\Common\Providers\BeanstalkConnectionWorkerApiProvider; +// use MikoPBX\Common\Providers\BeanstalkConnectionWorkerApiProvider; //DEPRICATED use MikoPBX\Core\System\Util; use MikoPBX\PBXCoreREST\Controllers\BaseController; use MikoPBX\PBXCoreREST\Lib\FilesManagementProcessor; use MikoPBX\PBXCoreREST\Lib\PbxExtensionsProcessor; -use Pheanstalk\Pheanstalk; /** * /api/upload/{name} @@ -80,7 +79,7 @@ public function sendRequestToBackendWorker( string $processor, $payload = null, string $modulename='', int $maxTimeout = 10, - int $priority = Pheanstalk::DEFAULT_PRIORITY): void + int $priority = 1024): void { $requestMessage = [ 'processor' => $processor, diff --git a/Messages/fa.php b/Messages/fa.php new file mode 100644 index 0000000..b3d9bbc --- /dev/null +++ b/Messages/fa.php @@ -0,0 +1 @@ + 'Telefonpanel 1.0 1C-hez', + 'SubHeaderModulePT1CCore' => 'Modul a hívások kezelésére számítógépről', + 'module_pt1c_coreConnected' => 'Modul csatlakoztatva', + 'module_pt1c_coreDisconnected' => 'Modul letiltva', + 'module_pt1c_coreUpdateStatus' => 'Állapotfrissítés', + 'module_pt1c_core_WebinarLinkRussian' => 'Webinárium a modul beállításáról', + 'module_pt1c_core_Forum' => 'Fórum', + 'module_pt1c_core_LinksRussian' => 'Hasznos linkek (orosz)', + 'f2b_Jail_module_p_t1_c_core' => 'Hibák a CTI-kliensek vagy az 1C-panelek engedélyezése során', + 'module_pt1c_core_WikiDocsRussian' => 'Wiki dokumentáció a modul beállításához', + 'fw_modulept1ccoreDescription' => 'CTI CLIENT - Telefonpanel 1.0 1C-hez', + /** + * Copyright (C) MIKO LLC - All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Nikolay Beketov, 6 2018 + * + */ + 'repModulePT1CCore' => 'Telefonpanel 1.0, 1C:Enterprise – %repesent%', + 'mo_ModuleModulePT1CCore' => 'Telefonpanel 1.0 1C-hez', +]; diff --git a/Messages/languages.php b/Messages/languages.php new file mode 100644 index 0000000..b3d9bbc --- /dev/null +++ b/Messages/languages.php @@ -0,0 +1 @@ + 'โมดูลสำหรับจัดการการโทรจากคอมพิวเตอร์', + 'module_pt1c_coreConnected' => 'เชื่อมต่อโมดูลแล้ว', + 'module_pt1c_coreDisconnected' => 'ปิดใช้งานโมดูลแล้ว', + 'module_pt1c_coreUpdateStatus' => 'อัพเดทสถานะ', + 'module_pt1c_core_WikiDocsRussian' => 'เอกสาร Wiki สำหรับการตั้งค่าโมดูล', + 'module_pt1c_core_WebinarLinkRussian' => 'การสัมมนาผ่านเว็บเกี่ยวกับการตั้งค่าโมดูล', + 'module_pt1c_core_Forum' => 'ฟอรั่ม', + 'module_pt1c_core_LinksRussian' => 'ลิงค์ที่มีประโยชน์ (รัสเซีย)', + 'fw_modulept1ccoreDescription' => 'CTI CLIENT - แผงโทรศัพท์ 1.0 สำหรับ 1C', + /** + * Copyright (C) MIKO LLC - All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Nikolay Beketov, 6 2018 + * + */ + 'repModulePT1CCore' => 'แผงโทรศัพท์ 1.0 สำหรับ 1C: Enterprise - %repesent%', + 'mo_ModuleModulePT1CCore' => 'แผงโทรศัพท์ 1.0 สำหรับ 1C: Enterprise', + 'BreadcrumbModulePT1CCore' => 'แผงโทรศัพท์ 1.0 สำหรับ 1C: Enterprise', + 'f2b_Jail_module_p_t1_c_core' => 'ข้อผิดพลาดในการตรวจสอบสิทธิ์ของลูกค้า CTI หรือแผง 1C', +]; diff --git a/agi-bin/DialPlanAppsMikoPBX.php b/agi-bin/DialPlanAppsMikoPBX.php index f12ef01..e21252b 100644 --- a/agi-bin/DialPlanAppsMikoPBX.php +++ b/agi-bin/DialPlanAppsMikoPBX.php @@ -73,7 +73,10 @@ private function q_done($q_res_data):void $res_data = json_decode($q_res_data, true, 512, JSON_THROW_ON_ERROR); $this->app_10000666_777($res_data); } elseif ('10000109' === $this->exten) { - $res = Extensions::findFirst("number='{$this->vars['number']}'"); + $res = Extensions::findFirst([ + 'conditions' => 'number = :number:', + 'bind' => ['number' => $this->vars['number']], + ]); $context = ($res !== null) ? 'all_peers' : ''; $this->UserEvent( "GetContest,chan1c:{$this->vars['tehnology']}/{$this->vars['number']},peercontext:{$context}" @@ -212,13 +215,19 @@ private function old_10000666_777($id):string $res = $settings['res']??''; $auth = $settings['auth']??''; - $zapros = "SELECT" . " recordingfile FROM cdr WHERE linkedid = \"{$id}\" GROUP BY recordingfile"; - $output = []; $cdr_db = dirname(CdrDb::getPathToDB()) . '/master.db'; if ( ! file_exists($cdr_db)) { return ''; } - exec("sqlite3 '$cdr_db' '{$zapros}'", $output); + + // Use PDO with prepared statement instead of exec("sqlite3 ...") + $pdo = new \PDO('sqlite:' . $cdr_db); + $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION); + $stmt = $pdo->prepare('SELECT recordingfile FROM cdr WHERE linkedid = :linkedid GROUP BY recordingfile'); + $stmt->bindValue(':linkedid', $id, \PDO::PARAM_STR); + $stmt->execute(); + $output = $stmt->fetchAll(\PDO::FETCH_COLUMN); + $arr_files = []; foreach ($output as $_data) { if (empty($_data)) { @@ -226,22 +235,42 @@ private function old_10000666_777($id):string } $fname = "{$_data}.wav"; if (in_array($fname, $arr_files, true)) { - // Файл уже обработали ранее успешно. continue; } if (file_exists("{$fname}.empty")) { - // Уже пытались скачать файл. Файл не найден на другой АТС. continue; } if ( ! file_exists($fname)) { Util::mwMkdir(dirname($_data)); - exec("curl -s -f 'http://{$host}{$res}{$_data}' -u {$auth} -I", $curl_output); - if (stripos(implode('', $curl_output), 'attachment;') === false) { + + // Use PHP cURL API instead of exec("curl ...") + $url = 'http://' . $host . $res . $_data; + $ch = curl_init($url); + curl_setopt($ch, CURLOPT_USERPWD, $auth); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_FAILONERROR, true); + curl_setopt($ch, CURLOPT_NOBODY, true); + curl_setopt($ch, CURLOPT_HEADER, true); + $headResponse = curl_exec($ch); + curl_close($ch); + + if ($headResponse === false || stripos($headResponse, 'attachment;') === false) { file_put_contents("{$fname}.empty", ''); continue; } - exec("curl -s -f 'http://{$host}{$res}{$_data}' -u {$auth} --output '{$fname}'"); - exec("/sbin/wav2mp3.sh '{$_data}'"); + + $ch = curl_init($url); + curl_setopt($ch, CURLOPT_USERPWD, $auth); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_FAILONERROR, true); + $fileContent = curl_exec($ch); + curl_close($ch); + + if ($fileContent !== false) { + file_put_contents($fname, $fileContent); + $wavPath = escapeshellarg($_data); + exec("/sbin/wav2mp3.sh {$wavPath}"); + } } $arr_files[] = $fname; } diff --git a/composer.json b/composer.json index 710a6b6..9c9cb81 100644 --- a/composer.json +++ b/composer.json @@ -2,6 +2,7 @@ "name": "mikopbx/modulept1ccore", "description": "ModulePT1CCore", "require": { + "php": "^7.4 || ^8.0", "mikopbx/core": ">=2020.2.757" }, "autoload": { @@ -29,7 +30,7 @@ "wiki": "https://wiki.mikopbx.com", "issues": "https://github.com/mikopbx/Core/issues", "source": "https://github.com/mikopbx/Core", - "forum": "https://qa.askozia.ru", + "forum": "https://qa.mikopbx.ru", "chat": "https://t.me/mikopbx_dev" }, "authors": [ @@ -42,7 +43,7 @@ { "name": "Nikolay Beketov", "email": "nbek@miko.ru", - "homepage": "http://facebook.com/jorikfon", + "homepage": "https://www.linkedin.com/in/nikolay-beketov", "role": "Developer" } ], @@ -55,7 +56,7 @@ "config": { "sort-packages": true, "platform": { - "php": "7.4.6" + "php": "^7.4 || ^8.0" } } } diff --git a/module.json b/module.json index 82cccf8..c0ba5e0 100644 --- a/module.json +++ b/module.json @@ -7,5 +7,10 @@ "wiki_links": { "ru": {"https://wiki.mikopbx.com/module-p-t1-c-core": "https://wiki.miko.ru/astpanel"}, "en": {"https://wiki.mikopbx.com/module-p-t1-c-core": "https://wiki.miko.ru/astpanel"} + }, + "release_settings": { + "publish_release": true, + "changelog_enabled": true, + "create_github_release": true } }