diff --git a/ircrobots/__init__.py b/ircrobots/__init__.py index 6b4d641..563abc7 100644 --- a/ircrobots/__init__.py +++ b/ircrobots/__init__.py @@ -1,5 +1,5 @@ from .bot import Bot from .server import Server -from .params import (ConnectionParams, ClientTLSCertificate, SASLUserPass, SASLExternal, SASLSCRAM, +from .params import (ConnectionParams, ClientTLSKeypair, SASLUserPass, SASLExternal, SASLSCRAM, STSPolicy, ResumePolicy) from .ircv3 import Capability diff --git a/ircrobots/interface.py b/ircrobots/interface.py index 29db989..24b25d1 100644 --- a/ircrobots/interface.py +++ b/ircrobots/interface.py @@ -5,7 +5,7 @@ from enum import IntEnum from ircstates import Server, Emit from irctokens import Line, Hostmask -from .params import ConnectionParams, SASLParams, STSPolicy, ResumePolicy, ClientTLSCertificate +from .params import ConnectionParams, SASLParams, STSPolicy, ResumePolicy, ClientTLSKeypair class ITCPReader(object): async def read(self, byte_count: int): @@ -28,7 +28,7 @@ class ITCPTransport(object): port: int, tls: bool, tls_verify: bool=True, - certificate: Optional[ClientTLSCertificate]=None, + certificate: Optional[ClientTLSKeypair]=None, bindhost: Optional[str]=None ) -> Tuple[ITCPReader, ITCPWriter]: pass diff --git a/ircrobots/params.py b/ircrobots/params.py index ae02116..5a448f1 100644 --- a/ircrobots/params.py +++ b/ircrobots/params.py @@ -29,7 +29,7 @@ class ResumePolicy(object): token: str @dataclass -class ClientTLSCertificate(object): +class ClientTLSKeypair(object): certfile: str keyfile: Optional[str] = None password: Optional[str] = None @@ -48,7 +48,7 @@ class ConnectionParams(object): password: Optional[str] = None tls_verify: bool = True sasl: Optional[SASLParams] = None - certificate: Optional[ClientTLSCertificate] = None + certificate: Optional[ClientTLSKeypair] = None sts: Optional[STSPolicy] = None resume: Optional[ResumePolicy] = None diff --git a/ircrobots/security.py b/ircrobots/security.py index 31a3575..65ac58b 100644 --- a/ircrobots/security.py +++ b/ircrobots/security.py @@ -1,11 +1,11 @@ import ssl from typing import Optional -from .params import ClientTLSCertificate +from .params import ClientTLSKeypair def tls_context( verify: bool=True, - certificate: Optional[ClientTLSCertificate]=None + certificate: Optional[ClientTLSKeypair]=None ) -> ssl.SSLContext: context = ssl.SSLContext(ssl.PROTOCOL_TLS) diff --git a/ircrobots/transport.py b/ircrobots/transport.py index 8dfaff2..3f4b939 100644 --- a/ircrobots/transport.py +++ b/ircrobots/transport.py @@ -4,7 +4,7 @@ from asyncio import StreamReader, StreamWriter from async_stagger import open_connection from .interface import ITCPTransport, ITCPReader, ITCPWriter -from .params import ClientTLSCertificate +from .params import ClientTLSKeypair from .security import tls_context class TCPReader(ITCPReader): @@ -37,7 +37,7 @@ class TCPTransport(ITCPTransport): port: int, tls: bool, tls_verify: bool=True, - certificate: Optional[ClientTLSCertificate]=None, + certificate: Optional[ClientTLSKeypair]=None, bindhost: Optional[str]=None ) -> Tuple[ITCPReader, ITCPWriter]: