github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(api): filter LDAP password from settings response (#2488)

pull/2493/head
Anthony Lapenna 2018-11-24 08:40:56 +13:00 committed by GitHub
parent 17d63ae3ca
commit d510bbbcfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/http/handler/settings/handler.go
View File

@ -9,6 +9,10 @@ import (
"github.com/portainer/portainer/http/security" "github.com/portainer/portainer/http/security"
) )
func hideFields(settings *portainer.Settings) {
settings.LDAPSettings.Password = ""
}
// Handler is the HTTP handler used to handle settings operations. // Handler is the HTTP handler used to handle settings operations.
type Handler struct { type Handler struct {
*mux.Router *mux.Router

1
api/http/handler/settings/settings_inspect.go
View File

@ -14,5 +14,6 @@ func (handler *Handler) settingsInspect(w http.ResponseWriter, r *http.Request)
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve the settings from the database", err} return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve the settings from the database", err}
} }
hideFields(settings)
return response.JSON(w, settings) return response.JSON(w, settings)
} }

2
api/portainer.go
View File

@ -47,7 +47,7 @@ type (
// LDAPSettings represents the settings used to connect to a LDAP server // LDAPSettings represents the settings used to connect to a LDAP server
LDAPSettings struct { LDAPSettings struct {
ReaderDN string `json:"ReaderDN"` ReaderDN string `json:"ReaderDN"`
Password string `json:"Password"` Password string `json:"Password,omitempty"`
URL string `json:"URL"` URL string `json:"URL"`
TLSConfig TLSConfiguration `json:"TLSConfig"` TLSConfig TLSConfiguration `json:"TLSConfig"`
StartTLS bool `json:"StartTLS"` StartTLS bool `json:"StartTLS"`