Add host:port concatenation and fallback block

Author: Martin

imageroot/bin/discover-ldap

@@ -15,28 +15,45 @@ for var in [
 ]:
     agent.unset_env(var)
 
-if ldap_domain:
+# ------------------------------------------------
+# Get domain info or fallback
+# ------------------------------------------------
+try:
     odom = Ldapproxy().get_domain(ldap_domain)
-    base_dn = odom["base_dn"]
+    assert "host" in odom
+except Exception:
+    # Fallback during restore / missing domain
+    odom = {
+        "host": "127.0.0.1",
+        "port": 20000,
+        "schema": "rfc2307",
+        "base_dn": "dc=semaphore,dc=invalid",
+        "bind_dn": "cn=example,dc=semaphore,dc=invalid",
+        "bind_password": "invalid",
+    }
 
-    agent.set_env("LDAP_HOSTNAME", odom["host"])
-    agent.set_env("LDAP_PORT", str(odom["port"]))
-    agent.set_env("LDAP_SEARCH_BIND_DN", odom["bind_dn"])
-    agent.set_env("LDAP_SEARCH_BIND_PASSWORD", odom["bind_password"])
+base_dn = odom["base_dn"]
+agent.set_env("LDAP_HOSTNAME", odom["host"])
+agent.set_env("LDAP_PORT", str(odom["port"]))
+agent.set_env("LDAP_SEARCH_BIND_DN", odom["bind_dn"])
+agent.set_env("LDAP_SEARCH_BIND_PASSWORD", odom["bind_password"])
 
-    if odom["schema"] == "rfc2307":
-        agent.set_env("LDAP_USER_BASE_DN",  f"ou=People,{base_dn}")
-        agent.set_env("LDAP_GROUP_BASE_DN", f"ou=Groups,{base_dn}")
-        agent.set_env("LDAP_MEMBER_ATTRIBUTE", "memberUid")
-        agent.set_env("LDAP_MEMBER_ATTRIBUTE_TYPE", "uid")
+# Compose host:port for Semaphore
+agent.set_env("SEMAPHORE_LDAP_SERVER", f"{odom['host']}:{odom['port']}")
 
-    elif odom["schema"] == "ad":
-        agent.set_env("LDAP_USER_BASE_DN",  f"cn=Users,{base_dn}")
-        agent.set_env("LDAP_GROUP_BASE_DN", f"cn=Users,{base_dn}")
-        agent.set_env("LDAP_USERNAME_ATTRIBUTE", "samaccountname")
-        agent.set_env("LDAP_USER_SEARCH_FILTER",
-                      "(&(objectClass=top)(objectClass=user)(objectClass=person)(objectClass=organizationalPerson))")
-        agent.set_env("LDAP_GROUP_SEARCH_FILTER",
-                      "(&(objectClass=top)(objectClass=group))")
+# Schema-specific DN & search settings
+if odom["schema"] == "rfc2307":
+    agent.set_env("LDAP_USER_BASE_DN",  f"ou=People,{base_dn}")
+    agent.set_env("LDAP_GROUP_BASE_DN", f"ou=Groups,{base_dn}")
+    agent.set_env("LDAP_MEMBER_ATTRIBUTE", "memberUid")
+    agent.set_env("LDAP_MEMBER_ATTRIBUTE_TYPE", "uid")
+elif odom["schema"] == "ad":
+    agent.set_env("LDAP_USER_BASE_DN",  f"cn=Users,{base_dn}")
+    agent.set_env("LDAP_GROUP_BASE_DN", f"cn=Users,{base_dn}")
+    agent.set_env("LDAP_USERNAME_ATTRIBUTE", "samaccountname")
+    agent.set_env("LDAP_USER_SEARCH_FILTER",
+                  "(&(objectClass=top)(objectClass=user)(objectClass=person)(objectClass=organizationalPerson))")
+    agent.set_env("LDAP_GROUP_SEARCH_FILTER",
+                  "(&(objectClass=top)(objectClass=group))")
 
 agent.dump_env()