diff --git a/builtin/credential/ldap/backend.go b/builtin/credential/ldap/backend.go index b2585fd8ee..693b735d0e 100644 --- a/builtin/credential/ldap/backend.go +++ b/builtin/credential/ldap/backend.go @@ -3,11 +3,12 @@ package ldap import ( "fmt" + "strings" + "github.com/go-ldap/ldap" "github.com/hashicorp/vault/helper/mfa" "github.com/hashicorp/vault/logical" "github.com/hashicorp/vault/logical/framework" - "strings" ) func Factory(conf *logical.BackendConfig) (logical.Backend, error) { @@ -20,13 +21,7 @@ func Backend() *framework.Backend { Help: backendHelp, PathsSpecial: &logical.Paths{ - Root: append([]string{ - "config", - "groups/*", - "users/*", - }, - mfa.MFARootPaths()..., - ), + Root: mfa.MFARootPaths(), Unauthenticated: []string{ "login/*", @@ -195,7 +190,7 @@ func getBindDN(cfg *ConfigEntry, c *ldap.Conn, username string) (string, error) return bindDN, nil } -func getUserDN(cfg *ConfigEntry,c *ldap.Conn, bindDN string) (string , error) { +func getUserDN(cfg *ConfigEntry, c *ldap.Conn, bindDN string) (string, error) { userDN := "" if cfg.UPNDomain != "" { // Find the distinguished name for the user if userPrincipalName used for login @@ -276,7 +271,7 @@ func getLdapGroups(cfg *ConfigEntry, c *ldap.Conn, userDN string, username strin } for _, rdn := range dn.RDNs { for _, rdnTypeAndValue := range rdn.Attributes { - if strings.EqualFold(rdnTypeAndValue.Type, "CN" ) { + if strings.EqualFold(rdnTypeAndValue.Type, "CN") { ldapMap[rdnTypeAndValue.Value] = true } } diff --git a/builtin/logical/aws/backend.go b/builtin/logical/aws/backend.go index 721a4c382a..29cc9e9931 100644 --- a/builtin/logical/aws/backend.go +++ b/builtin/logical/aws/backend.go @@ -17,12 +17,6 @@ func Backend() *framework.Backend { b.Backend = &framework.Backend{ Help: strings.TrimSpace(backendHelp), - PathsSpecial: &logical.Paths{ - Root: []string{ - "config/*", - }, - }, - Paths: []*framework.Path{ pathConfigRoot(), pathConfigLease(&b), diff --git a/builtin/logical/consul/backend.go b/builtin/logical/consul/backend.go index 5a8c66b430..7442eb6607 100644 --- a/builtin/logical/consul/backend.go +++ b/builtin/logical/consul/backend.go @@ -12,12 +12,6 @@ func Factory(conf *logical.BackendConfig) (logical.Backend, error) { func Backend() *framework.Backend { var b backend b.Backend = &framework.Backend{ - PathsSpecial: &logical.Paths{ - Root: []string{ - "config/*", - }, - }, - Paths: []*framework.Path{ pathConfigAccess(), pathRoles(), diff --git a/builtin/logical/mysql/backend.go b/builtin/logical/mysql/backend.go index b80574f87e..70e6e33992 100644 --- a/builtin/logical/mysql/backend.go +++ b/builtin/logical/mysql/backend.go @@ -20,12 +20,6 @@ func Backend() *framework.Backend { b.Backend = &framework.Backend{ Help: strings.TrimSpace(backendHelp), - PathsSpecial: &logical.Paths{ - Root: []string{ - "config/*", - }, - }, - Paths: []*framework.Path{ pathConfigConnection(&b), pathConfigLease(&b), diff --git a/builtin/logical/postgresql/backend.go b/builtin/logical/postgresql/backend.go index 7aee50487e..85cf2d1fff 100644 --- a/builtin/logical/postgresql/backend.go +++ b/builtin/logical/postgresql/backend.go @@ -19,12 +19,6 @@ func Backend() *framework.Backend { b.Backend = &framework.Backend{ Help: strings.TrimSpace(backendHelp), - PathsSpecial: &logical.Paths{ - Root: []string{ - "config/*", - }, - }, - Paths: []*framework.Path{ pathConfigConnection(&b), pathConfigLease(&b), diff --git a/builtin/logical/ssh/backend.go b/builtin/logical/ssh/backend.go index c95392855c..d23360b2c3 100644 --- a/builtin/logical/ssh/backend.go +++ b/builtin/logical/ssh/backend.go @@ -35,10 +35,6 @@ func Backend(conf *logical.BackendConfig) (*framework.Backend, error) { Help: strings.TrimSpace(backendHelp), PathsSpecial: &logical.Paths{ - Root: []string{ - "config/*", - "keys/*", - }, Unauthenticated: []string{ "verify", }, diff --git a/builtin/logical/ssh/backend_test.go b/builtin/logical/ssh/backend_test.go index 1a54c1001e..894af911eb 100644 --- a/builtin/logical/ssh/backend_test.go +++ b/builtin/logical/ssh/backend_test.go @@ -78,10 +78,6 @@ func createBackend(conf *logical.BackendConfig) (*backend, error) { Help: strings.TrimSpace(backendHelp), PathsSpecial: &logical.Paths{ - Root: []string{ - "config/*", - "keys/*", - }, Unauthenticated: []string{ "verify", },