paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

invitations: Change rate limiting to use invites_sent::day.

Browse Source 
[greg: small tweaks]
This commit is contained in:
Rishi Gupta
2017-12-05 12:39:45 -08:00
committed by Greg Price
parent fbd8dde1f8
commit 6787fbd547
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
zerver/lib/actions.py
View File

@@ -10,7 +10,8 @@ from django.utils.html import escape
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.conf import settings from django.conf import settings
from django.core import validators from django.core import validators
from analytics.lib.counts import COUNT_STATS, do_increment_logging_stat from analytics.lib.counts import COUNT_STATS, do_increment_logging_stat, \
RealmCount
from zerver.lib.bugdown import ( from zerver.lib.bugdown import (
BugdownRenderingException, BugdownRenderingException,
version as bugdown_version, version as bugdown_version,
@@ -77,7 +78,7 @@ from zerver.lib.avatar import avatar_url
from zerver.lib.stream_recipient import StreamRecipientMap from zerver.lib.stream_recipient import StreamRecipientMap
from django.db import transaction, IntegrityError, connection from django.db import transaction, IntegrityError, connection
from django.db.models import F, Q, Max from django.db.models import F, Q, Max, Sum
from django.db.models.query import QuerySet from django.db.models.query import QuerySet
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.mail import EmailMessage from django.core.mail import EmailMessage
@@ -3926,14 +3927,22 @@ class InvitationError(JsonableError):
self.errors = errors # type: List[Tuple[Text, str]] self.errors = errors # type: List[Tuple[Text, str]]
self.sent_invitations = sent_invitations # type: bool self.sent_invitations = sent_invitations # type: bool
def estimate_recent_invites(realm: Realm, *, days: int) -> int:
'''An upper bound on the number of invites sent in the last `days` days'''
recent_invites = RealmCount.objects.filter(
realm=realm,
property='invites_sent::day',
end_time__gte=timezone_now() - datetime.timedelta(days=days)
).aggregate(Sum('value'))['value__sum']
if recent_invites is None:
return 0
return recent_invites
def check_invite_limit(user: UserProfile, num_invitees: int) -> None: def check_invite_limit(user: UserProfile, num_invitees: int) -> None:
# Discourage using invitation emails as a vector for carrying spam
if settings.OPEN_REALM_CREATION: if settings.OPEN_REALM_CREATION:
# Discourage using invitation emails as a vector for carrying spam recent_invites = estimate_recent_invites(user.realm, days=1)
sent_invites = Confirmation.objects.filter( if num_invitees + recent_invites > user.realm.max_invites:
realm=user.realm,
date_sent__gte=timezone_now() - datetime.timedelta(days=1),
type=Confirmation.INVITATION).count()
if num_invitees + sent_invites > user.realm.max_invites:
raise InvitationError( raise InvitationError(
_("You do not have enough remaining invites. " _("You do not have enough remaining invites. "
"Please contact %s to have your limit raised. " "Please contact %s to have your limit raised. "