File size: 7,591 Bytes
5fcd275 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 | diff --git a/framework/core/src/Notification/NotificationSyncer.php b/framework/core/src/Notification/NotificationSyncer.php
index 18d845a8de9..752538cab54 100644
--- a/framework/core/src/Notification/NotificationSyncer.php
+++ b/framework/core/src/Notification/NotificationSyncer.php
@@ -9,6 +9,7 @@
namespace Flarum\Notification;
+use Flarum\Database\AbstractModel;
use Flarum\Notification\Blueprint\BlueprintInterface;
use Flarum\Notification\Driver\NotificationDriverInterface;
use Flarum\User\User;
@@ -74,6 +75,12 @@ public function sync(Blueprint\BlueprintInterface $blueprint, array $users)
continue;
}
+ // To add access checking on notification subjects, we first attempt
+ // to load visible subjects to this user.
+ if (! $this->userCanSeeSubject($user, $blueprint->getSubject())) {
+ continue;
+ }
+
$existing = $toDelete->first(function ($notification) use ($user) {
return $notification->user_id === $user->id;
});
@@ -161,6 +168,18 @@ protected function setDeleted(array $ids, $isDeleted)
Notification::whereIn('id', $ids)->update(['is_deleted' => $isDeleted]);
}
+ /**
+ * Check access to determine if the recipient is allowed to receive the notification.
+ */
+ protected function userCanSeeSubject(User $user, ?AbstractModel $subject): bool
+ {
+ if ($subject && method_exists($subject, 'registerVisibilityScoper')) {
+ return (bool) $subject->newQuery()->whereVisibleTo($user)->find($subject->id);
+ }
+
+ return true;
+ }
+
/**
* Adds a notification driver to the list.
*
diff --git a/framework/core/tests/integration/notification/NotificationSyncerTest.php b/framework/core/tests/integration/notification/NotificationSyncerTest.php
new file mode 100644
index 00000000000..635a93770c5
--- /dev/null
+++ b/framework/core/tests/integration/notification/NotificationSyncerTest.php
@@ -0,0 +1,169 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Tests\integration\notification;
+
+use Carbon\Carbon;
+use Flarum\Api\Serializer\BasicDiscussionSerializer;
+use Flarum\Api\Serializer\BasicPostSerializer;
+use Flarum\Database\AbstractModel;
+use Flarum\Discussion\Discussion;
+use Flarum\Extend;
+use Flarum\Notification\Blueprint\BlueprintInterface;
+use Flarum\Notification\Notification;
+use Flarum\Notification\NotificationSyncer;
+use Flarum\Post\Post;
+use Flarum\Testing\integration\RetrievesAuthorizedUsers;
+use Flarum\Testing\integration\TestCase;
+use Flarum\User\User;
+
+class NotificationSyncerTest extends TestCase
+{
+ use RetrievesAuthorizedUsers;
+
+ protected function setUp(): void
+ {
+ parent::setUp();
+
+ $this->prepareDatabase([
+ 'users' => [
+ $this->normalUser(),
+ ['id' => 3, 'username' => 'Receiver', 'email' => 'receiver@machine.local', 'is_email_confirmed' => 1],
+ ],
+ 'discussions' => [
+ ['id' => 1, 'title' => 'Public discussion', 'created_at' => Carbon::parse('2021-11-01 13:00:00')->toDateTimeString(), 'user_id' => 2, 'first_post_id' => 1, 'comment_count' => 2, 'is_private' => 0, 'last_post_number' => 2],
+
+ ['id' => 2, 'title' => 'Private discussion', 'created_at' => Carbon::parse('2021-11-01 13:00:00')->toDateTimeString(), 'user_id' => 2, 'first_post_id' => 3, 'comment_count' => 2, 'is_private' => 1, 'last_post_number' => 2],
+ ],
+ 'posts' => [
+ ['id' => 1, 'discussion_id' => 1, 'number' => 1, 'created_at' => Carbon::parse('2021-11-01 13:00:00')->toDateTimeString(), 'user_id' => 2, 'type' => 'comment', 'content' => '<t></t>', 'is_private' => 0],
+ ['id' => 2, 'discussion_id' => 1, 'number' => 2, 'created_at' => Carbon::parse('2021-11-01 13:00:03')->toDateTimeString(), 'user_id' => 2, 'type' => 'comment', 'content' => '<t></t>', 'is_private' => 1],
+
+ ['id' => 3, 'discussion_id' => 2, 'number' => 1, 'created_at' => Carbon::parse('2021-11-01 13:00:00')->toDateTimeString(), 'user_id' => 2, 'type' => 'comment', 'content' => '<t></t>', 'is_private' => 0],
+ ],
+ ]);
+ }
+
+ /**
+ * @dataProvider visibleSubjectsProvider
+ * @param class-string<AbstractModel> $subjectClass
+ * @test
+ */
+ public function can_receive_notification_for_visible_subjects(string $subjectClass, int $subjectId, string $serializer)
+ {
+ $this->expect_notification_count_from_sending_notification_type_with_subject(
+ 2,
+ $subjectClass,
+ $subjectId,
+ $serializer
+ );
+ }
+
+
+ /**
+ * @dataProvider invisibleSubjectsProvider
+ * @test
+ */
+ public function cannot_receive_notification_for_restricted_subjects(string $subjectClass, int $subjectId, string $serializer)
+ {
+ $this->expect_notification_count_from_sending_notification_type_with_subject(
+ 0,
+ $subjectClass,
+ $subjectId,
+ $serializer
+ );
+ }
+
+ /**
+ * @param class-string<AbstractModel> $subjectClass
+ */
+ protected function expect_notification_count_from_sending_notification_type_with_subject(int $count, string $subjectClass, int $subjectId, string $serializer)
+ {
+ CustomNotificationType::$subjectModel = $subjectClass;
+
+ $this->extend(
+ (new Extend\Notification())
+ ->type(CustomNotificationType::class, $serializer, ['alert'])
+ );
+
+ /** @var NotificationSyncer $syncer */
+ $syncer = $this->app()->getContainer()->make(NotificationSyncer::class);
+
+ $subject = $subjectClass::query()->find($subjectId);
+
+ $syncer->sync(
+ $blueprint = new CustomNotificationType($subject),
+ User::query()
+ ->whereIn('id', [1, 3])
+ ->get()
+ ->all()
+ );
+
+ $this->assertEquals(
+ $count,
+ Notification::query()
+ ->matchingBlueprint($blueprint)
+ ->whereSubject($subject)
+ ->count()
+ );
+ }
+
+ protected function visibleSubjectsProvider()
+ {
+ return [
+ [Post::class, 1, BasicPostSerializer::class],
+ [Discussion::class, 1, BasicDiscussionSerializer::class],
+ ];
+ }
+
+ protected function invisibleSubjectsProvider()
+ {
+ return [
+ [Post::class, 2, BasicPostSerializer::class],
+ [Discussion::class, 2, BasicDiscussionSerializer::class],
+ [Post::class, 3, BasicPostSerializer::class],
+ ];
+ }
+}
+
+class CustomNotificationType implements BlueprintInterface
+{
+ protected $subject;
+ public static $subjectModel;
+
+ public function __construct($subject)
+ {
+ $this->subject = $subject;
+ }
+
+ public function getFromUser()
+ {
+ return null;
+ }
+
+ public function getSubject()
+ {
+ return $this->subject;
+ }
+
+ public function getData()
+ {
+ return [];
+ }
+
+ public static function getType()
+ {
+ return 'customNotificationType';
+ }
+
+ public static function getSubjectModel()
+ {
+ return self::$subjectModel;
+ }
+}
|