diff options
author | Erik Johnston <erik@matrix.org> | 2021-01-28 17:39:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-28 17:39:21 +0000 |
commit | 4b73488e811714089ba447884dccb9b6ae3ac16c (patch) | |
tree | 2b6b6f17587e78d5d0e7cc4c0df84356f62f531a /tests/server.py | |
parent | Cache config options in SSL verification (#9255) (diff) | |
download | synapse-4b73488e811714089ba447884dccb9b6ae3ac16c.tar.xz |
Ratelimit 3PID /requestToken API (#9238)
Diffstat (limited to 'tests/server.py')
-rw-r--r-- | tests/server.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/server.py b/tests/server.py index 5a85d5fe7f..6419c445ec 100644 --- a/tests/server.py +++ b/tests/server.py @@ -47,6 +47,7 @@ class FakeChannel: site = attr.ib(type=Site) _reactor = attr.ib() result = attr.ib(type=dict, default=attr.Factory(dict)) + _ip = attr.ib(type=str, default="127.0.0.1") _producer = None @property @@ -120,7 +121,7 @@ class FakeChannel: def getPeer(self): # We give an address so that getClientIP returns a non null entry, # causing us to record the MAU - return address.IPv4Address("TCP", "127.0.0.1", 3423) + return address.IPv4Address("TCP", self._ip, 3423) def getHost(self): return None @@ -196,6 +197,7 @@ def make_request( custom_headers: Optional[ Iterable[Tuple[Union[bytes, str], Union[bytes, str]]] ] = None, + client_ip: str = "127.0.0.1", ) -> FakeChannel: """ Make a web request using the given method, path and content, and render it @@ -223,6 +225,9 @@ def make_request( will pump the reactor until the the renderer tells the channel the request is finished. + client_ip: The IP to use as the requesting IP. Useful for testing + ratelimiting. + Returns: channel """ @@ -250,7 +255,7 @@ def make_request( if isinstance(content, str): content = content.encode("utf8") - channel = FakeChannel(site, reactor) + channel = FakeChannel(site, reactor, ip=client_ip) req = request(channel) req.content = BytesIO(content) |