snapshot of https://github.com/espocrm/espocrm.git (master, 2026-09-18; blobs > 131072B omitted)
Some checks failed
Test / Test on PHP 8.3 (push) Failing after 5s
Test / Test on PHP 8.4 (push) Failing after 4s
Test / Test on PHP 8.5 (push) Failing after 3s
TypeScript static analysis / TypeScript check (push) Failing after 14s
Test Integration on MySQL / Test on PHP 8.3 (push) Failing after 2s
Test Integration on MySQL / Test on PHP 8.5 (push) Failing after 0s
Test Integration on PostgreSQL / Test on PHP 8.4 fix (push) Failing after 1s
Test Integration on PostgreSQL / Test on PHP 8.4 master (push) Failing after 1s
Some checks failed
Test / Test on PHP 8.3 (push) Failing after 5s
Test / Test on PHP 8.4 (push) Failing after 4s
Test / Test on PHP 8.5 (push) Failing after 3s
TypeScript static analysis / TypeScript check (push) Failing after 14s
Test Integration on MySQL / Test on PHP 8.3 (push) Failing after 2s
Test Integration on MySQL / Test on PHP 8.5 (push) Failing after 0s
Test Integration on PostgreSQL / Test on PHP 8.4 fix (push) Failing after 1s
Test Integration on PostgreSQL / Test on PHP 8.4 master (push) Failing after 1s
This commit is contained in:
@@ -0,0 +1,69 @@
|
||||
<?php
|
||||
/************************************************************************
|
||||
* This file is part of EspoCRM.
|
||||
*
|
||||
* EspoCRM – Open Source CRM application.
|
||||
* Copyright (C) 2014-2026 EspoCRM, Inc.
|
||||
* Website: https://www.espocrm.com
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero 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 Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of this program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU Affero General Public License version 3.
|
||||
*
|
||||
* In accordance with Section 7(b) of the GNU Affero General Public License version 3,
|
||||
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
|
||||
************************************************************************/
|
||||
|
||||
namespace Espo\Classes\RecordHooks\EmailAccount;
|
||||
|
||||
use Espo\Core\Exceptions\Forbidden;
|
||||
use Espo\Core\Record\Hook\SaveHook;
|
||||
use Espo\Core\Utils\Config;
|
||||
use Espo\Entities\EmailAccount;
|
||||
use Espo\Entities\User;
|
||||
use Espo\ORM\Entity;
|
||||
use Espo\ORM\EntityManager;
|
||||
use const PHP_INT_MAX;
|
||||
|
||||
/**
|
||||
* @implements SaveHook<EmailAccount>
|
||||
*/
|
||||
class BeforeCreate implements SaveHook
|
||||
{
|
||||
public function __construct(
|
||||
private User $user,
|
||||
private Config $config,
|
||||
private EntityManager $entityManager
|
||||
) {}
|
||||
|
||||
public function process(Entity $entity): void
|
||||
{
|
||||
if ($this->user->isEffectiveAdmin()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$entity->set('assignedUserId', $this->user->getId());
|
||||
|
||||
$count = $this->entityManager
|
||||
->getRDBRepository(EmailAccount::ENTITY_TYPE)
|
||||
->where(['assignedUserId' => $this->user->getId()])
|
||||
->count();
|
||||
|
||||
if ($count >= $this->config->get('maxEmailAccountCount', PHP_INT_MAX)) {
|
||||
throw new Forbidden("Email Account number for user limit exceeded.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
<?php
|
||||
/************************************************************************
|
||||
* This file is part of EspoCRM.
|
||||
*
|
||||
* EspoCRM – Open Source CRM application.
|
||||
* Copyright (C) 2014-2026 EspoCRM, Inc.
|
||||
* Website: https://www.espocrm.com
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero 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 Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of this program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU Affero General Public License version 3.
|
||||
*
|
||||
* In accordance with Section 7(b) of the GNU Affero General Public License version 3,
|
||||
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
|
||||
************************************************************************/
|
||||
|
||||
namespace Espo\Classes\RecordHooks\EmailAccount;
|
||||
|
||||
use Espo\Core\Acl;
|
||||
use Espo\Core\Exceptions\Error\Body;
|
||||
use Espo\Core\Exceptions\Forbidden;
|
||||
use Espo\Core\Record\Hook\SaveHook;
|
||||
use Espo\Entities\EmailAccount;
|
||||
use Espo\Entities\EmailFolder;
|
||||
use Espo\ORM\Entity;
|
||||
use Espo\ORM\EntityManager;
|
||||
use RuntimeException;
|
||||
use stdClass;
|
||||
|
||||
/**
|
||||
* @implements SaveHook<EmailAccount>
|
||||
*/
|
||||
class BeforeSave implements SaveHook
|
||||
{
|
||||
public function __construct(
|
||||
private EntityManager $entityManager,
|
||||
private Acl $acl,
|
||||
) {}
|
||||
|
||||
public function process(Entity $entity): void
|
||||
{
|
||||
$this->checkFolderMap($entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Forbidden
|
||||
*/
|
||||
private function checkFolderMap(EmailAccount $entity): void
|
||||
{
|
||||
if (!$entity->isAttributeChanged('folderMap')) {
|
||||
return;
|
||||
}
|
||||
|
||||
$map = $entity->get('folderMap');
|
||||
|
||||
if ($map === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!$map instanceof stdClass) {
|
||||
throw new RuntimeException("Bad folderMap.");
|
||||
}
|
||||
|
||||
foreach (get_object_vars($map) as $folderId) {
|
||||
if ($folderId === null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!is_string($folderId)) {
|
||||
throw new RuntimeException("Bad folderMap item.");
|
||||
}
|
||||
|
||||
$folderEntry = $this->entityManager->getRepositoryByClass(EmailFolder::class)->getById($folderId);
|
||||
|
||||
if (!$folderEntry) {
|
||||
throw Forbidden::createWithBody('noFolder',
|
||||
Body::create()->withMessageTranslation('noFolder', EmailAccount::ENTITY_TYPE)
|
||||
);
|
||||
}
|
||||
|
||||
if (!$this->acl->checkEntityRead($folderEntry)) {
|
||||
throw new Forbidden("No access to mapped folder $folderId.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
<?php
|
||||
/************************************************************************
|
||||
* This file is part of EspoCRM.
|
||||
*
|
||||
* EspoCRM – Open Source CRM application.
|
||||
* Copyright (C) 2014-2026 EspoCRM, Inc.
|
||||
* Website: https://www.espocrm.com
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero 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 Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of this program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU Affero General Public License version 3.
|
||||
*
|
||||
* In accordance with Section 7(b) of the GNU Affero General Public License version 3,
|
||||
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
|
||||
************************************************************************/
|
||||
|
||||
namespace Espo\Classes\RecordHooks\EmailAccount;
|
||||
|
||||
use Espo\Core\Exceptions\Forbidden;
|
||||
use Espo\Core\Record\Hook\SaveHook;
|
||||
use Espo\Core\Utils\Config;
|
||||
use Espo\Core\Utils\Security\HostCheck;
|
||||
use Espo\Entities\EmailAccount;
|
||||
use Espo\Entities\InboundEmail;
|
||||
use Espo\ORM\Entity;
|
||||
|
||||
/**
|
||||
* @implements SaveHook<EmailAccount|InboundEmail>
|
||||
*/
|
||||
class BeforeSaveValidateHosts implements SaveHook
|
||||
{
|
||||
public function __construct(
|
||||
private Config $config,
|
||||
private HostCheck $hostCheck,
|
||||
) {}
|
||||
|
||||
public function process(Entity $entity): void
|
||||
{
|
||||
if ($entity->isAttributeChanged('host') || $entity->isAttributeChanged('port')) {
|
||||
$this->validateImap($entity);
|
||||
}
|
||||
|
||||
if ($entity->isAttributeChanged('smtpHost') || $entity->isAttributeChanged('smtpPort')) {
|
||||
$this->validateSmtp($entity);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Forbidden
|
||||
*/
|
||||
private function validateImap(EmailAccount|InboundEmail $entity): void
|
||||
{
|
||||
$host = $entity->getHost();
|
||||
$port = $entity->getPort();
|
||||
|
||||
if ($host === null || $port === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
$address = $host . ':' . $port;
|
||||
|
||||
if (in_array($address, $this->getAllowedAddressList())) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!$this->hostCheck->isHostAndNotInternal($host)) {
|
||||
$message = $this->composeErrorMessage($host, $address);
|
||||
|
||||
throw new Forbidden($message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Forbidden
|
||||
*/
|
||||
private function validateSmtp(EmailAccount|InboundEmail $entity): void
|
||||
{
|
||||
$host = $entity->getSmtpHost();
|
||||
$port = $entity->getSmtpPort();
|
||||
|
||||
if ($host === null || $port === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
$address = $host . ':' . $port;
|
||||
|
||||
if (in_array($address, $this->getAllowedAddressList())) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!$this->hostCheck->isHostAndNotInternal($host)) {
|
||||
$message = $this->composeErrorMessage($host, $address);
|
||||
|
||||
throw new Forbidden($message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string[]
|
||||
*/
|
||||
private function getAllowedAddressList(): array
|
||||
{
|
||||
return $this->config->get('emailServerAllowedAddressList') ?? [];
|
||||
}
|
||||
|
||||
private function composeErrorMessage(string $host, string $address): string
|
||||
{
|
||||
return "Host '$host' is not allowed as it's internal. " .
|
||||
"To allow, add `$address` to the config parameter `emailServerAllowedAddressList`.";
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user