Properly typecheck types.http (#14988)

* Tweak http types in Synapse

AFACIS these are correct, and they make mypy happier on tests.http.

* Type hints for test_proxyagent

* type hints for test_srv_resolver

* test_matrix_federation_agent

* tests.http.server._base

* tests.http.__init__

* tests.http.test_additional_resource

* tests.http.test_client

* tests.http.test_endpoint

* tests.http.test_matrixfederationclient

* tests.http.test_servlet

* tests.http.test_simple_client

* tests.http.test_site

* One fixup in tests.server

* Untyped defs

* Changelog

* Fixup syntax for Python 3.7

* Fix olddeps syntax

* Use a twisted IPv4 addr for dummy_address

* Fix typo, thanks Sean

Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>

* Remove redundant `Optional`

---------

Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>

changelog.d/14988.misc

@@ -0,0 +1 @@
+Improve type hints.

mypy.ini

@@ -32,9 +32,6 @@ exclude = (?x)
  |synapse/storage/databases/main/cache.py
  |synapse/storage/schema/
 
- |tests/http/federation/test_matrix_federation_agent.py
- |tests/http/federation/test_srv_resolver.py
- |tests/http/test_proxyagent.py
  |tests/module_api/test_api.py
  |tests/rest/media/v1/test_media_storage.py
  |tests/server.py
@@ -92,6 +89,9 @@ disallow_untyped_defs = True
 [mypy-tests.handlers.*]
 disallow_untyped_defs = True
 
+[mypy-tests.http.*]
+disallow_untyped_defs = True
+
 [mypy-tests.logging.*]
 disallow_untyped_defs = True
 

synapse/http/client.py

@@ -44,6 +44,7 @@
  IAddress,
  IDelayedCall,
  IHostResolution,
+ IReactorCore,
  IReactorPluggableNameResolver,
  IReactorTime,
  IResolutionReceiver,
@@ -226,7 +227,9 @@ def resolutionComplete() -> None:
  return recv
 
 
-@implementer(ISynapseReactor)
+# ISynapseReactor implies IReactorCore, but explicitly marking it this as an implementer
+# of IReactorCore seems to keep mypy-zope happier.
+@implementer(IReactorCore, ISynapseReactor)
 class BlacklistingReactorWrapper:
  """
  A Reactor wrapper which will prevent DNS resolution to blacklisted IP

synapse/http/proxyagent.py

@@ -38,7 +38,6 @@
 
 from synapse.http import redact_uri
 from synapse.http.connectproxyclient import HTTPConnectProxyEndpoint, ProxyCredentials
-from synapse.types import ISynapseReactor
 
 logger = logging.getLogger(__name__)
 
@@ -84,7 +83,7 @@ class ProxyAgent(_AgentBase):
  def __init__(
  self,
  reactor: IReactorCore,
- proxy_reactor: Optional[ISynapseReactor] = None,
+ proxy_reactor: Optional[IReactorCore] = None,
  contextFactory: Optional[IPolicyForHTTPS] = None,
  connectTimeout: Optional[float] = None,
  bindAddress: Optional[bytes] = None,

tests/http/__init__.py

@@ -19,13 +19,15 @@
 
 from OpenSSL import SSL
 from OpenSSL.SSL import Connection
+from twisted.internet.address import IPv4Address
 from twisted.internet.interfaces import IOpenSSLServerConnectionCreator
 from twisted.internet.ssl import Certificate, trustRootFromCertificates
+from twisted.protocols.tls import TLSMemoryBIOProtocol
 from twisted.web.client import BrowserLikePolicyForHTTPS # noqa: F401
 from twisted.web.iweb import IPolicyForHTTPS # noqa: F401
 
 
-def get_test_https_policy():
+def get_test_https_policy() -> BrowserLikePolicyForHTTPS:
  """Get a test IPolicyForHTTPS which trusts the test CA cert
 
  Returns:
@@ -39,7 +41,7 @@ def get_test_https_policy():
  return BrowserLikePolicyForHTTPS(trustRoot=trust_root)
 
 
-def get_test_ca_cert_file():
+def get_test_ca_cert_file() -> str:
  """Get the path to the test CA cert
 
  The keypair is generated with:
@@ -51,7 +53,7 @@ def get_test_ca_cert_file():
  return os.path.join(os.path.dirname(__file__), "ca.crt")
 
 
-def get_test_key_file():
+def get_test_key_file() -> str:
  """get the path to the test key
 
  The key file is made with:
@@ -137,15 +139,20 @@ class TestServerTLSConnectionFactory:
  """An SSL connection creator which returns connections which present a certificate
  signed by our test CA."""
 
- def __init__(self, sanlist):
+ def __init__(self, sanlist: List[bytes]):
  """
  Args:
- sanlist: list[bytes]: a list of subjectAltName values for the cert
+ sanlist: a list of subjectAltName values for the cert
  """
  self._cert_file = create_test_cert_file(sanlist)
 
- def serverConnectionForTLS(self, tlsProtocol):
+ def serverConnectionForTLS(self, tlsProtocol: TLSMemoryBIOProtocol) -> Connection:
  ctx = SSL.Context(SSL.SSLv23_METHOD)
  ctx.use_certificate_file(self._cert_file)
  ctx.use_privatekey_file(get_test_key_file())
  return Connection(ctx, None)
+
+
+# A dummy address, useful for tests that use FakeTransport and don't care about where
+# packets are going to/coming from.
+dummy_address = IPv4Address("TCP", "127.0.0.1", 80)