change log

Author: unknwon

en-US/features/authentication.md

@@ -92,6 +92,24 @@ Both the LDAP via BindDN and the simple auth LDAP share the following fields:
   - Example: `(&(objectClass=posixAccount)(cn=%s))`
   - Example: `(&(objectClass=posixAccount)(uid=%s))`
 
+**Verify group membership in LDAP** uses the following fields:
+
+* Group Search Base (optional)
+    * The LDAP DN used for groups.
+    * Example: `ou=group,dc=mydomain,dc=com`
+
+* Group Name Filter (optional)
+    * An LDAP filter declaring how to find valid groups in the above DN.
+    * Example: `(|(cn=gogs_users)(cn=admins))`
+
+* User Attribute in Group (optional)
+    * Which user LDAP attribute is listed in the group.
+    * Example: `uid`
+
+* Group Attribute for User (optional)
+    * Which group LDAP attribute contains an array above user attribute names.
+    * Example: `memberUid`
+
 ## PAM
 
 To configure this you just need to set the 'PAM Service Name' to a filename in `/etc/pam.d/`.

en-US/intro/change_log.md

@@ -14,6 +14,7 @@ name: Changelog
 #### Features
 
 - Support two-factor authentication [#945](https://github.com/gogits/gogs/issues/945)
+- Support filter by group membership for LDAP [#4398](https://github.com/gogits/gogs/pull/4398)
 
 #### Improvements
 

zh-CN/features/authentication.md

@@ -91,3 +91,21 @@ name: 授权认证
     form.
   - Example: `(&(objectClass=posixAccount)(cn=%s))`
   - Example: `(&(objectClass=posixAccount)(uid=%s))`
+
+**验证组成员** 需要填充以下字段：
+
+* 组搜索基准 DN（可选）
+    * The LDAP DN used for groups.
+    * Example: `ou=group,dc=mydomain,dc=com`
+
+* 组名称过滤（可选）
+    * An LDAP filter declaring how to find valid groups in the above DN.
+    * Example: `(|(cn=gogs_users)(cn=admins))`
+
+* 包含用户的组属性（可选）
+    * Which group LDAP attribute contains an array above user attribute names.
+    * Example: `memberUID`
+
+* 组内用户属性（可选）
+    * Which user LDAP attribute is listed in the group.
+    * Example: `uid`

zh-CN/intro/change_log.md

@@ -14,6 +14,7 @@ name: 变更日志
 #### 新增特性
 
 - 支持两步验证登录 [#945](https://github.com/gogits/gogs/issues/945)
+- 支持 LDAP 登录时验证组成员身份 [#4398](https://github.com/gogits/gogs/pull/4398)
 
 #### 功能改进