Skip to content

Apply X | Y type hints style for asyncssh/sk.py #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waketzheng wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Apply X | Y type hints style for asyncssh/sk.py #825

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions asyncssh/sk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
from hashlib import sha256
import hmac
import time
from typing import Callable, List, Mapping, NoReturn, Optional
from typing import Sequence, Tuple, TypeVar, cast
from collections.abc import Callable, Mapping, Sequence
from typing import NoReturn, TypeVar, cast


_PollResult = TypeVar('_PollResult')
_SKResidentKey = Tuple[int, str, bytes, bytes]
_SKResidentKey = tuple[int, str, bytes, bytes]


_CTAP1_POLL_INTERVAL = 0.1
Expand Down Expand Up @@ -77,7 +77,7 @@ def _ctap1_poll(poll_interval: float, func: Callable[..., _PollResult],


def _ctap1_enroll(dev: 'CtapHidDevice', alg: int,
application: str) -> Tuple[bytes, bytes]:
application: str) -> tuple[bytes, bytes]:
"""Enroll a new security key using CTAP version 1"""

ctap1 = Ctap1(dev)
Expand All @@ -93,8 +93,8 @@ def _ctap1_enroll(dev: 'CtapHidDevice', alg: int,


def _ctap2_enroll(dev: 'CtapHidDevice', alg: int, application: str,
user: str, pin: Optional[str],
resident: bool) -> Tuple[bytes, bytes]:
user: str, pin: str | None,
resident: bool) -> tuple[bytes, bytes]:
"""Enroll a new security key using CTAP version 2"""

ctap2 = Ctap2(dev)
Expand All @@ -104,8 +104,8 @@ def _ctap2_enroll(dev: 'CtapHidDevice', alg: int, application: str,
key_params = [{'type': 'public-key', 'alg': alg}]
options = {'rk': resident}

pin_protocol: Optional[PinProtocolV1]
pin_auth: Optional[bytes]
pin_protocol: PinProtocolV1 | None
pin_auth: bytes | None

if pin:
pin_protocol = PinProtocolV1()
Expand All @@ -125,7 +125,7 @@ def _ctap2_enroll(dev: 'CtapHidDevice', alg: int, application: str,
return _decode_public_key(alg, cdata.public_key), cdata.credential_id


def _win_enroll(alg: int, application: str, user: str) -> Tuple[bytes, bytes]:
def _win_enroll(alg: int, application: str, user: str) -> tuple[bytes, bytes]:
"""Enroll a new security key using Windows WebAuthn API"""

data_collector = DefaultClientDataCollector(origin=application,
Expand All @@ -147,7 +147,7 @@ def _win_enroll(alg: int, application: str, user: str) -> Tuple[bytes, bytes]:


def _ctap1_sign(dev: 'CtapHidDevice', message_hash: bytes, application: str,
key_handle: bytes) -> Tuple[int, int, bytes]:
key_handle: bytes) -> tuple[int, int, bytes]:
"""Sign a message with a security key using CTAP version 1"""

ctap1 = Ctap1(dev)
Expand All @@ -166,7 +166,7 @@ def _ctap1_sign(dev: 'CtapHidDevice', message_hash: bytes, application: str,

def _ctap2_sign(dev: 'CtapHidDevice', message_hash: bytes,
application: str, key_handle: bytes,
touch_required: bool) -> Tuple[int, int, bytes]:
touch_required: bool) -> tuple[int, int, bytes]:
"""Sign a message with a security key using CTAP version 2"""

ctap2 = Ctap2(dev)
Expand All @@ -188,7 +188,7 @@ def _ctap2_sign(dev: 'CtapHidDevice', message_hash: bytes,


def _win_sign(data: bytes, application: str,
key_handle: bytes) -> Tuple[int, int, bytes, bytes]:
key_handle: bytes) -> tuple[int, int, bytes, bytes]:
"""Sign a message with a security key using Windows WebAuthn API"""

data_collector = DefaultClientDataCollector(origin=application,
Expand All @@ -215,8 +215,8 @@ def sk_webauthn_prefix(data: bytes, application: str) -> bytes:
application.encode('utf-8') + b'"'


def sk_enroll(alg: int, application: str, user: str, pin: Optional[str],
resident: bool) -> Tuple[bytes, bytes]:
def sk_enroll(alg: int, application: str, user: str, pin: str | None,
resident: bool) -> tuple[bytes, bytes]:
"""Enroll a new security key"""

if sk_use_webauthn:
Expand Down Expand Up @@ -246,7 +246,7 @@ def sk_enroll(alg: int, application: str, user: str, pin: Optional[str],


def sk_sign(data: bytes, application: str, key_handle: bytes, flags: int,
is_webauthn: bool = False) -> Tuple[int, int, bytes, bytes]:
is_webauthn: bool = False) -> tuple[int, int, bytes, bytes]:
"""Sign a message with a security key"""

touch_required = bool(flags & SSH_SK_USER_PRESENCE_REQD)
Expand Down Expand Up @@ -283,12 +283,12 @@ def sk_sign(data: bytes, application: str, key_handle: bytes, flags: int,
raise ValueError('Security key credential not found')


def sk_get_resident(application: str, user: Optional[str],
def sk_get_resident(application: str, user: str | None,
pin: str) -> Sequence[_SKResidentKey]:
"""Get keys resident on a security key"""

app_hash = sha256(application.encode('utf-8')).digest()
result: List[_SKResidentKey] = []
result: list[_SKResidentKey] = []

for dev in CtapHidDevice.list_devices():
try:
Expand Down
Loading