paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

archive: Use access_web_public_stream helper.

Browse Source 
This is just a refactor to delete potentially security-sensitive
duplicated code.
This commit is contained in:
Tim Abbott
2021-04-09 12:40:30 -07:00
committed by Alex Vandiver
parent 3ba8348c51
commit 7856098bdb
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/views/archive.py
View File

@@ -7,7 +7,7 @@ from django.template import loader
from zerver.lib.avatar import get_gravatar_url from zerver.lib.avatar import get_gravatar_url
from zerver.lib.exceptions import JsonableError from zerver.lib.exceptions import JsonableError
from zerver.lib.response import json_success from zerver.lib.response import json_success
from zerver.lib.streams import get_stream_by_id from zerver.lib.streams import access_web_public_stream
from zerver.lib.timestamp import datetime_to_timestamp from zerver.lib.timestamp import datetime_to_timestamp
from zerver.lib.topic import get_topic_history_for_public_stream, messages_for_topic from zerver.lib.topic import get_topic_history_for_public_stream, messages_for_topic
from zerver.models import Message, UserProfile from zerver.models import Message, UserProfile
@@ -29,13 +29,10 @@ def archive(request: HttpRequest, stream_id: int, topic_name: str) -> HttpRespon
) )
try: try:
stream = get_stream_by_id(stream_id) stream = access_web_public_stream(stream_id, request.realm)
except JsonableError: except JsonableError:
return get_response([], False, "") return get_response([], False, "")
if not stream.is_web_public:
return get_response([], False, "")
all_messages = list( all_messages = list(
messages_for_topic( messages_for_topic(
stream_recipient_id=stream.recipient_id, stream_recipient_id=stream.recipient_id,
@@ -78,13 +75,10 @@ def archive(request: HttpRequest, stream_id: int, topic_name: str) -> HttpRespon
def get_web_public_topics_backend(request: HttpRequest, stream_id: int) -> HttpResponse: def get_web_public_topics_backend(request: HttpRequest, stream_id: int) -> HttpResponse:
try: try:
stream = get_stream_by_id(stream_id) stream = access_web_public_stream(stream_id, request.realm)
except JsonableError: except JsonableError:
return json_success(dict(topics=[])) return json_success(dict(topics=[]))
if not stream.is_web_public:
return json_success(dict(topics=[]))
result = get_topic_history_for_public_stream(recipient_id=stream.recipient_id) result = get_topic_history_for_public_stream(recipient_id=stream.recipient_id)
return json_success(dict(topics=result)) return json_success(dict(topics=result))