cmdbsyncer 4.1.0.dev12__tar.gz → 4.1.0.dev13__tar.gz

{cmdbsyncer-4.1.0.dev12 → cmdbsyncer-4.1.0.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdbsyncer
-Version: 4.1.0.dev12
+Version: 4.1.0.dev13
 Summary: Rule-based modular synchronizer for Checkmk, Netbox, Ansible, I-DOIT, Jira CMDB and 15+ other CMDB/monitoring systems
 Author-email: Kuhn & Ruess GmbH <info@kuhn-ruess.de>
 Maintainer-email: Bastian Kuhn <mail@bastian-kuhn.de>

cmdbsyncer-4.1.0.dev13/application/buildinfo.txt

@@ -0,0 +1 @@
+BUILD_DATE=2026-05-11T13:01:07Z

{cmdbsyncer-4.1.0.dev12 → cmdbsyncer-4.1.0.dev13}/application/changelog/v4.1.md

@@ -93,6 +93,7 @@
 - FEAT: `cmdbsyncer sys self_configure` now creates a default `app.wsgi` so PyPI installs can be served by Apache/mod_wsgi or uWSGI without writing one by hand
 - FIX: `Edit local_config.py` GUI now writes to the same `local_config.py` Python actually imports. PyPI installs previously wrote into site-packages instead of the deployment directory next to `app.wsgi`
 - FIX: `local_config.py` is now found reliably across PyPI console scripts, mod_wsgi / gunicorn and source checkouts — `CRYPTOGRAPHY_KEY` and friends are no longer silently `None`, so Account passwords decrypt correctly. A misplaced deployment now surfaces as a startup warning instead of failing silently
+- FIX: `cmdbsyncer` CLI searches `$CMDBSYNCER_CONFIG_DIR`, the venv parent directory and `/etc/cmdbsyncer/` for `local_config.py` so the binary works regardless of the caller's working directory (cron / systemd / shell aliases). If no `local_config.py` is found the operator now sees a clear stderr message, and any later attempt to decrypt an Account password raises a readable `CRYPTOGRAPHY_KEY is not set` error instead of an opaque `Fernet(None)` traceback
 - FIX: PyPI installs now ship every plugin's `plugin.json` (was only the `.py` files), and the user `plugins/` directory plus `disabled_plugins.json` next to `app.wsgi` are picked up correctly instead of being looked for inside `site-packages`
 - FEAT: Offline installation bundle always ships base, extras and ansible Python dependencies plus the default Ansible playbook collection, and the bundled `install.sh` deploys the playbooks to `/opt/cmdbsyncer/ansible` (override via `ANSIBLE_TARGET`, skip with `SKIP_ANSIBLE=1`, replace existing target with `FORCE=1`)
 - FEAT: New `make release-pre` target ships sequential pre-release builds (`.devN` / `aN` / `bN` / `rcN`) to PyPI without requiring a hand-edit before each upload; `tools/build_offline_bundle.sh --syncer-version 4.1.0.dev3 --enterprise-version 0.3.9.dev1` pins the offline bundle to those pre-releases so QA can test them on air-gapped systems

cmdbsyncer-4.1.0.dev13/application/cli.py

@@ -0,0 +1,78 @@
+"""Entry point for the ``cmdbsyncer`` console script.
+
+Registered via ``[project.scripts]`` in ``pyproject.toml`` so the command is
+available on ``PATH`` after ``pip install cmdbsyncer``. Delegates to Flask's
+Click CLI on the app instance.
+"""
+import os
+import sys
+import warnings
+
+
+def main():
+    """Run the cmdbsyncer Flask Click CLI."""
+    os.environ.setdefault("config", "prod")
+    # Mark the process as a CLI invocation before importing the app factory.
+    # ``application/__init__.py`` and ``application/enterprise.py`` check this
+    # to suppress their startup banner / ECS JSON log pipeline — none of that
+    # noise belongs in front of command output like ``checkmk export_hosts``.
+    os.environ["CMDBSYNCER_CLI"] = "1"
+    # cmdbsyncer needs to find ``local_config.py`` regardless of the
+    # caller's cwd. Source checkouts have it next to ``./cmdbsyncer`` and
+    # were always covered by the cwd injection below; PyPI installs (and
+    # any cron / systemd unit that doesn't set WorkingDirectory) drop it
+    # into the install root (e.g. ``/opt/cmdbsyncer/``) but invoke the
+    # binary from elsewhere — that previously left ``CRYPTOGRAPHY_KEY``
+    # at ``None`` and exploded much later with a "Fernet(None)" TypeError
+    # that pointed nowhere useful. Search a fixed list of well-known
+    # directories and inject the first one that actually contains the
+    # file; cwd stays in the list so source checkouts still win.
+    _config_candidates = []
+    if env_dir := os.environ.get("CMDBSYNCER_CONFIG_DIR"):
+        _config_candidates.append(env_dir)
+    _config_candidates.append(os.getcwd())
+    # ``sys.prefix`` is the venv root (``/opt/cmdbsyncer/venv``); its
+    # parent is the conventional install dir where local_config.py sits.
+    _config_candidates.append(os.path.dirname(sys.prefix))
+    _config_candidates.append("/etc/cmdbsyncer")
+    for _candidate in _config_candidates:
+        if _candidate and os.path.isfile(os.path.join(_candidate, "local_config.py")):
+            if _candidate not in sys.path:
+                sys.path.insert(0, _candidate)
+            break
+    else:
+        # Nothing found. Keep the legacy cwd injection so the import
+        # still attempts and the warning in ``application/__init__.py``
+        # surfaces the searched paths — but tell the operator upfront.
+        if os.getcwd() not in sys.path:
+            sys.path.insert(0, os.getcwd())
+        print(
+            "cmdbsyncer: local_config.py not found in any of "
+            f"{_config_candidates!r}. Set CMDBSYNCER_CONFIG_DIR to "
+            "its directory or run from there. Continuing — encrypted "
+            "account passwords will fail to decrypt without "
+            "CRYPTOGRAPHY_KEY.",
+            file=sys.stderr,
+        )
+    with warnings.catch_warnings():
+        warnings.filterwarnings("ignore", "Fields missing from ruleset", UserWarning)
+        try:
+            from application import app, DISPLAY_VERSION  # pylint: disable=import-outside-toplevel
+            from flask.cli import ScriptInfo  # pylint: disable=import-outside-toplevel
+        except Exception as exp:  # pylint: disable=broad-except
+            print("Cannot load application. Is MongoDB reachable and local_config.py present?")
+            print(exp)
+            sys.exit(1)
+
+        if len(sys.argv) == 1:
+            print(f"CMDB Syncer Version: {DISPLAY_VERSION}")
+            sys.argv.append("--help")
+        # AppGroup commands re-resolve the app via ScriptInfo.load_app(), which
+        # otherwise scans for FLASK_APP / app.py / wsgi.py. PyPI installs have
+        # none of those in the cwd, so hand Click a ScriptInfo that returns the
+        # already-imported app instance directly.
+        app.cli(obj=ScriptInfo(create_app=lambda: app))
+
+
+if __name__ == "__main__":
+    main()

{cmdbsyncer-4.1.0.dev12 → cmdbsyncer-4.1.0.dev13}/application/models/account.py

@@ -144,6 +144,17 @@ class Account(db.Document):
             cryptography_key = key
         else:
             cryptography_key = app.config['CRYPTOGRAPHY_KEY']
+        if not cryptography_key:
+            # Without a key Fernet(None) explodes a few frames deeper with
+            # an opaque "argument should be a bytes-like object or ASCII
+            # string, not 'NoneType'" — surface the real cause instead so
+            # operators can fix their config.
+            raise RuntimeError(
+                "CRYPTOGRAPHY_KEY is not set — local_config.py was not "
+                "loaded. Set CMDBSYNCER_CONFIG_DIR to its directory, run "
+                "cmdbsyncer from that directory, or place "
+                "local_config.py at /etc/cmdbsyncer/."
+            )
         if not self.password_crypted and self.password:
             uncrypted = self.password
             self.password = None

{cmdbsyncer-4.1.0.dev12 → cmdbsyncer-4.1.0.dev13}/cmdbsyncer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdbsyncer
-Version: 4.1.0.dev12
+Version: 4.1.0.dev13
 Summary: Rule-based modular synchronizer for Checkmk, Netbox, Ansible, I-DOIT, Jira CMDB and 15+ other CMDB/monitoring systems
 Author-email: Kuhn & Ruess GmbH <info@kuhn-ruess.de>
 Maintainer-email: Bastian Kuhn <mail@bastian-kuhn.de>

{cmdbsyncer-4.1.0.dev12 → cmdbsyncer-4.1.0.dev13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cmdbsyncer"
-version = "4.1.0.dev12"
+version = "4.1.0.dev13"
 description = "Rule-based modular synchronizer for Checkmk, Netbox, Ansible, I-DOIT, Jira CMDB and 15+ other CMDB/monitoring systems"
 readme = "README.md"
 license = { text = "MIT" }

cmdbsyncer-4.1.0.dev12/application/buildinfo.txt

@@ -1 +0,0 @@
-BUILD_DATE=2026-05-11T12:24:38Z

cmdbsyncer-4.1.0.dev12/application/cli.py

@@ -1,48 +0,0 @@
-"""Entry point for the ``cmdbsyncer`` console script.
-
-Registered via ``[project.scripts]`` in ``pyproject.toml`` so the command is
-available on ``PATH`` after ``pip install cmdbsyncer``. Delegates to Flask's
-Click CLI on the app instance.
-"""
-import os
-import sys
-import warnings
-
-
-def main():
-    """Run the cmdbsyncer Flask Click CLI."""
-    os.environ.setdefault("config", "prod")
-    # Mark the process as a CLI invocation before importing the app factory.
-    # ``application/__init__.py`` and ``application/enterprise.py`` check this
-    # to suppress their startup banner / ECS JSON log pipeline — none of that
-    # noise belongs in front of command output like ``checkmk export_hosts``.
-    os.environ["CMDBSYNCER_CLI"] = "1"
-    # cmdbsyncer expects to be run from a working directory that contains
-    # ``local_config.py``; in source checkouts that file is next to
-    # ``./cmdbsyncer``, so cwd is already on sys.path. PyPI console scripts do
-    # not add cwd automatically — inject it so ``from local_config import ...``
-    # works the same in both layouts.
-    if os.getcwd() not in sys.path:
-        sys.path.insert(0, os.getcwd())
-    with warnings.catch_warnings():
-        warnings.filterwarnings("ignore", "Fields missing from ruleset", UserWarning)
-        try:
-            from application import app, DISPLAY_VERSION  # pylint: disable=import-outside-toplevel
-            from flask.cli import ScriptInfo  # pylint: disable=import-outside-toplevel
-        except Exception as exp:  # pylint: disable=broad-except
-            print("Cannot load application. Is MongoDB reachable and local_config.py present?")
-            print(exp)
-            sys.exit(1)
-
-        if len(sys.argv) == 1:
-            print(f"CMDB Syncer Version: {DISPLAY_VERSION}")
-            sys.argv.append("--help")
-        # AppGroup commands re-resolve the app via ScriptInfo.load_app(), which
-        # otherwise scans for FLASK_APP / app.py / wsgi.py. PyPI installs have
-        # none of those in the cwd, so hand Click a ScriptInfo that returns the
-        # already-imported app instance directly.
-        app.cli(obj=ScriptInfo(create_app=lambda: app))
-
-
-if __name__ == "__main__":
-    main()