Forum, markread: Raise 404, if forum-slug is not found

inyoka/forum/views.py

@@ -21,7 +21,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import F, Q
 from django.http import Http404, HttpResponseRedirect
-from django.shortcuts import redirect
+from django.shortcuts import redirect, get_object_or_404
 from django.utils.text import Truncator
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.views.generic import CreateView, DetailView, UpdateView
@@ -1553,7 +1553,7 @@ def markread(request, slug=None):
         messages.info(request, _('Please login to mark posts as read.'))
         return HttpResponseRedirect(href('forum'))
     if slug:
-        forum = Forum.objects.get(slug=slug)
+        forum = get_object_or_404(Forum, slug=slug)
         forum.mark_read(user)
         user.save()
         messages.success(request,

tests/apps/forum/test_views.py

@@ -1514,3 +1514,54 @@ def test_forum_has_no_welcome_message(self):
             views.WelcomeMessageView.as_view()(request, slug='f-slug-no-welcome')
 
         self.assertFalse(self.forum_no_welcome.welcome_read_users.filter(pk=self.user.pk).exists())
+
+
+class TestMarkRead(TestCase):
+
+    def setUp(self) -> None:
+        super().setUp()
+        self.public_category = Forum.objects.create(name='Public category')
+        self.public_forum = Forum.objects.create(name='Public forum', parent=self.public_category)
+
+        self.user = User.objects.register_user('user', 'user@example.test', 'user', False)
+        registered_group = Group.objects.get(name=settings.INYOKA_REGISTERED_GROUP_NAME)
+        assign_perm('forum.view_forum', registered_group, self.public_category)
+        assign_perm('forum.view_forum', registered_group, self.public_forum)
+
+        topic = Topic.objects.create(title='A test Topic', author=self.user, forum=self.public_forum)
+        Post.objects.create(text='Post 1', author=self.user, topic=topic, position=0)
+
+        self.client.defaults['HTTP_HOST'] = 'forum.%s' % settings.BASE_DOMAIN_NAME
+
+    def test_anonymous(self):
+        url = self.public_forum.get_absolute_url('markread')
+        response = self.client.get(url, follow=True)
+
+        self.assertRedirects(response, href('forum'))
+        self.assertContains(response, 'Please login to mark posts as read.')
+
+    def test_mark_all_as_read(self):
+        self.client.force_login(user=self.user)
+
+        url = href('forum', 'markread')
+        response = self.client.get(url, follow=True)
+
+        self.assertRedirects(response, href('forum'))
+        self.assertContains(response, 'All forums were marked as read.')
+
+    def test_mark_one_forum(self):
+        self.client.force_login(user=self.user)
+
+        url = self.public_forum.get_absolute_url('markread')
+        response = self.client.get(url, follow=True)
+
+        self.assertRedirects(response, url_for(self.public_forum))
+        self.assertContains(response, 'The forum “{}” was marked as read.'.format(self.public_forum.name))
+
+    def test_no_existing_forum(self):
+        self.client.force_login(user=self.user)
+
+        url = href('forum', 'forum', 'does_not_exist', 'markread')
+        response = self.client.get(url, follow=True)
+
+        self.assertEqual(response.status_code, 404)