3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-07 14:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 System start and stop without LDAP connection

Browse source
This commit is contained in:
Vitaly Kornilov 2020-07-25 00:13:04 +03:00 • committed by Andrey Antukh
parent 272c27061d
commit f2c4ff7518
1 changed files with 45 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backend/src/uxbox/http/auth/ldap.clj
View file

@ -6,15 +6,17 @@
[uxbox.common.exceptions :as ex] [uxbox.common.exceptions :as ex]
[uxbox.config :as cfg] [uxbox.config :as cfg]
[uxbox.services.mutations :as sm] [uxbox.services.mutations :as sm]
[uxbox.http.session :as session])) [uxbox.http.session :as session]
[clojure.tools.logging :as log]))
(defn replace-several [s & {:as replacements}] (defn replace-several [s & {:as replacements}]
(reduce-kv clojure.string/replace s replacements)) (reduce-kv clojure.string/replace s replacements))
(defstate ldap-pool (defstate *ldap-pool
:start (client/connect (merge :start (delay
{:host {:address (:ldap-auth-host cfg/config) (try
(client/connect (merge {:host {:address (:ldap-auth-host cfg/config)
:port (:ldap-auth-port cfg/config)}} :port (:ldap-auth-port cfg/config)}}
(-> cfg/config (-> cfg/config
(select-keys [:ldap-auth-ssl (select-keys [:ldap-auth-ssl
@ -25,11 +27,15 @@
:ldap-auth-starttls :startTLS? :ldap-auth-starttls :startTLS?
:ldap-bind-dn :bind-dn :ldap-bind-dn :bind-dn
:ldap-bind-password :password})))) :ldap-bind-password :password}))))
:stop (client/close ldap-pool)) (catch Exception e
(log/errorf e "Cannot connect to LDAP %s:%s"
(:ldap-auth-host cfg/config) (:ldap-auth-port cfg/config)))))
:stop (when (realized? *ldap-pool)
(some-> *ldap-pool deref (client/close))))
(defn- auth-with-ldap [username password] (defn- auth-with-ldap [username password]
(let [conn (client/get-connection ldap-pool) (when-let [conn (some-> *ldap-pool deref (client/get-connection))]
user-search-query (replace-several (:ldap-auth-user-query cfg/config) (let [user-search-query (replace-several (:ldap-auth-user-query cfg/config)
"$username" username) "$username" username)
user-attributes (-> cfg/config user-attributes (-> cfg/config
(select-keys [:ldap-auth-username-attribute (select-keys [:ldap-auth-username-attribute
@ -51,7 +57,7 @@
(set/rename-keys user-entry {(keyword (:ldap-auth-avatar-attribute cfg/config)) :photo (set/rename-keys user-entry {(keyword (:ldap-auth-avatar-attribute cfg/config)) :photo
(keyword (:ldap-auth-fullname-attribute cfg/config)) :fullname (keyword (:ldap-auth-fullname-attribute cfg/config)) :fullname
(keyword (:ldap-auth-email-attribute cfg/config)) :email})) (keyword (:ldap-auth-email-attribute cfg/config)) :email}))
(finally (client/release-connection ldap-pool conn))))) (finally (client/release-connection @*ldap-pool conn))))))
(defn auth [req] (defn auth [req]
(let [data (:body-params req) (let [data (:body-params req)