style: add more pylint checks and update code for them

This commit is contained in:
arcanis committed 2026-11-18 10:36:19 +02:00
1 parent 4f839a7e6a
commit 36b7972b26
211 files changed
+951 -955

No files matched your search

+4 -4
View File
@@ -36,11 +36,11 @@ class Auth(LazyLogging):
allow_read_only(bool): allow read only access to APIs
"""
def __init__(self, configuration: Configuration, provider: AuthSettings = AuthSettings.Disabled) -> None:
def __init__(self, configuration: Configuration, provider: AuthSettings = AuthSettings.DISABLED) -> None:
"""
Args:
configuration(Configuration): configuration instance
provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.Disabled)
provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.DISABLED)
"""
self.allow_read_only = configuration.getboolean("auth", "allow_read_only")
@@ -83,10 +83,10 @@ class Auth(LazyLogging):
Auth: authorization module according to current settings
"""
match AuthSettings.from_option(configuration.get("auth", "target", fallback="disabled")):
case AuthSettings.Configuration:
case AuthSettings.CONFIGURATION:
from ahriman.core.auth.mapping import Mapping
return Mapping(configuration, database)
case AuthSettings.OAuth:
case AuthSettings.OAUTH:
from ahriman.core.auth.oauth import OAuth
return OAuth(configuration, database)
case AuthSettings.PAM:
+2 -2
View File
@@ -35,12 +35,12 @@ class Mapping(Auth):
"""
def __init__(self, configuration: Configuration, database: SQLite,
provider: AuthSettings = AuthSettings.Configuration) -> None:
provider: AuthSettings = AuthSettings.CONFIGURATION) -> None:
"""
Args:
configuration(Configuration): configuration instance
database(SQLite): database instance
provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.Configuration)
provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.CONFIGURATION)
"""
Auth.__init__(self, configuration, provider)
self.database = database
+2 -2
View File
@@ -42,12 +42,12 @@ class OAuth(Mapping):
"""
def __init__(self, configuration: Configuration, database: SQLite,
provider: AuthSettings = AuthSettings.OAuth) -> None:
provider: AuthSettings = AuthSettings.OAUTH) -> None:
"""
Args:
configuration(Configuration): configuration instance
database(SQLite): database instance
provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.OAuth)
provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.OAUTH)
"""
Mapping.__init__(self, configuration, database, provider)
self.client_id = configuration.get("auth", "client_id")
+2 -2
View File
@@ -124,6 +124,6 @@ class PAM(Mapping):
return user.verify_access(required)
# if username is in admin group, then we treat it as full access
if username in self.group_members(self.full_access_group):
return UserAccess.Full.permits(required)
return UserAccess.FULL.permits(required)
# fallback to read-only accounts
return UserAccess.Read.permits(required)
return UserAccess.READ.permits(required)
@@ -112,7 +112,7 @@ def apidocs(*,
Returns:
Callable[..., Any]: decorated function
"""
authorization_required = permission != UserAccess.Unauthorized
authorization_required = permission != UserAccess.UNAUTHORIZED
def wrapper(handler: Callable[..., Any]) -> Callable[..., Any]:
if not aiohttp_apispec:
+2 -2
View File
@@ -22,7 +22,7 @@ from typing import Any
from ahriman import __version__
from ahriman.web.apispec import aiohttp_apispec
from ahriman.web.keys import ConfigurationKey
from ahriman.web.keys import CONFIGURATION_KEY
__all__ = ["setup_apispec"]
@@ -88,7 +88,7 @@ def _servers(application: Application) -> list[dict[str, Any]]:
Returns:
list[dict[str, Any]]: list (actually only one) of defined web urls
"""
configuration = application[ConfigurationKey]
configuration = application[CONFIGURATION_KEY]
address = configuration.get("web", "address", fallback=None)
if not address:
host = configuration.get("web", "host")
+10 -10
View File
@@ -28,16 +28,16 @@ from ahriman.models.repository_id import RepositoryId
__all__ = [
"AuthKey",
"ConfigurationKey",
"SpawnKey",
"WatcherKey",
"WorkersKey",
"AUTH_KEY",
"CONFIGURATION_KEY",
"SPAWN_KEY",
"WATCHER_KEY",
"WORKERS_KEY",
]
AuthKey = AppKey("validator", Auth)
ConfigurationKey = AppKey("configuration", Configuration)
SpawnKey = AppKey("spawn", Spawn)
WatcherKey = AppKey("watcher", dict[RepositoryId, Watcher])
WorkersKey = AppKey("workers", WorkersCache)
AUTH_KEY = AppKey("validator", Auth)
CONFIGURATION_KEY = AppKey("configuration", Configuration)
SPAWN_KEY = AppKey("spawn", Spawn)
WATCHER_KEY = AppKey("watcher", dict[RepositoryId, Watcher])
WORKERS_KEY = AppKey("workers", WorkersCache)
@@ -98,18 +98,18 @@ def _auth_handler(allow_read_only: bool) -> Middleware:
if (unix_socket := request.get_extra_info("socket")) is not None and unix_socket.family == socket.AF_UNIX:
# special case for unix sockets. We need to extract socket which is used for the request
# and check its address family
permission = UserAccess.Unauthorized
permission = UserAccess.UNAUTHORIZED
elif (permission_method := getattr(handler, "get_permission", None)) is not None:
permission = await permission_method(request)
elif isinstance(handler, types.MethodType): # additional wrapper for static resources
handler_instance = getattr(handler, "__self__", None)
permission = UserAccess.Unauthorized if isinstance(handler_instance, StaticResource) else UserAccess.Full
permission = UserAccess.UNAUTHORIZED if isinstance(handler_instance, StaticResource) else UserAccess.FULL
else:
permission = UserAccess.Full
permission = UserAccess.FULL
if permission == UserAccess.Unauthorized: # explicit if elif else for better code coverage
if permission == UserAccess.UNAUTHORIZED: # explicit if elif else for better code coverage
pass
elif allow_read_only and UserAccess.Read.permits(permission):
elif allow_read_only and UserAccess.READ.permits(permission):
pass
else:
await aiohttp_security.check_permission(request, permission, request.path)
@@ -29,7 +29,7 @@ class EventBusFilterSchema(RepositoryIdSchema):
event = fields.List(fields.String(), metadata={
"description": "Event type filter",
"example": [EventType.PackageUpdated],
"example": [EventType.PACKAGE_UPDATED],
})
object_id = fields.String(metadata={
"description": "Object identifier filter",
@@ -35,7 +35,7 @@ class EventSchema(Schema):
})
event = fields.String(required=True, metadata={
"description": "Event type",
"example": EventType.PackageUpdated,
"example": EventType.PACKAGE_UPDATED,
})
message = fields.String(metadata={
"description": "Event message if available",
@@ -29,7 +29,7 @@ class EventSearchSchema(PaginationSchema):
event = fields.String(metadata={
"description": "Event type",
"example": EventType.PackageUpdated,
"example": EventType.PACKAGE_UPDATED,
})
from_date = fields.Integer(metadata={
"description": "Minimal creation timestamp, inclusive",
@@ -28,7 +28,7 @@ class SSESchema(Schema):
event = fields.String(required=True, metadata={
"description": "Event type",
"example": EventType.PackageUpdated,
"example": EventType.PACKAGE_UPDATED,
})
data = fields.Dict(keys=fields.String(), values=fields.Raw(), metadata={
"description": "Event data",
@@ -35,7 +35,7 @@ class DocsView(BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED
ROUTES = ["/api-docs"]
@classmethod
@@ -36,7 +36,7 @@ class SwaggerView(BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED
ROUTES = ["/api-docs/swagger.json"]
@classmethod
+8 -8
View File
@@ -32,7 +32,7 @@ from ahriman.core.status.watcher import Watcher
from ahriman.core.utils import filter_json
from ahriman.models.repository_id import RepositoryId
from ahriman.models.user_access import UserAccess
from ahriman.web.keys import AuthKey, ConfigurationKey, SpawnKey, WatcherKey, WorkersKey
from ahriman.web.keys import AUTH_KEY, CONFIGURATION_KEY, SPAWN_KEY, WATCHER_KEY, WORKERS_KEY
T = TypeVar("T", str, list[str])
@@ -47,7 +47,7 @@ class BaseView(View, CorsViewMixin):
ROUTES(list[str]): (class attribute) list of supported routes
"""
OPTIONS_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized
OPTIONS_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED
ROUTES: ClassVar[list[str]] = []
@property
@@ -58,7 +58,7 @@ class BaseView(View, CorsViewMixin):
Returns:
Configuration: configuration instance
"""
return self.request.app[ConfigurationKey]
return self.request.app[CONFIGURATION_KEY]
@property
def services(self) -> dict[RepositoryId, Watcher]:
@@ -68,7 +68,7 @@ class BaseView(View, CorsViewMixin):
Returns:
dict[RepositoryId, Watcher]: map of loaded watchers per known repository
"""
return self.request.app[WatcherKey]
return self.request.app[WATCHER_KEY]
@property
def sign(self) -> GPG:
@@ -88,7 +88,7 @@ class BaseView(View, CorsViewMixin):
Returns:
Spawn: external process spawner instance
"""
return self.request.app[SpawnKey]
return self.request.app[SPAWN_KEY]
@property
def validator(self) -> Auth:
@@ -98,7 +98,7 @@ class BaseView(View, CorsViewMixin):
Returns:
Auth: authorization service instance
"""
return self.request.app[AuthKey]
return self.request.app[AUTH_KEY]
@property
def workers(self) -> WorkersCache:
@@ -108,7 +108,7 @@ class BaseView(View, CorsViewMixin):
Returns:
WorkersCache: workers service
"""
return self.request.app[WorkersKey]
return self.request.app[WORKERS_KEY]
@classmethod
async def get_permission(cls, request: Request) -> UserAccess:
@@ -122,7 +122,7 @@ class BaseView(View, CorsViewMixin):
UserAccess: extracted permission
"""
method = "GET" if (other := request.method.upper()) == "HEAD" else other
permission: UserAccess = getattr(cls, f"{method}_PERMISSION", UserAccess.Full)
permission: UserAccess = getattr(cls, f"{method}_PERMISSION", UserAccess.FULL)
return permission
@classmethod
+1 -1
View File
@@ -53,7 +53,7 @@ class IndexView(BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED
ROUTES = ["/", "/index.html"]
async def get(self) -> Response:
+1 -1
View File
@@ -32,7 +32,7 @@ class StaticView(BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED
ROUTES = ["/favicon.ico"]
async def get(self) -> None:
@@ -41,13 +41,13 @@ class EventBusView(BaseView):
"""
READ_EVENTS: ClassVar[set[EventType]] = {
EventType.PackageHeld,
EventType.PackageOutdated,
EventType.PackageRemoved,
EventType.PackageStatusChanged,
EventType.PackageUpdateFailed,
EventType.PackageUpdated,
EventType.ServiceStatusChanged,
EventType.PACKAGE_HELD,
EventType.PACKAGE_OUTDATED,
EventType.PACKAGE_REMOVED,
EventType.PACKAGE_STATUS_CHANGED,
EventType.PACKAGE_UPDATE_FAILED,
EventType.PACKAGE_UPDATED,
EventType.SERVICE_STATUS_CHANGED,
}
ROUTES = ["/api/v1/events/stream"]
@@ -65,14 +65,14 @@ class EventBusView(BaseView):
if request.method.upper() not in ("GET", "HEAD"):
return await BaseView.get_permission(request)
permission = UserAccess.Full
permission = UserAccess.FULL
try:
topics = cls(request)._topics()
except HTTPBadRequest:
topics = None
if topics is not None and set(topics).issubset(cls.READ_EVENTS):
permission = UserAccess.Read
permission = UserAccess.READ
return permission
@@ -120,7 +120,7 @@ class EventBusView(BaseView):
description="Stream live updates via SSE. Read-only users may subscribe only when all requested event filters "
"belong to read-safe package and service status events; build log or unfiltered streams require "
"full access. Streams are live-only and do not replay missed events after reconnect.",
permission=UserAccess.Full,
permission=UserAccess.FULL,
error_400_enabled=True,
error_404_description="Repository is unknown",
schema=SSESchema(many=True),
@@ -36,7 +36,7 @@ class EventsView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
GET_PERMISSION = POST_PERMISSION = UserAccess.Full # type: ClassVar[UserAccess]
GET_PERMISSION = POST_PERMISSION = UserAccess.FULL # type: ClassVar[UserAccess]
ROUTES = ["/api/v1/events"]
@apidocs(
@@ -39,7 +39,7 @@ class WorkersView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
DELETE_PERMISSION = GET_PERMISSION = POST_PERMISSION = UserAccess.Full # type: ClassVar[UserAccess]
DELETE_PERMISSION = GET_PERMISSION = POST_PERMISSION = UserAccess.FULL # type: ClassVar[UserAccess]
ROUTES = ["/api/v1/distributed"]
@apidocs(
@@ -35,7 +35,7 @@ class Archives(StatusViewGuard, BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
ROUTES = ["/api/v1/packages/{package}/archives"]
@apidocs(
@@ -37,8 +37,8 @@ class ChangesView(StatusViewGuard, BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/packages/{package}/changes"]
@apidocs(
@@ -37,8 +37,8 @@ class DependenciesView(StatusViewGuard, BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/packages/{package}/dependencies"]
@apidocs(
@@ -36,7 +36,7 @@ class HoldView(StatusViewGuard, BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/packages/{package}/hold"]
@apidocs(
@@ -40,8 +40,8 @@ class LogsView(StatusViewGuard, BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
DELETE_PERMISSION = POST_PERMISSION = UserAccess.Full # type: ClassVar[UserAccess]
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
DELETE_PERMISSION = POST_PERMISSION = UserAccess.FULL # type: ClassVar[UserAccess]
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
ROUTES = ["/api/v1/packages/{package}/logs"]
@apidocs(
@@ -45,8 +45,8 @@ class PackageView(StatusViewGuard, BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
DELETE_PERMISSION = POST_PERMISSION = UserAccess.Full # type: ClassVar[UserAccess]
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Read
DELETE_PERMISSION = POST_PERMISSION = UserAccess.FULL # type: ClassVar[UserAccess]
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.READ
ROUTES = ["/api/v1/packages/{package}"]
@apidocs(
@@ -42,8 +42,8 @@ class PackagesView(StatusViewGuard, BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Read
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.READ
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/packages"]
@apidocs(
@@ -36,8 +36,8 @@ class PatchView(StatusViewGuard, BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
DELETE_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
DELETE_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
ROUTES = ["/api/v1/packages/{package}/patches/{patch}"]
@apidocs(
@@ -37,8 +37,8 @@ class PatchesView(StatusViewGuard, BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/packages/{package}/patches"]
@apidocs(
@@ -35,7 +35,7 @@ class AddView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/service/add"]
@apidocs(
@@ -36,7 +36,7 @@ class ConfigView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
GET_PERMISSION = POST_PERMISSION = UserAccess.Full # type: ClassVar[UserAccess]
GET_PERMISSION = POST_PERMISSION = UserAccess.FULL # type: ClassVar[UserAccess]
ROUTES = ["/api/v1/service/config"]
@apidocs(
@@ -34,7 +34,7 @@ class LogsView(BaseView):
DELETE_PERMISSION(UserAccess): (class attribute) delete permissions of self
"""
DELETE_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
DELETE_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/service/logs"]
@apidocs(
@@ -35,8 +35,8 @@ class PGPView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/service/pgp"]
@apidocs(
@@ -34,7 +34,7 @@ class ProcessView(BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
ROUTES = ["/api/v1/service/process/{process_id}"]
@apidocs(
@@ -34,7 +34,7 @@ class RebuildView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/service/rebuild"]
@apidocs(
@@ -34,7 +34,7 @@ class RemoveView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/service/remove"]
@apidocs(
@@ -35,7 +35,7 @@ class RequestView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
ROUTES = ["/api/v1/service/request"]
@apidocs(
@@ -34,7 +34,7 @@ class RollbackView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/service/rollback"]
@apidocs(
@@ -38,7 +38,7 @@ class SearchView(BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
ROUTES = ["/api/v1/service/search"]
@apidocs(
@@ -34,7 +34,7 @@ class UpdateView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/service/update"]
@apidocs(
@@ -42,7 +42,7 @@ class UploadView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/service/upload"]
@classmethod
@@ -35,7 +35,7 @@ class InfoView(BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED
ROUTES = ["/api/v1/info"]
@apidocs(
@@ -35,7 +35,7 @@ class MetricsView(BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED
ROUTES = ["/api/v1/metrics"]
@apidocs(
@@ -34,7 +34,7 @@ class RepositoriesView(BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Read
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.READ
ROUTES = ["/api/v1/repositories"]
@apidocs(
@@ -41,8 +41,8 @@ class StatusView(StatusViewGuard, BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Read
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.READ
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL
ROUTES = ["/api/v1/status"]
@apidocs(
@@ -38,7 +38,7 @@ class LoginView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
GET_PERMISSION = POST_PERMISSION = UserAccess.Unauthorized # type: ClassVar[UserAccess]
GET_PERMISSION = POST_PERMISSION = UserAccess.UNAUTHORIZED # type: ClassVar[UserAccess]
ROUTES = ["/api/v1/login"]
@apidocs(
@@ -34,7 +34,7 @@ class LogoutView(BaseView):
POST_PERMISSION(UserAccess): (class attribute) post permissions of self
"""
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized
POST_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED
ROUTES = ["/api/v1/logout"]
@apidocs(
@@ -38,7 +38,7 @@ class LogsView(StatusViewGuard, BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER
ROUTES = ["/api/v2/packages/{package}/logs"]
@apidocs(
@@ -35,7 +35,7 @@ class InfoView(BaseView):
GET_PERMISSION(UserAccess): (class attribute) get permissions of self
"""
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized
GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED
ROUTES = ["/api/v2/info"]
@apidocs(
+9 -9
View File
@@ -38,7 +38,7 @@ from ahriman.core.status.watcher import Watcher
from ahriman.models.repository_id import RepositoryId
from ahriman.web.apispec.info import setup_apispec
from ahriman.web.cors import setup_cors
from ahriman.web.keys import AuthKey, ConfigurationKey, SpawnKey, WatcherKey, WorkersKey
from ahriman.web.keys import AUTH_KEY, CONFIGURATION_KEY, SPAWN_KEY, WATCHER_KEY, WORKERS_KEY
from ahriman.web.middlewares.etag_handler import etag_handler
from ahriman.web.middlewares.exception_handler import exception_handler
from ahriman.web.middlewares.metrics_handler import metrics_handler
@@ -121,7 +121,7 @@ async def _on_shutdown(application: Application) -> None:
Args:
application(Application): web application instance
"""
for watcher in application[WatcherKey].values():
for watcher in application[WATCHER_KEY].values():
await watcher.shutdown()
application.logger.warning("server terminated")
@@ -139,7 +139,7 @@ async def _on_startup(application: Application) -> None:
application.logger.info("server started")
try:
for watcher in application[WatcherKey].values():
for watcher in application[WATCHER_KEY].values():
await watcher.load()
except Exception:
message = "could not load packages"
@@ -156,7 +156,7 @@ def run_server(application: Application) -> None:
"""
application.logger.info("start server")
configuration = application[ConfigurationKey]
configuration = application[CONFIGURATION_KEY]
host = configuration.get("web", "host")
port = configuration.getint("web", "port")
unix_socket = _create_socket(configuration, application)
@@ -201,25 +201,25 @@ def setup_server(configuration: Configuration, spawner: Spawn, repositories: lis
aiohttp_jinja2.setup(application, trim_blocks=True, lstrip_blocks=True, autoescape=True, loader=loader)
application.logger.info("setup configuration")
application[ConfigurationKey] = configuration
application[CONFIGURATION_KEY] = configuration
application.logger.info("setup services")
# package cache
if not repositories:
raise InitializeError("No repositories configured, exiting")
configuration_path, _ = configuration.check_loaded()
application[WatcherKey] = {
application[WATCHER_KEY] = {
repository_id: _create_watcher(configuration_path, repository_id)
for repository_id in repositories
}
# workers cache
application[WorkersKey] = WorkersCache(configuration)
application[WORKERS_KEY] = WorkersCache(configuration)
# process spawner
application[SpawnKey] = spawner
application[SPAWN_KEY] = spawner
application.logger.info("setup authorization")
database = SQLite.load(configuration)
validator = application[AuthKey] = Auth.load(configuration, database)
validator = application[AUTH_KEY] = Auth.load(configuration, database)
if validator.enabled:
from ahriman.web.middlewares.auth_handler import setup_auth
setup_auth(application, configuration, validator)