mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-12-21 21:35:14 -05:00
Add unknown room alias check. Call it from directory_handler.get_association
This commit is contained in:
parent
f0c730252f
commit
b932600653
synapse/handlers
@ -62,27 +62,6 @@ class ApplicationServicesHandler(object):
|
|||||||
logger.info("Unregister as_token=%s", token)
|
logger.info("Unregister as_token=%s", token)
|
||||||
yield self.store.unregister_app_service(token)
|
yield self.store.unregister_app_service(token)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
|
||||||
def get_services_for_event(self, event, restrict_to=""):
|
|
||||||
"""Retrieve a list of application services interested in this event.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
event(Event): The event to check.
|
|
||||||
restrict_to(str): The namespace to restrict regex tests to.
|
|
||||||
Returns:
|
|
||||||
list<ApplicationService>: A list of services interested in this
|
|
||||||
event based on the service regex.
|
|
||||||
"""
|
|
||||||
# We need to know the aliases associated with this event.room_id, if any
|
|
||||||
alias_list = yield self.store.get_aliases_for_room(event.room_id)
|
|
||||||
services = yield self.store.get_app_services()
|
|
||||||
interested_list = [
|
|
||||||
s for s in services if (
|
|
||||||
s.is_interested(event, restrict_to, alias_list)
|
|
||||||
)
|
|
||||||
]
|
|
||||||
defer.returnValue(interested_list)
|
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def notify_interested_services(self, event):
|
def notify_interested_services(self, event):
|
||||||
"""Notifies (pushes) all application services interested in this event.
|
"""Notifies (pushes) all application services interested in this event.
|
||||||
@ -94,7 +73,7 @@ class ApplicationServicesHandler(object):
|
|||||||
event(Event): The event to push out to interested services.
|
event(Event): The event to push out to interested services.
|
||||||
"""
|
"""
|
||||||
# Gather interested services
|
# Gather interested services
|
||||||
services = yield self.get_services_for_event(event)
|
services = yield self._get_services_for_event(event)
|
||||||
if len(services) == 0:
|
if len(services) == 0:
|
||||||
return # no services need notifying
|
return # no services need notifying
|
||||||
|
|
||||||
@ -102,7 +81,7 @@ class ApplicationServicesHandler(object):
|
|||||||
# all services which match that user regex.
|
# all services which match that user regex.
|
||||||
unknown_user = yield self._is_unknown_user(event.sender)
|
unknown_user = yield self._is_unknown_user(event.sender)
|
||||||
if unknown_user:
|
if unknown_user:
|
||||||
user_query_services = yield self.get_services_for_event(
|
user_query_services = yield self._get_services_for_event(
|
||||||
event=event,
|
event=event,
|
||||||
restrict_to=ApplicationService.NS_USERS
|
restrict_to=ApplicationService.NS_USERS
|
||||||
)
|
)
|
||||||
@ -115,28 +94,62 @@ class ApplicationServicesHandler(object):
|
|||||||
# the user exists now,so don't query more ASes.
|
# the user exists now,so don't query more ASes.
|
||||||
break
|
break
|
||||||
|
|
||||||
# Do we know this room alias exists? If not, poke the room alias query
|
|
||||||
# API for all services which match that room alias regex.
|
|
||||||
unknown_room_alias = False # TODO
|
|
||||||
if unknown_room_alias:
|
|
||||||
alias = "something" # TODO
|
|
||||||
alias_query_services = yield self.get_services_for_event(
|
|
||||||
event=event,
|
|
||||||
restrict_to=ApplicationService.NS_ALIASES
|
|
||||||
)
|
|
||||||
for alias_service in alias_query_services:
|
|
||||||
# this needs to block XXX: Need to feed response back to caller
|
|
||||||
is_known_alias = yield self.appservice_api.query_alias(
|
|
||||||
alias_service, alias
|
|
||||||
)
|
|
||||||
if is_known_alias:
|
|
||||||
# the alias exists now so don't query more ASes.
|
|
||||||
break
|
|
||||||
|
|
||||||
# Fork off pushes to these services - XXX First cut, best effort
|
# Fork off pushes to these services - XXX First cut, best effort
|
||||||
for service in services:
|
for service in services:
|
||||||
self.appservice_api.push(service, event)
|
self.appservice_api.push(service, event)
|
||||||
|
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def query_room_alias_exists(self, room_alias):
|
||||||
|
"""Check if an application service knows this room alias exists.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
room_alias(str): The room alias to query.
|
||||||
|
Returns:
|
||||||
|
namedtuple: with keys "room_id" and "servers" or None if no
|
||||||
|
association can be found.
|
||||||
|
"""
|
||||||
|
alias_query_services = yield self._get_services_for_event(
|
||||||
|
event=None,
|
||||||
|
restrict_to=ApplicationService.NS_ALIASES,
|
||||||
|
alias_list=[room_alias]
|
||||||
|
)
|
||||||
|
for alias_service in alias_query_services:
|
||||||
|
is_known_alias = yield self.appservice_api.query_alias(
|
||||||
|
alias_service, room_alias
|
||||||
|
)
|
||||||
|
if is_known_alias:
|
||||||
|
# the alias exists now so don't query more ASes.
|
||||||
|
result = yield self.store.get_association_from_room_alias(
|
||||||
|
room_alias
|
||||||
|
)
|
||||||
|
defer.returnValue(result)
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def _get_services_for_event(self, event, restrict_to="", alias_list=None):
|
||||||
|
"""Retrieve a list of application services interested in this event.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
event(Event): The event to check. Can be None if alias_list is not.
|
||||||
|
restrict_to(str): The namespace to restrict regex tests to.
|
||||||
|
alias_list: A list of aliases to get services for. If None, this
|
||||||
|
list is obtained from the database.
|
||||||
|
Returns:
|
||||||
|
list<ApplicationService>: A list of services interested in this
|
||||||
|
event based on the service regex.
|
||||||
|
"""
|
||||||
|
# We need to know the aliases associated with this event.room_id, if any
|
||||||
|
if not alias_list:
|
||||||
|
alias_list = yield self.store.get_aliases_for_room(event.room_id)
|
||||||
|
|
||||||
|
services = yield self.store.get_app_services()
|
||||||
|
interested_list = [
|
||||||
|
s for s in services if (
|
||||||
|
s.is_interested(event, restrict_to, alias_list)
|
||||||
|
)
|
||||||
|
]
|
||||||
|
defer.returnValue(interested_list)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def _is_unknown_user(self, user_id):
|
def _is_unknown_user(self, user_id):
|
||||||
user = UserID.from_string(user_id)
|
user = UserID.from_string(user_id)
|
||||||
@ -149,7 +162,5 @@ class ApplicationServicesHandler(object):
|
|||||||
user_info = yield self.store.get_user_by_id(user_id)
|
user_info = yield self.store.get_user_by_id(user_id)
|
||||||
defer.returnValue(len(user_info) == 0)
|
defer.returnValue(len(user_info) == 0)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def _generate_hs_token(self):
|
def _generate_hs_token(self):
|
||||||
return stringutils.random_string(24)
|
return stringutils.random_string(24)
|
||||||
|
@ -81,6 +81,13 @@ class DirectoryHandler(BaseHandler):
|
|||||||
room_alias
|
room_alias
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if result:
|
||||||
|
room_id = result.room_id
|
||||||
|
servers = result.servers
|
||||||
|
else:
|
||||||
|
# Query AS to see if it exists
|
||||||
|
as_handler = self.hs.get_handlers().appservice_handler
|
||||||
|
result = yield as_handler.query_room_alias_exists(room_alias)
|
||||||
if result:
|
if result:
|
||||||
room_id = result.room_id
|
room_id = result.room_id
|
||||||
servers = result.servers
|
servers = result.servers
|
||||||
|
Loading…
Reference in New Issue
Block a user