diff options
| author | James Moger <james.moger@gitblit.com> | 2012-04-25 16:35:40 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-04-25 16:35:40 -0400 |
| commit | d2426e1eb5d07664b5c26c4247fae3325282d60d (patch) | |
| tree | 65d293881c43353d27156928bbc8e9b784824af9 /distrib | |
| parent | 6e15cb51ddcf24c725633c4ab1ff71959b036eb4 (diff) | |
| parent | 7e0ce40e79a193426e8f7b6f22407422634dafe3 (diff) | |
| download | gitblit-d2426e1eb5d07664b5c26c4247fae3325282d60d.tar.gz gitblit-d2426e1eb5d07664b5c26c4247fae3325282d60d.zip | |
Merge jcrygier's LDAP injection defense and displayname/email retrieval
Add LDAP logic to retrieve display name & email address
Add code / test to defend against LDAP injection attacks.
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/gitblit.properties | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties index 9ccd35d6..da662126 100644 --- a/distrib/gitblit.properties +++ b/distrib/gitblit.properties @@ -233,6 +233,28 @@ realm.ldap.groupMemberPattern = (&(objectClass=group)(member=${dn})) # SINCE 1.0.0
realm.ldap.admins= @Git_Admins
+# Attribute(s) on the USER record that indicate their display (or full) name. Leave blank
+# for no mapping available in LDAP
+#
+# This may be a single attribute, or a string of multiple attributes. Examples:
+# displayName - Uses the attribute 'displayName' on the user record
+# ${personalTitle}. ${givenName} ${surname} - Will concatenate the 3
+# attributes together, with a '.' after personalTitle
+#
+# SINCE 1.0.0
+realm.ldap.displayName= displayName
+
+# Attribute(s) on the USER record that indicate their email address. Leave blank
+# for no mapping available in LDAP
+#
+# This may be a single attribute, or a string of multiple attributes. Examples:
+# email - Uses the attribute 'email' on the user record
+# ${givenName}.${surname}@gitblit.com -Will concatenate the 2 attributes
+# together with a '.' and '@' creating something like first.last@gitblit.com
+#
+# SINCE 1.0.0
+realm.ldap.email = email
+
#
# Gitblit Web Settings
#
|