smokephil/extract_otp_secret_keys
1
0
Fork 0
mirror of https://github.com/scito/extract_otp_secret_keys.git synced 2025-12-23 14:56:23 +01:00
Code Issues Projects Releases Wiki Activity

Workaround for PYTHON < 3.10: use Union[int, None] instead of int | None

Browse source
This commit is contained in:
scito 2022-12-29 22:34:07 +01:00
parent faafb61241
commit a5768ba1e6
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
extract_otp_secret_keys.py
View file

@ -53,7 +53,7 @@ import sys
import urllib.parse as urlparse import urllib.parse as urlparse
from enum import Enum from enum import Enum
from operator import add from operator import add
from typing import Any, TextIO, TypedDict from typing import Any, TextIO, TypedDict, Union
from qrcode import QRCode # type: ignore from qrcode import QRCode # type: ignore
@ -79,7 +79,8 @@ except ImportError:
# Types # Types
Args = argparse.Namespace Args = argparse.Namespace
OtpUrl = str OtpUrl = str
Otp = TypedDict('Otp', {'name': str, 'secret': str, 'issuer': str, 'type': str, 'counter': int | None, 'url': OtpUrl}) # Workaround for PYTHON < 3.10: use Union[int, None] instead of int | None
Otp = TypedDict('Otp', {'name': str, 'secret': str, 'issuer': str, 'type': str, 'counter': Union[int, None], 'url': OtpUrl})
Otps = list[Otp] Otps = list[Otp]
OtpUrls = list[OtpUrl] OtpUrls = list[OtpUrl]
@ -360,7 +361,7 @@ def get_payload_from_otp_url(otpauth_migration_url: str, i: int, input_source: s
if verbose > 2: print(f"\nDEBUG: parsed_url={parsed_url}") if verbose > 2: print(f"\nDEBUG: parsed_url={parsed_url}")
try: try:
params = urlparse.parse_qs(parsed_url.query, strict_parsing=True) params = urlparse.parse_qs(parsed_url.query, strict_parsing=True)
except Exception: # Not necessary for Python >= 3.11 except Exception: # Necessary for PYTHON < 3.11
params = {} params = {}
if verbose > 2: print(f"\nDEBUG: querystring params={params}") if verbose > 2: print(f"\nDEBUG: querystring params={params}")
if 'data' not in params: if 'data' not in params: