better logging when running in docker container

src/auth_server/api.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-import logging
 from typing import Dict, Type, cast
 
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
+from loguru import logger
 from starlette.staticfiles import StaticFiles
 
 from auth_server.config import AuthServerConfig, ConfigurationError, FlowName, load_config
@@ -20,14 +20,11 @@
 __author__ = "lundberg"
 
 
-logger = logging.getLogger(__name__)
-
-
 class AuthServer(FastAPI):
     def __init__(self):
         config = load_config()
         super().__init__(root_path=config.application_root)
-        init_logging(level=config.log_level)
+        init_logging(level=config.log_level, colorize=config.log_color, fmt=config.log_format)
 
         # Load flows
         self.builtin_flow: Dict[FlowName, Type[BaseAuthFlow]] = {

src/auth_server/config.py

@@ -56,6 +56,8 @@ class AuthServerConfig(BaseSettings):
     environment: Environment = Field(default=Environment.PROD)
     testing: bool = False
     log_level: str = Field(default="INFO")
+    log_color: bool = True
+    log_format: Optional[str] = None
     host: str = Field(default="0.0.0.0")
     port: int = Field(default=8080)
     application_root: str = Field(default="")

src/auth_server/db/client.py

@@ -1,17 +1,15 @@
 # -*- coding: utf-8 -*-
-import logging
 from typing import Any, AsyncGenerator, Dict, List, Mapping, Optional, Union
 
 from bson import ObjectId
+from loguru import logger
 from motor.motor_asyncio import AsyncIOMotorClient
 from pymongo import MongoClient, WriteConcern
 
 from auth_server.config import load_config
 
 __author__ = "lundberg"
 
-logger = logging.getLogger(__name__)
-
 
 async def get_motor_client() -> Optional[AsyncIOMotorClient]:
     config = load_config()

src/auth_server/flows.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import annotations
 
-import logging
 from abc import ABC
 from typing import Any, List, Mapping, Optional, Union
 
 from fastapi import HTTPException
 from jwcrypto import jwt
 from jwcrypto.jwk import JWK
+from loguru import logger
 
 from auth_server.config import AuthServerConfig
 from auth_server.context import ContextRequest
@@ -51,8 +51,6 @@
 
 __author__ = "lundberg"
 
-logger = logging.getLogger(__name__)
-
 
 # Use this to go to next flow
 class NextFlowException(HTTPException):

src/auth_server/log.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import logging
 import sys
+from typing import Optional
 
 from loguru import logger
 
@@ -11,6 +12,7 @@
 
 
 class InterceptHandler(logging.Handler):
+    @logger.catch(default=True, onerror=lambda _: sys.exit(1))
     def emit(self, record):
         # Get corresponding Loguru level if it exists
         try:
@@ -33,9 +35,11 @@ def emit(self, record):
 
 def init_logging(
     level: str = "INFO",
-    fmt=LOGURU_FORMAT,
     colorize: bool = True,
+    fmt: Optional[str] = None,
 ) -> None:
+    if fmt is None:
+        fmt = LOGURU_FORMAT
     logger.remove()  # Remove the default handler
     logger.add(sys.stderr, format=fmt, colorize=colorize, level="ERROR", enqueue=True)
     logger.add(sys.stdout, format=fmt, colorize=colorize, level=level, enqueue=True)

src/auth_server/mdq.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import logging
 from base64 import b64encode
 from collections import OrderedDict as _OrderedDict
 from enum import Enum
@@ -9,6 +8,7 @@
 import xmltodict
 from cryptography.hazmat.primitives.hashes import SHA1, SHA256
 from cryptography.x509 import Certificate
+from loguru import logger
 from pydantic import BaseModel, Field, validator
 from pyexpat import ExpatError
 
@@ -21,9 +21,6 @@
 __author__ = "lundberg"
 
 
-logger = logging.getLogger(__name__)
-
-
 class KeyUse(str, Enum):
     SIGNING = "signing"
     ENCRYPTION = "encryption"

src/auth_server/middleware.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
-import logging
-
 from jwcrypto import jws
 from jwcrypto.common import JWException
+from loguru import logger
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.requests import Request
 from starlette.responses import PlainTextResponse
@@ -13,9 +12,6 @@
 __author__ = "lundberg"
 
 
-logger = logging.getLogger(__name__)
-
-
 # middleware needs to return a reponse
 # some background: https://github.com/tiangolo/fastapi/issues/458
 def return_error_response(status_code: int, detail: str):

src/auth_server/proof/common.py

@@ -1,18 +1,16 @@
 # -*- coding: utf-8 -*-
 
-import logging
 from typing import Optional
 
+from loguru import logger
+
 from auth_server.config import ClientKey, ConfigurationError, load_config
 from auth_server.models.gnap import Key
 from auth_server.models.jose import ECJWK, RSAJWK, KeyType, SymmetricJWK
 
 __author__ = "lundberg"
 
 
-logger = logging.getLogger(__name__)
-
-
 async def load_config_key(client_key: ClientKey) -> Key:
     logger.info("Trying to load client key from config")
     logger.debug(f"client_key: {client_key}")

src/auth_server/proof/jws.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
-import logging
 from base64 import urlsafe_b64encode
 from typing import Optional, Union
 
 from cryptography.hazmat.primitives.hashes import SHA256, SHA384, SHA512
 from fastapi import HTTPException
 from jwcrypto import jwk, jws
 from jwcrypto.common import base64url_encode
+from loguru import logger
 from pydantic import ValidationError
 
 from auth_server.config import load_config
@@ -19,9 +19,6 @@
 __author__ = "lundberg"
 
 
-logger = logging.getLogger(__name__)
-
-
 async def choose_hash_alg(alg: SupportedAlgorithms):
     # TODO: what about EdDSA
     if alg.name.endswith("256"):

src/auth_server/proof/mtls.py

@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 
-import logging
 from base64 import b64encode
 
 from cryptography.hazmat.primitives.hashes import SHA256
+from loguru import logger
 
 from auth_server.models.gnap import Key
 from auth_server.utils import load_cert_from_str
 
 __author__ = "lundberg"
 
 
-logger = logging.getLogger(__name__)
-
-
 async def check_mtls_proof(gnap_key: Key, cert: str) -> bool:
     try:
         tls_cert = load_cert_from_str(cert)

src/auth_server/routers/interaction.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 __author__ = "lundberg"
 
-import logging
 from pathlib import Path
 from typing import Optional
 
 from fastapi import APIRouter, BackgroundTasks, Form, HTTPException
+from loguru import logger
 from starlette.responses import HTMLResponse, RedirectResponse, Response
 
 from auth_server.config import load_config
@@ -15,8 +15,6 @@
 from auth_server.templating import TestableJinja2Templates
 from auth_server.utils import get_interaction_hash, push_interaction_finish
 
-logger = logging.getLogger(__name__)
-
 interaction_router = APIRouter(route_class=ContextRequestRoute, prefix="/interaction")
 templates = TestableJinja2Templates(directory=str(Path(__file__).with_name("templates")))
 

src/auth_server/routers/root.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-import logging
 from typing import Optional
 
 from fastapi import APIRouter, Depends, Header, HTTPException
 from jwcrypto.jwk import JWK, JWKSet
+from loguru import logger
 from starlette.responses import Response
 
 from auth_server.config import AuthServerConfig, load_config
@@ -17,8 +17,6 @@
 __author__ = "lundberg"
 
 
-logger = logging.getLogger(__name__)
-
 root_router = APIRouter(route_class=ContextRequestRoute, prefix="")
 
 

src/auth_server/routers/saml2_sp.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 __author__ = "lundberg"
 
-import logging
 import uuid
 from pathlib import Path
 from typing import Optional
 
 from fastapi import APIRouter, Form, HTTPException, Query, Response
+from loguru import logger
 from saml2.metadata import entity_descriptor
 from starlette.responses import HTMLResponse, RedirectResponse
 
@@ -25,8 +25,6 @@
 )
 from auth_server.templating import TestableJinja2Templates
 
-logger = logging.getLogger(__name__)
-
 saml2_router = APIRouter(route_class=ContextRequestRoute, prefix="/saml2")
 templates = TestableJinja2Templates(directory=str(Path(__file__).with_name("templates")))
 

src/auth_server/routers/status.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import asyncio
-import logging
 
 from fastapi import APIRouter
+from loguru import logger
 from pymongo.errors import ConnectionFailure
 
 from auth_server.config import load_config
@@ -12,8 +12,6 @@
 __author__ = "lundberg"
 
 
-logger = logging.getLogger(__name__)
-
 status_router = APIRouter(prefix="/status")
 
 

src/auth_server/testing.py

@@ -30,7 +30,6 @@
 from __future__ import annotations
 
 import atexit
-import logging
 import random
 import shutil
 import subprocess
@@ -39,15 +38,14 @@
 from abc import ABC, abstractmethod
 from typing import Any, Optional, Sequence, Type, cast
 
+from loguru import logger
 from pymongo import MongoClient
 from pymongo.errors import ConnectionFailure
 
 from auth_server.time_utils import utc_now
 
 __author__ = "lundberg"
 
-logger = logging.getLogger(__name__)
-
 
 class TemporaryInstance(ABC):
     """Singleton to manage a temporary instance of something needed when testing.

src/auth_server/tls_fed_auth.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import base64
 import json
-import logging
 from datetime import datetime, timedelta
 from pathlib import Path
 from typing import List, Mapping, Optional
@@ -12,6 +11,7 @@
 from cryptography.hazmat.primitives.hashes import SHA256
 from cryptography.x509 import load_pem_x509_certificate
 from jwcrypto import jwk, jws
+from loguru import logger
 from pydantic import BaseModel, ValidationError
 
 from auth_server.config import load_config
@@ -23,8 +23,6 @@
 
 __author__ = "lundberg"
 
-logger = logging.getLogger(__name__)
-
 
 class MetadataSource(BaseModel):
     issued_at: datetime

src/auth_server/utils.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import importlib
 import json
-import logging
 from base64 import urlsafe_b64encode
 from functools import lru_cache
 from typing import Any, Callable, Generator, Mapping, Sequence, Union
@@ -13,14 +12,14 @@
 from cryptography.hazmat.primitives.serialization import Encoding
 from cryptography.x509 import Certificate, load_pem_x509_certificate
 from jwcrypto import jwk
+from loguru import logger
 
 from auth_server.config import ConfigurationError, load_config
 
 __author__ = "lundberg"
 
-from auth_server.models.gnap import HashMethod
 
-logger = logging.getLogger(__name__)
+from auth_server.models.gnap import HashMethod
 
 
 @lru_cache()