Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 03:04:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1026 from matrix-org/paul/thirdpartylookup

Browse source 
3rd party entity lookup
This commit is contained in:
Paul Evans 2016-08-18 20:52:50 +01:00 • committed by GitHub
commit 5674ea3e6c
7 changed files with 189 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/config/appservice.py
View file

@ -123,6 +123,15 @@ def _load_appservice(hostname, as_info, config_filename):
raise ValueError(
"Missing/bad type 'exclusive' key in %s", regex_obj
)
# protocols check
protocols = as_info.get("protocols")
if protocols:
# Because strings are lists in python
if isinstance(protocols, str) or not isinstance(protocols, list):
raise KeyError("Optional 'protocols' must be a list if present.")
for p in protocols:
if not isinstance(p, str):
raise KeyError("Bad value for 'protocols' item")
return ApplicationService(
token=as_info["as_token"],
url=as_info["url"],
@ -130,4 +139,5 @@ def _load_appservice(hostname, as_info, config_filename):
hs_token=as_info["hs_token"],
sender=user_id,
id=as_info["id"],
protocols=protocols,
)