Merge branch 'main' of github.com:didi/nightingale

This commit is contained in:
Ulric Qin 2022-01-08 17:52:42 +08:00
commit dcee4677ed
4 changed files with 17 additions and 2 deletions

View File

@ -93,6 +93,8 @@ AuthFilter = "(&(uid=%s))"
CoverAttributes = true
TLS = false
StartTLS = true
# ldap user default roles
DefaultRoles = ["Standard"]
[LDAP.Attributes]
Nickname = "cn"

View File

@ -259,10 +259,14 @@ func LdapLogin(username, pass string) (*User, error) {
now := time.Now().Unix()
if len(config.C.LDAP.DefaultRoles) == 0 {
config.C.LDAP.DefaultRoles = []string{"Standard"}
}
user.Password = "******"
user.Portrait = ""
user.Roles = "Standard"
user.RolesLst = []string{"Standard"}
user.Roles = strings.Join(config.C.LDAP.DefaultRoles, " ")
user.RolesLst = config.C.LDAP.DefaultRoles
user.Contacts = []byte("{}")
user.CreateAt = now
user.UpdateAt = now

View File

@ -19,6 +19,7 @@ type LdapSection struct {
CoverAttributes bool
TLS bool
StartTLS bool
DefaultRoles []string
}
type LdapAttributes struct {

View File

@ -238,5 +238,13 @@ func configRoute(r *gin.Engine, version string) {
{
service.Any("/prometheus/*url", prometheusProxy)
service.POST("/users", userAddPost)
service.GET("/targets", targetGets)
service.DELETE("/targets", targetDel)
service.GET("/targets/tags", targetGetTags)
service.POST("/targets/tags", targetBindTags)
service.DELETE("/targets/tags", targetUnbindTags)
service.PUT("/targets/note", targetUpdateNote)
service.PUT("/targets/bgid", targetUpdateBgid)
}
}