';
if ($this->title) {
@@ -45,7 +47,7 @@ final class NotificationMessage extends MessageBase
}
if (!empty($this->description)) {
- $message .= '
' . implode('
', $this->description) . '
';
+ $message .= '
' . $this->getDescription($formatter) . '
';
}
if (!empty($this->footer)) {
@@ -57,6 +59,17 @@ final class NotificationMessage extends MessageBase
return $message;
}
+ /**
+ * @param FormatterInterface $formatter
+ * @param bool $translate
+ *
+ * @return string
+ */
+ public function getDescription(FormatterInterface $formatter, $translate = false): string
+ {
+ return $formatter->formatDescription($this->description, $translate);
+ }
+
/**
* Componer un mensaje en formato texto
*
diff --git a/lib/SP/Core/Messages/TextFormatter.php b/lib/SP/Core/Messages/TextFormatter.php
new file mode 100644
index 00000000..ff9eaa90
--- /dev/null
+++ b/lib/SP/Core/Messages/TextFormatter.php
@@ -0,0 +1,83 @@
+.
+ */
+
+namespace SP\Core\Messages;
+
+/**
+ * Class TextFormatter
+ *
+ * @package SP\Core\Messages
+ */
+final class TextFormatter implements FormatterInterface
+{
+ /**
+ * @var string
+ */
+ private $delimiter;
+
+ /**
+ * TextFormatter constructor.
+ *
+ * @param string $delimiter
+ */
+ public function __construct($delimiter = PHP_EOL)
+ {
+ $this->delimiter = $delimiter;
+ }
+
+ /**
+ * @param array $text
+ * @param bool $translate
+ *
+ * @return string
+ */
+ public function formatDetail(array $text, bool $translate = false): string
+ {
+ return implode(
+ $this->delimiter,
+ array_map(function ($value) use ($translate) {
+ return sprintf(
+ '%s: %s',
+ $translate ? __($value[0]) : $value[0]
+ , $translate ? __($value[1]) : $value[1]
+ );
+ }, $text));
+
+ }
+
+ /**
+ * @param array $text
+ * @param bool $translate
+ *
+ * @return string
+ */
+ public function formatDescription(array $text, bool $translate = false): string
+ {
+ if ($translate === true) {
+ return implode($this->delimiter, array_map('__', $text));
+ }
+
+ return implode($this->delimiter, $text);
+ }
+}
\ No newline at end of file
diff --git a/lib/SP/Core/ModuleBase.php b/lib/SP/Core/ModuleBase.php
index f161751a..abceb907 100644
--- a/lib/SP/Core/ModuleBase.php
+++ b/lib/SP/Core/ModuleBase.php
@@ -32,6 +32,7 @@ use SP\Config\Config;
use SP\Core\Context\ContextInterface;
use SP\Core\Events\EventDispatcher;
use SP\Http\Request;
+use SP\Providers\Acl\AclHandler;
use SP\Providers\Log\DatabaseLogHandler;
use SP\Providers\Log\FileLogHandler;
use SP\Providers\Log\RemoteSyslogHandler;
@@ -144,6 +145,7 @@ abstract class ModuleBase
$eventDispatcher->attach($this->container->get(RemoteSyslogHandler::class));
}
+ $eventDispatcher->attach($this->container->get(AclHandler::class));
$eventDispatcher->attach($this->container->get(NotificationHandler::class));
}
}
\ No newline at end of file
diff --git a/lib/SP/DataModel/NotificationData.php b/lib/SP/DataModel/NotificationData.php
index eea184eb..a60d6347 100644
--- a/lib/SP/DataModel/NotificationData.php
+++ b/lib/SP/DataModel/NotificationData.php
@@ -128,10 +128,15 @@ class NotificationData implements DataModelInterface
/**
* @param MessageInterface $message
+ * @param bool $useHtml
*/
- public function setDescription(MessageInterface $message)
+ public function setDescription(MessageInterface $message, bool $useHtml = false)
{
- $this->description = $message->composeText();
+ if ($useHtml) {
+ $this->description = $message->composeHtml();
+ } else {
+ $this->description = $message->composeText();
+ }
}
/**
diff --git a/lib/SP/Html/Html.php b/lib/SP/Html/Html.php
index ac054586..2ae67496 100644
--- a/lib/SP/Html/Html.php
+++ b/lib/SP/Html/Html.php
@@ -159,4 +159,21 @@ final class Html
return sprintf('
%s', $alink, $atitle, $attribs, $text);
}
+
+ /**
+ * Strips out HTML tags preserving some spaces
+ *
+ * @param $text
+ *
+ * @return string
+ */
+ public static function stripTags(string $text): string
+ {
+ if (empty($text)) {
+ return $text;
+ }
+
+ // Replace tags, then new lines, tabs and return chars, and then 2 or more spaces
+ return trim(preg_replace(['/<[^>]*>/', '/[\n\t\r]+/', '/\s{2,}/'], ' ', $text));
+ }
}
diff --git a/lib/SP/Http/Request.php b/lib/SP/Http/Request.php
index 14a55581..a552d338 100644
--- a/lib/SP/Http/Request.php
+++ b/lib/SP/Http/Request.php
@@ -96,7 +96,7 @@ final class Request
*/
private function detectHttps()
{
- $this->https = ($this->request->server()->exists('HTTPS') && $this->request->server()->get('HTTPS') !== 'off')
+ $this->https = Util::boolval($this->request->server()->get('HTTPS', 'off'))
|| $this->request->server()->get('SERVER_PORT', 0) === 443;
}
diff --git a/lib/SP/Providers/Acl/AclHandler.php b/lib/SP/Providers/Acl/AclHandler.php
new file mode 100644
index 00000000..65c5df7a
--- /dev/null
+++ b/lib/SP/Providers/Acl/AclHandler.php
@@ -0,0 +1,189 @@
+.
+ */
+
+namespace SP\Providers\Acl;
+
+use DI\Container;
+use Psr\Container\ContainerInterface;
+use SP\Core\Events\Event;
+use SP\Core\Events\EventReceiver;
+use SP\Providers\EventsTrait;
+use SP\Providers\Provider;
+use SP\Services\Account\AccountAclService;
+use SP\Services\UserGroup\UserGroupService;
+use SP\Services\UserProfile\UserProfileService;
+use SplSubject;
+
+/**
+ * Class AclHandler
+ *
+ * @package SP\Providers\Acl
+ */
+final class AclHandler extends Provider implements EventReceiver
+{
+ use EventsTrait;
+
+ const EVENTS = [
+ 'edit.userProfile',
+ 'edit.user',
+ 'edit.userGroup',
+ 'delete.user',
+ 'delete.user.selection'
+ ];
+
+ /**
+ * @var string
+ */
+ private $events;
+ /**
+ * @var ContainerInterface
+ */
+ private $dic;
+
+ /**
+ * Devuelve los eventos que implementa el observador
+ *
+ * @return array
+ */
+ public function getEvents()
+ {
+ return self::EVENTS;
+ }
+
+ /**
+ * Devuelve los eventos que implementa el observador en formato cadena
+ *
+ * @return string
+ */
+ public function getEventsString()
+ {
+ return $this->events;
+ }
+
+ /**
+ * Receive update from subject
+ *
+ * @link https://php.net/manual/en/splobserver.update.php
+ *
+ * @param SplSubject $subject
+ * The SplSubject notifying the observer of an update.
+ *
+ *
+ * @return void
+ * @since 5.1.0
+ */
+ public function update(SplSubject $subject)
+ {
+ $this->updateEvent('update', new Event($subject));
+ }
+
+ /**
+ * Evento de actualización
+ *
+ * @param string $eventType Nombre del evento
+ * @param Event $event Objeto del evento
+ */
+ public function updateEvent($eventType, Event $event)
+ {
+ switch ($eventType) {
+ case 'edit.userProfile':
+ $this->processUserProfile($event);
+ break;
+ case 'edit.user':
+ case 'delete.user':
+ case 'delete.user.selection':
+ $this->processUser($event);
+ break;
+ case 'edit.userGroup':
+ $this->processUserGroup($event);
+ break;
+ }
+ }
+
+ /**
+ * @param Event $event
+ */
+ private function processUserProfile(Event $event)
+ {
+ try {
+ $eventMessage = $event->getEventMessage();
+ $extra = $eventMessage->getExtra();
+
+ if (isset($extra['userProfileId'])) {
+ $userProfileService = $this->dic->get(UserProfileService::class);
+
+ foreach ($userProfileService->getUsersForProfile($extra['userProfileId'][0]) as $user) {
+ AccountAclService::clearAcl($user->id);
+ }
+ }
+ } catch (\Exception $e) {
+ processException($e);
+ }
+ }
+
+ /**
+ * @param Event $event
+ */
+ private function processUser(Event $event)
+ {
+ $eventMessage = $event->getEventMessage();
+ $extra = $eventMessage->getExtra();
+
+ if (isset($extra['userId'])) {
+ foreach ($extra['userId'] as $id) {
+ AccountAclService::clearAcl($id);
+ }
+ }
+ }
+
+ /**
+ * @param Event $event
+ */
+ private function processUserGroup(Event $event)
+ {
+ try {
+ $eventMessage = $event->getEventMessage();
+ $extra = $eventMessage->getExtra();
+
+ if (isset($extra['userGroupId'])) {
+ $userGroupService = $this->dic->get(UserGroupService::class);
+
+ foreach ($userGroupService->getUsageByUsers($extra['userGroupId'][0]) as $user) {
+ AccountAclService::clearAcl($user->id);
+ }
+ }
+ } catch (\Exception $e) {
+ processException($e);
+ }
+ }
+
+ /**
+ * @param Container $dic
+ */
+ protected function initialize(Container $dic)
+ {
+ $this->dic = $dic;
+ $this->events = $this->parseEventsToRegex(self::EVENTS);
+ }
+}
\ No newline at end of file
diff --git a/lib/SP/Providers/Mail/MailHandler.php b/lib/SP/Providers/Mail/MailHandler.php
index ff3789cb..946f37d6 100644
--- a/lib/SP/Providers/Mail/MailHandler.php
+++ b/lib/SP/Providers/Mail/MailHandler.php
@@ -28,6 +28,7 @@ use DI\Container;
use SP\Core\Events\Event;
use SP\Core\Events\EventReceiver;
use SP\Core\Messages\MailMessage;
+use SP\Core\Messages\TextFormatter;
use SP\Http\Request;
use SP\Providers\EventsTrait;
use SP\Providers\Provider;
@@ -124,7 +125,10 @@ final class MailHandler extends Provider implements EventReceiver
$mailMessage->addDescription(sprintf(__('Performed by: %s (%s)'), $userData->getName(), $userData->getLogin()));
$mailMessage->addDescription(sprintf(__('IP Address: %s'), $this->request->getClientAddress(true)));
- $this->mailService->send($eventMessage->getDescription(true), $configData->getMailFrom(), $mailMessage);
+ $this->mailService->send(
+ $eventMessage->getDescription(new TextFormatter(), true),
+ $configData->getMailFrom(), $mailMessage
+ );
} catch (\Exception $e) {
processException($e);
}
diff --git a/lib/SP/Providers/Notification/NotificationHandler.php b/lib/SP/Providers/Notification/NotificationHandler.php
index efd17c66..dbb3574c 100644
--- a/lib/SP/Providers/Notification/NotificationHandler.php
+++ b/lib/SP/Providers/Notification/NotificationHandler.php
@@ -117,7 +117,7 @@ final class NotificationHandler extends Provider implements EventReceiver
private function requestAccountNotification(Event $event)
{
$eventMessage = $event->getEventMessage();
- $data = $eventMessage->getData();
+ $data = $eventMessage->getExtra();
foreach ($data['userId'] as $userId) {
$notificationData = new NotificationData();
@@ -148,14 +148,14 @@ final class NotificationHandler extends Provider implements EventReceiver
private function showAccountLinkNotification(Event $event)
{
$eventMessage = $event->getEventMessage();
- $data = $eventMessage->getData();
+ $data = $eventMessage->getExtra();
if ($data['notify'][0] === true) {
$notificationData = new NotificationData();
$notificationData->setType(__('Notification'));
$notificationData->setComponent(__('Accounts'));
- $notificationData->setUserId($data['userId']);
- $notificationData->setDescription($eventMessage);
+ $notificationData->setUserId($data['userId'][0]);
+ $notificationData->setDescription($eventMessage, true);
$this->notify($notificationData);
}
diff --git a/lib/SP/Repositories/UserProfile/UserProfileRepository.php b/lib/SP/Repositories/UserProfile/UserProfileRepository.php
index 91fd16d6..68f462e9 100644
--- a/lib/SP/Repositories/UserProfile/UserProfileRepository.php
+++ b/lib/SP/Repositories/UserProfile/UserProfileRepository.php
@@ -56,7 +56,7 @@ final class UserProfileRepository extends Repository implements RepositoryItemIn
public function getUsersForProfile($id)
{
$queryData = new QueryData();
- $queryData->setQuery('SELECT login FROM User WHERE userProfileId = ?');
+ $queryData->setQuery('SELECT id, login FROM User WHERE userProfileId = ?');
$queryData->addParam($id);
return $this->db->doSelect($queryData);
diff --git a/lib/SP/Services/Account/AccountAclService.php b/lib/SP/Services/Account/AccountAclService.php
index 5d8d702c..12165614 100644
--- a/lib/SP/Services/Account/AccountAclService.php
+++ b/lib/SP/Services/Account/AccountAclService.php
@@ -74,7 +74,7 @@ final class AccountAclService extends Service
*/
public static function clearAcl($userId)
{
- logger(__FUNCTION__);
+ logger(sprintf('Clearing ACL for user ID: %d', $userId));
try {
if (FileUtil::rmdir_recursive(self::ACL_PATH . $userId) === false) {
diff --git a/lib/SP/Services/Install/Installer.php b/lib/SP/Services/Install/Installer.php
index 56712a85..1f063502 100644
--- a/lib/SP/Services/Install/Installer.php
+++ b/lib/SP/Services/Install/Installer.php
@@ -56,8 +56,8 @@ final class Installer extends Service
* sysPass' version and build number
*/
const VERSION = [3, 0, 0];
- const VERSION_TEXT = '3.0-rc2';
- const BUILD = 18111702;
+ const VERSION_TEXT = '3.0-rc3';
+ const BUILD = 18111801;
/**
* @var DatabaseSetupInterface
diff --git a/lib/SP/Services/Upgrade/UpgradeDatabaseService.php b/lib/SP/Services/Upgrade/UpgradeDatabaseService.php
index 9b4ca80c..0171a85d 100644
--- a/lib/SP/Services/Upgrade/UpgradeDatabaseService.php
+++ b/lib/SP/Services/Upgrade/UpgradeDatabaseService.php
@@ -53,7 +53,8 @@ final class UpgradeDatabaseService extends Service implements UpgradeInterface
'300.18083002',
'300.18091101',
'300.18092401',
- '300.18093001'
+ '300.18093001',
+ '300.18111801'
];
/**
diff --git a/lib/SP/Storage/Database/Database.php b/lib/SP/Storage/Database/Database.php
index 032c1a31..cac3c7b5 100644
--- a/lib/SP/Storage/Database/Database.php
+++ b/lib/SP/Storage/Database/Database.php
@@ -348,7 +348,7 @@ final class Database implements DatabaseInterface
$result = $conn->beginTransaction();
$this->eventDispatcher->notifyEvent('database.transaction.begin',
- new Event($this, EventMessage::factory()->addData('result', $result)));
+ new Event($this, EventMessage::factory()->addExtra('result', $result)));
return $result;
} else {
@@ -370,7 +370,7 @@ final class Database implements DatabaseInterface
$result = $conn->inTransaction() && $conn->commit();
$this->eventDispatcher->notifyEvent('database.transaction.end',
- new Event($this, EventMessage::factory()->addData('result', $result)));
+ new Event($this, EventMessage::factory()->addExtra('result', $result)));
return $result;
}
@@ -387,7 +387,7 @@ final class Database implements DatabaseInterface
$result = $conn->inTransaction() && $conn->rollBack();
$this->eventDispatcher->notifyEvent('database.transaction.rollback',
- new Event($this, EventMessage::factory()->addData('result', $result)));
+ new Event($this, EventMessage::factory()->addExtra('result', $result)));
return $result;
}
diff --git a/schemas/30018111801.sql b/schemas/30018111801.sql
new file mode 100644
index 00000000..8ebcf2d5
--- /dev/null
+++ b/schemas/30018111801.sql
@@ -0,0 +1,4 @@
+DELIMITER $$
+
+ALTER TABLE Notification
+ MODIFY description TEXT NOT NULL $$
\ No newline at end of file
diff --git a/schemas/dbstructure.sql b/schemas/dbstructure.sql
index 693c93ed..89b896a4 100644
--- a/schemas/dbstructure.sql
+++ b/schemas/dbstructure.sql
@@ -397,7 +397,7 @@ CREATE TABLE `Notification` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`type` varchar(100) DEFAULT NULL,
`component` varchar(100) NOT NULL,
- `description` varchar(500) NOT NULL,
+ `description` text NOT NULL,
`date` int(10) unsigned NOT NULL,
`checked` tinyint(1) DEFAULT 0,
`userId` smallint(5) unsigned DEFAULT NULL,
diff --git a/tests/SP/Repositories/PublicLinkRepositoryTest.php b/tests/SP/Repositories/PublicLinkRepositoryTest.php
index 46a21752..52ceef63 100644
--- a/tests/SP/Repositories/PublicLinkRepositoryTest.php
+++ b/tests/SP/Repositories/PublicLinkRepositoryTest.php
@@ -184,7 +184,7 @@ class PublicLinkRepositoryTest extends DatabaseTestCase
$this->assertEquals($data->getTypeId(), $resultData->getTypeId());
$this->assertEquals($data->isNotify(), $resultData->isNotify());
$this->assertEquals($data->getDateExpire(), $resultData->getDateExpire());
- $this->assertTrue($data->getDateAdd() >= $resultData->getDateAdd());
+ $this->assertTrue($data->getDateAdd() <= $resultData->getDateAdd());
$this->assertEquals($data->getMaxCountViews(), $resultData->getMaxCountViews());
$this->expectException(DuplicatedItemException::class);
diff --git a/tests/res/config/config.xml b/tests/res/config/config.xml
index 1e832656..53244c27 100644
--- a/tests/res/config/config.xml
+++ b/tests/res/config/config.xml
@@ -9,11 +9,11 @@
1
1
-
f68be1f27b0f34e893513e9444a9a314e5604a09
+
9f46d4211297e5181cd3429f664a764642eb6e89
0
0
-
1542149001
-
e4455b275b1ac0a76319b0a6646815b876ccbb11
+
1542566884
+
4c1542f238fd13ce49f76a40492e0aeb2f366a25
@@ -32,7 +32,7 @@
0
-
befb9c1eeb90e6b9910db818216483b5ea38b214
+
f87c94a0f34f0f305864a68556118f058d3ea842
- PDF
- JPG