ldap-ui 0.9.3__py3-none-any.whl → 0.9.5__py3-none-any.whl

ldap_ui/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.3"
+__version__ = "0.9.5"

ldap_ui/__main__.py

@@ -1,5 +1,9 @@
+import logging
+
 import click
 import uvicorn
+from uvicorn.config import LOG_LEVELS
+from uvicorn.logging import ColourizedFormatter
 from uvicorn.main import LEVEL_CHOICES
 
 import ldap_ui
@@ -41,7 +45,7 @@ def print_version(ctx: click.Context, param: click.Parameter, value: bool) -> No
     "-l",
     "--log-level",
     type=LEVEL_CHOICES,
-    default=None,
+    default="info",
     help="Log level. [default: info]",
     show_default=True,
 )
@@ -54,12 +58,16 @@ def print_version(ctx: click.Context, param: click.Parameter, value: bool) -> No
     help="Display the current version and exit.",
 )
 def main(base_dn, host, port, log_level):
-    if base_dn:
+    logging.basicConfig(level=LOG_LEVELS[log_level])
+    rootHandler = logging.getLogger().handlers[0]
+    rootHandler.setFormatter(ColourizedFormatter(fmt="%(levelprefix)s %(message)s"))
+
+    if base_dn is not None:
         settings.BASE_DN = base_dn
 
     uvicorn.run(
         "ldap_ui.app:app",
-        log_level=log_level,
+        log_level=logging.INFO,
         host=host,
         port=port,
     )

ldap_ui/app.py

@@ -41,10 +41,12 @@ from .ldap_helpers import WITH_OPERATIONAL_ATTRS, empty, ldap_connect, unique
 
 LOG = logging.getLogger("ldap-ui")
 
-if settings.BASE_DN is None:
+if not settings.BASE_DN:
     LOG.critical("An LDAP base DN is required!")
     sys.exit(1)
 
+LOG.debug("Base DN: %s", settings.BASE_DN)
+
 # Force authentication
 UNAUTHORIZED = Response(
     "Invalid credentials",
@@ -96,8 +98,10 @@ class LdapConnectionMiddleware(BaseHTTPMiddleware):
             return UNAUTHORIZED
 
         except ldap.LDAPError as err:
+            msg = ldap_exception_message(err)
+            LOG.error(msg)
             return PlainTextResponse(
-                ldap_exception_message(err),
+                msg,
                 status_code=500,
             )
 
@@ -155,6 +159,10 @@ class CacheBustingMiddleware(BaseHTTPMiddleware):
 async def http_exception(_request: Request, exc: HTTPException) -> Response:
     "Send error responses"
     assert exc.status_code >= 400
+    if exc.status_code < 500:
+        LOG.warning(exc.detail)
+    else:
+        LOG.error(exc.detail)
     return PlainTextResponse(
         exc.detail,
         status_code=exc.status_code,
@@ -169,7 +177,7 @@ async def forbidden(_request: Request, exc: ldap.LDAPError) -> Response:
 
 async def http_422(_request: Request, e: ValidationError) -> Response:
     "HTTP 422 Unprocessable Entity"
-    LOG.exception("Invalid request body", exc_info=e)
+    LOG.warn("Invalid request body", exc_info=e)
     return Response(repr(e), status_code=422)
 
 

{ldap_ui-0.9.3.dist-info → ldap_ui-0.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ldap-ui
-Version: 0.9.3
+Version: 0.9.5
 Summary: A fast and versatile LDAP editor
 Author: dnknth
 License: MIT License

{ldap_ui-0.9.3.dist-info → ldap_ui-0.9.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
-ldap_ui/__init__.py,sha256=xKd3pzbczuMsdB08eLAOqZDUd_q1IRxwZ_ccAFL4c4A,22
-ldap_ui/__main__.py,sha256=RzzkUuwqEk9bPG9pPaBZHA6EvFhXFKI89cF7jdX9RPw,1345
-ldap_ui/app.py,sha256=2gy0khq8whbrxJbA-jNo2Ss7oiW-XxQKWM6Jbxp5d7I,6759
+ldap_ui/__init__.py,sha256=ORAtCCI2THBDcdzIbh6oBsoshDvkkmXUWpmO4Q5McAk,22
+ldap_ui/__main__.py,sha256=w-k8oMOjFrcBd9vsOp3BbIqnMdYPZrz1Y5T5Nd-ZPrk,1653
+ldap_ui/app.py,sha256=I_JuRLYYy-zeMzvDMqVQMshzP_PFDLMAMlFoRgEgR6M,6945
 ldap_ui/ldap_api.py,sha256=l6Wnjzm8ycaY-xXT2JNuHTTvLEsOEXGJnJhDdD72N5Q,13267
 ldap_ui/ldap_helpers.py,sha256=DRpKtqEX_OvYJBuvzTNi0CcZAu446wwUiOezlkBAxrQ,3045
 ldap_ui/schema.py,sha256=apbdLK_WpED0IzmrdktWTu4ESz8GfdOoJuRicFC84YY,3327
@@ -16,9 +16,9 @@ ldap_ui/statics/assets/index-CA45Sb-q.js,sha256=qejoldzV9wbUVar1ljURYwyTb2DYn3HQ
 ldap_ui/statics/assets/index-CA45Sb-q.js.gz,sha256=1yJTHdcLZLU2d6DkPKbmNEFiOlPo7vIWXYyg_fidSdE,43710
 ldap_ui/statics/assets/index-DlTKbnmq.css,sha256=Rpthz_HvUybqmodfPCnOXFsSwGd7v8hhh-p-duAzf1E,48119
 ldap_ui/statics/assets/index-DlTKbnmq.css.gz,sha256=Ctq3hMh_BBVt9zsh9CYlHpVtDDHanicyGPAdcGXIFXw,11532
-ldap_ui-0.9.3.dist-info/LICENSE.txt,sha256=UpJ0sDIqHxbOtzy1EG4bCHs9R_99ODxxPDK4NZ0g3I0,1042
-ldap_ui-0.9.3.dist-info/METADATA,sha256=tDswFFkkDqk_wc40dnfq455_lWXmUmaGFntAgNcbiQc,7557
-ldap_ui-0.9.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-ldap_ui-0.9.3.dist-info/entry_points.txt,sha256=TGxMkXYeZP5m5NjZxWmgzITYWhSdj2mR_GGUYmHhGws,50
-ldap_ui-0.9.3.dist-info/top_level.txt,sha256=t9Agyig1nDdJuQvx_UVuk1n28pgswc1BIYw8E6pWado,8
-ldap_ui-0.9.3.dist-info/RECORD,,
+ldap_ui-0.9.5.dist-info/LICENSE.txt,sha256=UpJ0sDIqHxbOtzy1EG4bCHs9R_99ODxxPDK4NZ0g3I0,1042
+ldap_ui-0.9.5.dist-info/METADATA,sha256=H0qL_U6JgHRSyKW5aK_vUkfULMjjM0abbJQmHR8IKC4,7557
+ldap_ui-0.9.5.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+ldap_ui-0.9.5.dist-info/entry_points.txt,sha256=TGxMkXYeZP5m5NjZxWmgzITYWhSdj2mR_GGUYmHhGws,50
+ldap_ui-0.9.5.dist-info/top_level.txt,sha256=t9Agyig1nDdJuQvx_UVuk1n28pgswc1BIYw8E6pWado,8
+ldap_ui-0.9.5.dist-info/RECORD,,