mirror of
https://github.com/zulip/zulip.git
synced 2025-11-05 06:23:38 +00:00
stream: Add entropy to deactivated streams.
Adding an additional `!` to the stream name each time a stream is deactivated, to a maximum of 21 times, effectively limits number of times a stream with a given name can be deactivated. This is unlikely to come up in common usage, but may be confusing when testing. Change what we prepend to deactivated stream names to something with more entropy than just `!`, by instead prepending a substring of hash of the stream's ID. `!`s. Using 128 bits of the hash means that it will require more than 10^18th renames to have a 1% chance of collision. Because too-long stream names are also truncated at 60 characters, having this entropy in the beginning of the name also helps address potential issues from stream names that differed only in, e.g. the 60th character. Fixes #17016.
This commit is contained in:
committed by
Alex Vandiver
parent
f19c7a2f69
commit
1b6f68bb59
@@ -1,4 +1,5 @@
|
||||
import datetime
|
||||
import hashlib
|
||||
import itertools
|
||||
import logging
|
||||
import os
|
||||
@@ -232,7 +233,6 @@ from zerver.models import (
|
||||
is_cross_realm_bot_email,
|
||||
query_for_ids,
|
||||
realm_filters_for_realm,
|
||||
stream_name_in_use,
|
||||
validate_attachment_request,
|
||||
)
|
||||
from zerver.tornado.django_api import send_event
|
||||
@@ -1237,17 +1237,13 @@ def do_deactivate_stream(
|
||||
# special prefix that both indicates that the stream is deactivated and
|
||||
# frees up the original name for reuse.
|
||||
old_name = stream.name
|
||||
new_name = ("!DEACTIVATED:" + old_name)[: Stream.MAX_NAME_LENGTH]
|
||||
for i in range(20):
|
||||
if stream_name_in_use(new_name, stream.realm_id):
|
||||
# This stream has already been deactivated, keep prepending !s until
|
||||
# we have a unique stream name or you've hit a rename limit.
|
||||
new_name = ("!" + new_name)[: Stream.MAX_NAME_LENGTH]
|
||||
else:
|
||||
break
|
||||
|
||||
# If you don't have a unique name at this point, this will fail later in the
|
||||
# code path.
|
||||
# Prepend a substring of the hashed stream ID to the new stream name
|
||||
streamID = str(stream.id)
|
||||
stream_id_hash_object = hashlib.sha512(streamID.encode("utf-8"))
|
||||
hashed_stream_id = stream_id_hash_object.hexdigest()[0:7]
|
||||
|
||||
new_name = (hashed_stream_id + "!DEACTIVATED:" + old_name)[: Stream.MAX_NAME_LENGTH]
|
||||
|
||||
stream.name = new_name[: Stream.MAX_NAME_LENGTH]
|
||||
stream.save(update_fields=["name", "deactivated", "invite_only"])
|
||||
|
||||
Reference in New Issue
Block a user