ldap-ui 0.9.1__py3-none-any.whl → 0.9.2__py3-none-any.whl

ldap_ui/__init__.py

@@ -1,14 +1 @@
-import uvicorn
-
-from . import settings
-
-__version__ = "0.9.1"
-
-
-def run():
-    uvicorn.run(
-        "ldap_ui.app:app",
-        log_level="info",
-        host="127.0.0.1" if settings.DEBUG else None,
-        port=5000,
-    )
+__version__ = "0.9.2"

ldap_ui/__main__.py

@@ -1,4 +1,69 @@
-from ldap_ui import run
+import click
+import uvicorn
+from uvicorn.main import LEVEL_CHOICES
+
+import ldap_ui
+
+from . import settings
+
+
+def print_version(ctx: click.Context, param: click.Parameter, value: bool) -> None:
+    if value:
+        click.echo(ldap_ui.__version__)
+        ctx.exit()
+
+
+@click.command()
+@click.option(
+    "-h",
+    "--host",
+    type=str,
+    default="127.0.0.1",
+    help="Bind socket to this host.",
+    show_default=True,
+)
+@click.option(
+    "-b",
+    "--base-dn",
+    type=str,
+    default=settings.BASE_DN,
+    help="LDAP base DN. Required unless the BASE_DN environment variable is set.",
+)
+@click.option(
+    "-p",
+    "--port",
+    type=int,
+    default=5000,
+    help="Bind socket to this port. If 0, an available port will be picked.",
+    show_default=True,
+)
+@click.option(
+    "-l",
+    "--log-level",
+    type=LEVEL_CHOICES,
+    default=None,
+    help="Log level. [default: info]",
+    show_default=True,
+)
+@click.option(
+    "--version",
+    is_flag=True,
+    callback=print_version,
+    expose_value=False,
+    is_eager=True,
+    help="Display the current version and exit.",
+)
+def main(base_dn, host, port, log_level):
+    if base_dn:
+        settings.BASE_DN = base_dn
+
+    uvicorn.run(
+        "ldap_ui.app:app",
+        log_level=log_level,
+        host=host,
+        port=port,
+    )
+
 
 if __name__ == "__main__":
-    run()
+    main()

ldap_ui/app.py

@@ -11,10 +11,11 @@ No sessions, no cookies, nothing else.
 import base64
 import binascii
 import contextlib
+import logging
+import sys
 from typing import AsyncGenerator
 
 import ldap
-import uvicorn
 from ldap.schema import SubSchema
 from starlette.applications import Starlette
 from starlette.authentication import (
@@ -37,6 +38,10 @@ from . import settings
 from .ldap_api import api
 from .ldap_helpers import WITH_OPERATIONAL_ATTRS, empty, ldap_connect, unique
 
+if settings.BASE_DN is None:
+    logging.getLogger("ldap-ui").critical("An LDAP base DN is required!")
+    sys.exit(1)
+
 # Force authentication
 UNAUTHORIZED = Response(
     "Invalid credentials",

ldap_ui/settings.py

@@ -14,7 +14,7 @@ SECRET_KEY = os.urandom(16)
 # LDAP settings
 #
 LDAP_URL = config("LDAP_URL", default="ldap:///")
-BASE_DN = config("BASE_DN")  # Always required
+BASE_DN = config("BASE_DN", default=None)
 
 USE_TLS = config(
     "USE_TLS",

{ldap_ui-0.9.1.dist-info → ldap_ui-0.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ldap-ui
-Version: 0.9.1
+Version: 0.9.2
 Summary: A fast and versatile LDAP editor
 Author: dnknth
 License: MIT License
@@ -12,7 +12,7 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.8
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: python-ldap

{ldap_ui-0.9.1.dist-info → ldap_ui-0.9.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
-ldap_ui/__init__.py,sha256=qWn38sHkooVeCw9daRP9jbAi2NLrMetwUD8NaCWPrv4,224
-ldap_ui/__main__.py,sha256=J0Hc3IiwRAjNKeov7tCLgpZJwT2iUHcmXb4UmazRqU4,62
-ldap_ui/app.py,sha256=68__BoGHFJU8HePoTKyYTM8B305s_dYnlKb8e9yWm8I,6312
+ldap_ui/__init__.py,sha256=gqT-BGoeEItda9fICQDvLbxEjWRIBhFJxPxxKvmHLUo,22
+ldap_ui/__main__.py,sha256=XEW0IGh-BZ0MUnzHmLRgnqSee8r0o_oRgcQ_8WSNC0g,1345
+ldap_ui/app.py,sha256=8iYzv92zl6XeqeF8JjaYT-68wgYSrcsq9CQK0O0bsCE,6443
 ldap_ui/ldap_api.py,sha256=ecK8K-7-tkoA2df2dbQT8y61I70r7NukE3BQFNN1BsE,12776
 ldap_ui/ldap_helpers.py,sha256=DRpKtqEX_OvYJBuvzTNi0CcZAu446wwUiOezlkBAxrQ,3045
 ldap_ui/schema.py,sha256=apbdLK_WpED0IzmrdktWTu4ESz8GfdOoJuRicFC84YY,3327
-ldap_ui/settings.py,sha256=qEN2fechOCZ935VAa47cPimQruEq7h-iq9d7ascDtZc,2265
+ldap_ui/settings.py,sha256=PmugPMAmFmNa3bM4XKsur89ELORZ103DxrP7ZbsuopY,2260
 ldap_ui/statics/favicon.ico,sha256=_PMMM_C1ER5cpJTXZcRgISR4igj44kA4u8Trl-Ko3L0,4286
 ldap_ui/statics/index.html,sha256=twUC90MNTfNFpQLiLIwUuU3H6RRDiPY92BnMRgIGRWU,827
 ldap_ui/statics/assets/fontawesome-webfont-B-jkhYfk.woff2,sha256=Kt78vAQefRj88tQXh53FoJmXqmTWdbejxLbOM9oT8_4,77160
@@ -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.1.dist-info/LICENSE.txt,sha256=UpJ0sDIqHxbOtzy1EG4bCHs9R_99ODxxPDK4NZ0g3I0,1042
-ldap_ui-0.9.1.dist-info/METADATA,sha256=uENv_PqySjK3XhZ0pF9kf7FiQ--WDHeHDD0a1--1YWc,6824
-ldap_ui-0.9.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-ldap_ui-0.9.1.dist-info/entry_points.txt,sha256=rJuKzXUTziBohZ3-tt4-WbD2DOO1LHfzwnDm2HdCg84,40
-ldap_ui-0.9.1.dist-info/top_level.txt,sha256=t9Agyig1nDdJuQvx_UVuk1n28pgswc1BIYw8E6pWado,8
-ldap_ui-0.9.1.dist-info/RECORD,,
+ldap_ui-0.9.2.dist-info/LICENSE.txt,sha256=UpJ0sDIqHxbOtzy1EG4bCHs9R_99ODxxPDK4NZ0g3I0,1042
+ldap_ui-0.9.2.dist-info/METADATA,sha256=7NuYPD10C_50VRimJO-besonFetFEETpZmdFm13MSEg,6824
+ldap_ui-0.9.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+ldap_ui-0.9.2.dist-info/entry_points.txt,sha256=TGxMkXYeZP5m5NjZxWmgzITYWhSdj2mR_GGUYmHhGws,50
+ldap_ui-0.9.2.dist-info/top_level.txt,sha256=t9Agyig1nDdJuQvx_UVuk1n28pgswc1BIYw8E6pWado,8
+ldap_ui-0.9.2.dist-info/RECORD,,

ldap_ui-0.9.2.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+ldap-ui = ldap_ui.__main__:main

ldap_ui-0.9.1.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-ldap-ui = ldap_ui:run