mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-28 13:11:56 +00:00
as_user->app_service, less redundant comments, better positioned comments
This commit is contained in:
parent
8bfd01f619
commit
f09db236b1
@ -603,11 +603,11 @@ class Auth(object):
|
|||||||
"""
|
"""
|
||||||
# Can optionally look elsewhere in the request (e.g. headers)
|
# Can optionally look elsewhere in the request (e.g. headers)
|
||||||
try:
|
try:
|
||||||
user_id, as_user = yield self._get_appservice_user_id(request)
|
user_id, app_service = yield self._get_appservice_user_id(request)
|
||||||
if user_id:
|
if user_id:
|
||||||
request.authenticated_entity = user_id
|
request.authenticated_entity = user_id
|
||||||
defer.returnValue(
|
defer.returnValue(
|
||||||
synapse.types.create_requester(user_id, as_user=as_user)
|
synapse.types.create_requester(user_id, app_service=app_service)
|
||||||
)
|
)
|
||||||
|
|
||||||
access_token = get_access_token_from_request(
|
access_token = get_access_token_from_request(
|
||||||
@ -646,7 +646,7 @@ class Auth(object):
|
|||||||
request.authenticated_entity = user.to_string()
|
request.authenticated_entity = user.to_string()
|
||||||
|
|
||||||
defer.returnValue(synapse.types.create_requester(
|
defer.returnValue(synapse.types.create_requester(
|
||||||
user, token_id, is_guest, device_id, as_user=as_user))
|
user, token_id, is_guest, device_id, app_service=app_service))
|
||||||
except KeyError:
|
except KeyError:
|
||||||
raise AuthError(
|
raise AuthError(
|
||||||
self.TOKEN_NOT_FOUND_HTTP_STATUS, "Missing access token.",
|
self.TOKEN_NOT_FOUND_HTTP_STATUS, "Missing access token.",
|
||||||
|
@ -57,17 +57,14 @@ class BaseHandler(object):
|
|||||||
time_now = self.clock.time()
|
time_now = self.clock.time()
|
||||||
user_id = requester.user.to_string()
|
user_id = requester.user.to_string()
|
||||||
|
|
||||||
# Disable rate limiting of users belonging to any AS that is configured
|
|
||||||
# not to be rate limited in its registration file (rate_limited: true|false).
|
|
||||||
# The AS user itself is never rate limited.
|
# The AS user itself is never rate limited.
|
||||||
|
|
||||||
app_service = self.store.get_app_service_by_user_id(user_id)
|
app_service = self.store.get_app_service_by_user_id(user_id)
|
||||||
if app_service is not None:
|
if app_service is not None:
|
||||||
return # do not ratelimit app service senders
|
return # do not ratelimit app service senders
|
||||||
|
|
||||||
if requester.as_user and not requester.as_user.is_rate_limited():
|
# Disable rate limiting of users belonging to any AS that is configured
|
||||||
# do not ratelimit users of which a non-rate-limited AS is
|
# not to be rate limited in its registration file (rate_limited: true|false).
|
||||||
# acting on behalf
|
if requester.app_service and not requester.app_service.is_rate_limited():
|
||||||
return
|
return
|
||||||
|
|
||||||
allowed, time_allowed = self.ratelimiter.send_message(
|
allowed, time_allowed = self.ratelimiter.send_message(
|
||||||
|
@ -19,7 +19,7 @@ from collections import namedtuple
|
|||||||
|
|
||||||
|
|
||||||
Requester = namedtuple("Requester",
|
Requester = namedtuple("Requester",
|
||||||
["user", "access_token_id", "is_guest", "device_id", "as_user"])
|
["user", "access_token_id", "is_guest", "device_id", "app_service"])
|
||||||
"""
|
"""
|
||||||
Represents the user making a request
|
Represents the user making a request
|
||||||
|
|
||||||
@ -29,12 +29,12 @@ Attributes:
|
|||||||
request, or None if it came via the appservice API or similar
|
request, or None if it came via the appservice API or similar
|
||||||
is_guest (bool): True if the user making this request is a guest user
|
is_guest (bool): True if the user making this request is a guest user
|
||||||
device_id (str|None): device_id which was set at authentication time
|
device_id (str|None): device_id which was set at authentication time
|
||||||
as_user (ApplicationService|None): the AS requesting on behalf of the user
|
app_service (ApplicationService|None): the AS requesting on behalf of the user
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
def create_requester(user_id, access_token_id=None, is_guest=False,
|
def create_requester(user_id, access_token_id=None, is_guest=False,
|
||||||
device_id=None, as_user=None):
|
device_id=None, app_service=None):
|
||||||
"""
|
"""
|
||||||
Create a new ``Requester`` object
|
Create a new ``Requester`` object
|
||||||
|
|
||||||
@ -44,14 +44,14 @@ def create_requester(user_id, access_token_id=None, is_guest=False,
|
|||||||
request, or None if it came via the appservice API or similar
|
request, or None if it came via the appservice API or similar
|
||||||
is_guest (bool): True if the user making this request is a guest user
|
is_guest (bool): True if the user making this request is a guest user
|
||||||
device_id (str|None): device_id which was set at authentication time
|
device_id (str|None): device_id which was set at authentication time
|
||||||
as_user (ApplicationService|None): the AS requesting on behalf of the user
|
app_service (ApplicationService|None): the AS requesting on behalf of the user
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Requester
|
Requester
|
||||||
"""
|
"""
|
||||||
if not isinstance(user_id, UserID):
|
if not isinstance(user_id, UserID):
|
||||||
user_id = UserID.from_string(user_id)
|
user_id = UserID.from_string(user_id)
|
||||||
return Requester(user_id, access_token_id, is_guest, device_id, as_user)
|
return Requester(user_id, access_token_id, is_guest, device_id, app_service)
|
||||||
|
|
||||||
|
|
||||||
def get_domain_from_id(string):
|
def get_domain_from_id(string):
|
||||||
|
Loading…
Reference in New Issue
Block a user