Guwan
/
ldap-1-backend
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature add (#270)

This commit is contained in:
xiaowu 2023-11-09 22:41:46 +08:00 committed by GitHub
parent ae087f2b38
commit cfa346fe6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yml
View File

@ -107,6 +107,8 @@ ldap:
group-name-modify: false group-name-modify: false
# 是否允许更改用户DN # 是否允许更改用户DN
user-name-modify: false user-name-modify: false
# 默认邮箱后缀
default-email-suffix: "eryajf.net"
# 📢 即便用不到如下三段配置信息，也不要删除，否则会有一些奇怪的错误出现 # 📢 即便用不到如下三段配置信息，也不要删除，否则会有一些奇怪的错误出现
dingtalk: dingtalk:
# 配置获取详细文档参考： http://ldapdoc.eryajf.net/pages/94f43a/ # 配置获取详细文档参考： http://ldapdoc.eryajf.net/pages/94f43a/

19
config/config.go
View File

@ -140,15 +140,16 @@ type RateLimitConfig struct {
} }
type LdapConfig struct { type LdapConfig struct {
Url string `mapstructure:"url" json:"url"` Url string `mapstructure:"url" json:"url"`
MaxConn int `mapstructure:"max-conn" json:"maxConn"` MaxConn int `mapstructure:"max-conn" json:"maxConn"`
BaseDN string `mapstructure:"base-dn" json:"baseDN"` BaseDN string `mapstructure:"base-dn" json:"baseDN"`
AdminDN string `mapstructure:"admin-dn" json:"adminDN"` AdminDN string `mapstructure:"admin-dn" json:"adminDN"`
AdminPass string `mapstructure:"admin-pass" json:"adminPass"` AdminPass string `mapstructure:"admin-pass" json:"adminPass"`
UserDN string `mapstructure:"user-dn" json:"userDN"` UserDN string `mapstructure:"user-dn" json:"userDN"`
UserInitPassword string `mapstructure:"user-init-password" json:"userInitPassword"` UserInitPassword string `mapstructure:"user-init-password" json:"userInitPassword"`
GroupNameModify bool `mapstructure:"group-name-modify" json:"groupNameModify"` GroupNameModify bool `mapstructure:"group-name-modify" json:"groupNameModify"`
UserNameModify bool `mapstructure:"user-name-modify" json:"userNameModify"` UserNameModify bool `mapstructure:"user-name-modify" json:"userNameModify"`
DefaultEmailSuffix string `mapstructure:"default-email-suffix" json:"defaultEmailSuffix"`
} }
type EmailConfig struct { type EmailConfig struct {
Host string `mapstructure:"host" json:"host"` Host string `mapstructure:"host" json:"host"`

7
logic/a_logic.go
View File

@ -96,7 +96,12 @@ func CommonAddUser(user *model.User, groups []*model.Group) error {
user.Introduction = user.Nickname user.Introduction = user.Nickname
} }
if user.Mail == "" { if user.Mail == "" {
user.Mail = user.Username + "@eryajf.net" // 兼容
if len(config.Conf.Ldap.DefaultEmailSuffix) > 0 {
user.Mail = user.Username + "@" + config.Conf.Ldap.DefaultEmailSuffix
} else {
user.Mail = user.Username + "@eryajf.net"
}
} }
if user.JobNumber == "" { if user.JobNumber == "" {
user.JobNumber = "0000" user.JobNumber = "0000"