mirrors/pferd
1
0
Fork 0
mirror of https://github.com/Garmelon/PFERD.git synced 2025-11-03 22:23:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up authenticator exceptions

Browse Source 
- Renamed to *Error for consistency
- Treating AuthError like CrawlError
This commit is contained in:
Joscha
2021-05-25 14:21:12 +02:00
parent c15a1aecdf
commit 22c2259adb
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PFERD/auth/__init__.py
View File

@@ -2,7 +2,7 @@ from configparser import SectionProxy
from typing import Callable, Dict
from ..config import Config
from .authenticator import Authenticator, AuthSection
from .authenticator import Authenticator, AuthError, AuthSection # noqa: F401
from .keyring import KeyringAuthenticator, KeyringAuthSection
from .simple import SimpleAuthenticator, SimpleAuthSection
from .tfa import TfaAuthenticator

12
PFERD/auth/authenticator.py
View File

@@ -4,11 +4,11 @@ from typing import Tuple
from ..config import Config, Section
class AuthLoadException(Exception):
class AuthLoadError(Exception):
pass
class AuthException(Exception):
class AuthError(Exception):
pass
@@ -30,7 +30,7 @@ class Authenticator(ABC):
If you are writing your own constructor for your own authenticator,
make sure to call this constructor first (via super().__init__).
May throw an AuthLoadException.
May throw an AuthLoadError.
"""
self.name = name
@@ -56,7 +56,7 @@ class Authenticator(ABC):
(e. g. prompting the user).
"""
raise AuthException("Invalid credentials")
raise AuthError("Invalid credentials")
def invalidate_username(self) -> None:
"""
@@ -67,7 +67,7 @@ class Authenticator(ABC):
(e. g. prompting the user).
"""
raise AuthException("Invalid username")
raise AuthError("Invalid username")
def invalidate_password(self) -> None:
"""
@@ -78,4 +78,4 @@ class Authenticator(ABC):
(e. g. prompting the user).
"""
raise AuthException("Invalid password")
raise AuthError("Invalid password")

4
PFERD/auth/keyring.py
View File

@@ -6,7 +6,7 @@ from ..config import Config
from ..logging import log
from ..utils import agetpass
from ..version import NAME
from .authenticator import Authenticator, AuthException, AuthSection
from .authenticator import Authenticator, AuthError, AuthSection
class KeyringAuthSection(AuthSection):
@@ -53,4 +53,4 @@ class KeyringAuthenticator(Authenticator):
self.invalidate_password()
def invalidate_password(self) -> None:
raise AuthException("Invalid password")
raise AuthError("Invalid password")

8
PFERD/auth/simple.py
View File

@@ -3,7 +3,7 @@ from typing import Optional, Tuple
from ..config import Config
from ..logging import log
from ..utils import agetpass, ainput
from .authenticator import Authenticator, AuthException, AuthSection
from .authenticator import Authenticator, AuthError, AuthSection
class SimpleAuthSection(AuthSection):
@@ -48,7 +48,7 @@ class SimpleAuthenticator(Authenticator):
def invalidate_credentials(self) -> None:
if self._username_fixed and self._password_fixed:
raise AuthException("Configured credentials are invalid")
raise AuthError("Configured credentials are invalid")
if not self._username_fixed:
self._username = None
@@ -57,12 +57,12 @@ class SimpleAuthenticator(Authenticator):
def invalidate_username(self) -> None:
if self._username_fixed:
raise AuthException("Configured username is invalid")
raise AuthError("Configured username is invalid")
else:
self._username = None
def invalidate_password(self) -> None:
if self._password_fixed:
raise AuthException("Configured password is invalid")
raise AuthError("Configured password is invalid")
else:
self._password = None

8
PFERD/auth/tfa.py
View File

@@ -3,7 +3,7 @@ from typing import Tuple
from ..config import Config
from ..logging import log
from ..utils import ainput
from .authenticator import Authenticator, AuthException, AuthSection
from .authenticator import Authenticator, AuthError, AuthSection
class TfaAuthenticator(Authenticator):
@@ -16,7 +16,7 @@ class TfaAuthenticator(Authenticator):
super().__init__(name, section, config)
async def username(self) -> str:
raise AuthException("TFA authenticator does not support usernames")
raise AuthError("TFA authenticator does not support usernames")
async def password(self) -> str:
async with log.exclusive_output():
@@ -24,10 +24,10 @@ class TfaAuthenticator(Authenticator):
return code
async def credentials(self) -> Tuple[str, str]:
raise AuthException("TFA authenticator does not support usernames")
raise AuthError("TFA authenticator does not support usernames")
def invalidate_username(self) -> None:
raise AuthException("TFA authenticator does not support usernames")
raise AuthError("TFA authenticator does not support usernames")
def invalidate_password(self) -> None:
pass

4
PFERD/pferd.py
View File

@@ -3,7 +3,7 @@ from typing import Dict, List, Optional
from rich.markup import escape
from .auth import AUTHENTICATORS, Authenticator
from .auth import AUTHENTICATORS, Authenticator, AuthError
from .config import Config, ConfigOptionError
from .crawl import CRAWLERS, Crawler, CrawlError, KitIliasWebCrawler
from .logging import log
@@ -117,7 +117,7 @@ class Pferd:
try:
await crawler.run()
except CrawlError as e:
except (CrawlError, AuthError) as e:
log.error(str(e))
except Exception:
log.unexpected_exception()