3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-06 18:21:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

💥 Change escape character for LDAP

Browse source 
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
This commit is contained in:
mathieu.brunot 2021-03-04 08:00:49 +01:00 • committed by Andrey Antukh
parent 93311b8b98
commit e1ae80583f
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/app/config.clj
View file

@ -70,7 +70,7 @@
:telemetry-enabled false :telemetry-enabled false
:telemetry-uri "https://telemetry.penpot.app/" :telemetry-uri "https://telemetry.penpot.app/"
:ldap-user-query "(|(uid=$username)(mail=$username))" :ldap-user-query "(|(uid=:username)(mail=:username))"
:ldap-attrs-username "uid" :ldap-attrs-username "uid"
:ldap-attrs-email "mail" :ldap-attrs-email "mail"
:ldap-attrs-fullname "cn" :ldap-attrs-fullname "cn"

2
backend/src/app/rpc/mutations/ldap.clj
View file

@ -84,7 +84,7 @@
(defn- get-ldap-user (defn- get-ldap-user
[cpool {:keys [email] :as params}] [cpool {:keys [email] :as params}]
(let [query (-> (cfg/get :ldap-user-query) (let [query (-> (cfg/get :ldap-user-query)
(replace-several "$username" email)) (replace-several ":username" email))
attrs [(cfg/get :ldap-attrs-username) attrs [(cfg/get :ldap-attrs-username)
(cfg/get :ldap-attrs-email) (cfg/get :ldap-attrs-email)

2
docs/05-Configuration-Guide.md
View file

@ -176,7 +176,7 @@ PENPOT_LDAP_BIND_PASSWORD=
PENPOT_LDAP_AUTH_SSL=false PENPOT_LDAP_AUTH_SSL=false
PENPOT_LDAP_AUTH_STARTTLS=false PENPOT_LDAP_AUTH_STARTTLS=false
PENPOT_LDAP_AUTH_BASE_DN= PENPOT_LDAP_AUTH_BASE_DN=
PENPOT_LDAP_AUTH_USER_QUERY=(|(uid=$username)(mail=$username)) PENPOT_LDAP_AUTH_USER_QUERY=(|(uid=:username)(mail=:username))
PENPOT_LDAP_AUTH_USERNAME_ATTRIBUTE=uid PENPOT_LDAP_AUTH_USERNAME_ATTRIBUTE=uid
PENPOT_LDAP_AUTH_EMAIL_ATTRIBUTE=mail PENPOT_LDAP_AUTH_EMAIL_ATTRIBUTE=mail
PENPOT_LDAP_AUTH_FULLNAME_ATTRIBUTE=displayName PENPOT_LDAP_AUTH_FULLNAME_ATTRIBUTE=displayName