DGNum/ircrobots
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ClientTLSCertificate -> ClientTLSKeypair

Browse source
This commit is contained in:
David Schultz 2022-01-21 10:39:03 -06:00
parent 7a7af60be7
commit 29892a11d0
No known key found for this signature in database
GPG key ID: F6DED672FFFD5E5E
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ircrobots/__init__.py
View file

@ -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

4
ircrobots/interface.py
View file

@ -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

4
ircrobots/params.py
View file

@ -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

4
ircrobots/security.py
View file

@ -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)

4
ircrobots/transport.py
View file

@ -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]: