Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix problem with lowercased config map variables #8

Closed
wants to merge 2 commits into from
Closed

Fix problem with lowercased config map variables #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
354d67d
Fix problem with lowercased config map variables
c35sys Aug 7, 2018
cd78806
Fix tests with lowercased config map variables
c35sys Aug 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions builtin/authenticator/ldap/Authenticator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ type Authenticator struct {
// Init method is used to ingest config of Authenticator
func (a *Authenticator) Init(config map[string]string) error {
neededEntries := []string{
"ldapAddr",
"ldapPort",
"ldapTLS",
"ldapTLSVerify",
"ldapBindUser",
"ldapBindPassword",
"ldapBase",
"ldapSearch",
"ldapaddr",
"ldapport",
"ldaptls",
"ldaptlsverify",
"ldapbinduser",
"ldapbindpassword",
"ldapbase",
"ldapsearch",
}

var missingEntriesLst []string
Expand All @@ -53,26 +53,26 @@ func (a *Authenticator) Init(config map[string]string) error {
}

// Conversions
port, err := strconv.Atoi(config["ldapPort"])
port, err := strconv.Atoi(config["ldapport"])
if err != nil {
return err
}
useTLS, err := strconv.ParseBool(config["ldapTLS"])
useTLS, err := strconv.ParseBool(config["ldaptls"])
if err != nil {
return err
}
tlsVerify, err := strconv.ParseBool(config["ldapTLSVerify"])
tlsVerify, err := strconv.ParseBool(config["ldaptlsverify"])
if err != nil {
return err
}

a.Address = config["ldapAddr"]
a.Address = config["ldapaddr"]
a.Port = port
a.UseTLS = useTLS
a.BindUser = config["ldapBindUser"]
a.BindPassword = config["ldapBindPassword"]
a.SearchBase = config["ldapBase"]
a.SearchStr = config["ldapSearch"]
a.BindUser = config["ldapbinduser"]
a.BindPassword = config["ldapbindpassword"]
a.SearchBase = config["ldapbase"]
a.SearchStr = config["ldapsearch"]
a.TLSVerify = tlsVerify

return nil
Expand Down
60 changes: 30 additions & 30 deletions builtin/authenticator/ldap/Authenticator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,28 @@ func TestAuthenticatorInit(t *testing.T) {
{
map[string]string{},
Authenticator{},
"Missing config entries (ldapAddr, ldapPort, ldapTLS, ldapTLSVerify, ldapBindUser, ldapBindPassword, ldapBase, ldapSearch) for Authenticator",
"Missing config entries (ldapaddr, ldapport, ldaptls, ldaptlsverify, ldapbinduser, ldapbindpassword, ldapbase, ldapsearch) for Authenticator",
},
{
map[string]string{"ldapAddr": "127.0.0.1"},
map[string]string{"ldapaddr": "127.0.0.1"},
Authenticator{},
"Missing config entries (ldapPort, ldapTLS, ldapTLSVerify, ldapBindUser, ldapBindPassword, ldapBase, ldapSearch) for Authenticator",
"Missing config entries (ldapport, ldaptls, ldaptlsverify, ldapbinduser, ldapbindpassword, ldapbase, ldapsearch) for Authenticator",
},
{
map[string]string{"ldapAddr": "127.0.0.1", "ldapSearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))"},
map[string]string{"ldapaddr": "127.0.0.1", "ldapsearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))"},
Authenticator{},
"Missing config entries (ldapPort, ldapTLS, ldapTLSVerify, ldapBindUser, ldapBindPassword, ldapBase) for Authenticator",
"Missing config entries (ldapport, ldaptls, ldaptlsverify, ldapbinduser, ldapbindpassword, ldapbase) for Authenticator",
},
{
map[string]string{
"ldapAddr": "127.0.0.1",
"ldapPort": "636",
"ldapTLS": "True",
"ldapTLSVerify": "True",
"ldapBindUser": "binduser",
"ldapBindPassword": "bindpassword",
"ldapBase": "DC=fake,DC=org",
"ldapSearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
"ldapaddr": "127.0.0.1",
"ldapport": "636",
"ldaptls": "True",
"ldaptlsverify": "True",
"ldapbinduser": "binduser",
"ldapbindpassword": "bindpassword",
"ldapbase": "DC=fake,DC=org",
"ldapsearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
},
Authenticator{
Address: "127.0.0.1",
Expand All @@ -75,14 +75,14 @@ func TestAuthenticatorInit(t *testing.T) {
},
{
map[string]string{
"ldapAddr": "myldapserver.local",
"ldapPort": "389",
"ldapTLS": "False",
"ldapTLSVerify": "False",
"ldapBindUser": "binduser",
"ldapBindPassword": "bindpassword",
"ldapBase": "DC=fake,DC=org",
"ldapSearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
"ldapaddr": "myldapserver.local",
"ldapport": "389",
"ldaptls": "False",
"ldaptlsverify": "False",
"ldapbinduser": "binduser",
"ldapbindpassword": "bindpassword",
"ldapbase": "DC=fake,DC=org",
"ldapsearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
},
Authenticator{
Address: "myldapserver.local",
Expand All @@ -98,17 +98,17 @@ func TestAuthenticatorInit(t *testing.T) {
},
{
map[string]string{
"ldapAddr": "myldapserver.local",
"ldapPort": "",
"ldapTLS": "False",
"ldapTLSVerify": "False",
"ldapBindUser": "binduser",
"ldapBindPassword": "",
"ldapBase": "DC=fake,DC=org",
"ldapSearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
"ldapaddr": "myldapserver.local",
"ldapport": "",
"ldaptls": "False",
"ldaptlsverify": "False",
"ldapbinduser": "binduser",
"ldapbindpassword": "",
"ldapbase": "DC=fake,DC=org",
"ldapsearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
},
Authenticator{},
"Missing config entries (ldapPort, ldapBindPassword) for Authenticator",
"Missing config entries (ldapport, ldapbindpassword) for Authenticator",
},
}

Expand Down
16 changes: 8 additions & 8 deletions builtin/authenticator/vault/Authenticator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ type Authenticator struct {
// Init method is used to ingest config of Authenticator
func (v *Authenticator) Init(config map[string]string) error {
neededEntries := []string{
"vaultAddr",
"vaultPort",
"vaultTLS",
"vaultPath",
"vaultaddr",
"vaultport",
"vaulttls",
"vaultpath",
}

for _, entry := range neededEntries {
Expand All @@ -34,19 +34,19 @@ func (v *Authenticator) Init(config map[string]string) error {
}

// Conversions
port, err := strconv.Atoi(config["vaultPort"])
port, err := strconv.Atoi(config["vaultport"])
if err != nil {
return err
}
useTLS, err := strconv.ParseBool(config["vaultTLS"])
useTLS, err := strconv.ParseBool(config["vaulttls"])
if err != nil {
return err
}

v.Address = config["vaultAddr"]
v.Address = config["vaultaddr"]
v.Port = port
v.UseTLS = useTLS
v.Path = config["vaultPath"]
v.Path = config["vaultpath"]

var scheme string
if v.UseTLS {
Expand Down
32 changes: 16 additions & 16 deletions builtin/principals/ldap/Principals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ type Principals struct {
// Init method is used to ingest config of Principals
func (p *Principals) Init(config map[string]string) error {
neededEntries := []string{
"ldapAddr",
"ldapPort",
"ldapTLS",
"ldapTLSVerify",
"ldapBindUser",
"ldapBindPassword",
"ldapBase",
"ldapSearch",
"ldapaddr",
"ldapport",
"ldaptls",
"ldaptlsverify",
"ldapbinduser",
"ldapbindpassword",
"ldapbase",
"ldapsearch",
}

var missingEntriesLst []string
Expand All @@ -55,26 +55,26 @@ func (p *Principals) Init(config map[string]string) error {
}

// Conversions
port, err := strconv.Atoi(config["ldapPort"])
port, err := strconv.Atoi(config["ldapport"])
if err != nil {
return err
}
useTLS, err := strconv.ParseBool(config["ldapTLS"])
useTLS, err := strconv.ParseBool(config["ldaptls"])
if err != nil {
return err
}
tlsVerify, err := strconv.ParseBool(config["ldapTLSVerify"])
tlsVerify, err := strconv.ParseBool(config["ldaptlsverify"])
if err != nil {
return err
}

p.Address = config["ldapAddr"]
p.Address = config["ldapaddr"]
p.Port = port
p.UseTLS = useTLS
p.BindUser = config["ldapBindUser"]
p.BindPassword = config["ldapBindPassword"]
p.SearchBase = config["ldapBase"]
p.SearchStr = config["ldapSearch"]
p.BindUser = config["ldapbinduser"]
p.BindPassword = config["ldapbindpassword"]
p.SearchBase = config["ldapbase"]
p.SearchStr = config["ldapsearch"]
p.TLSVerify = tlsVerify

return nil
Expand Down
60 changes: 30 additions & 30 deletions builtin/principals/ldap/Principals_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,28 +92,28 @@ func TestPrincipalsInit(t *testing.T) {
{
map[string]string{},
Principals{},
"Missing config entries (ldapAddr, ldapPort, ldapTLS, ldapTLSVerify, ldapBindUser, ldapBindPassword, ldapBase, ldapSearch) for Principals",
"Missing config entries (ldapaddr, ldapport, ldaptls, ldaptlsverify, ldapbinduser, ldapbindpassword, ldapbase, ldapsearch) for Principals",
},
{
map[string]string{"ldapAddr": "127.0.0.1"},
map[string]string{"ldapaddr": "127.0.0.1"},
Principals{},
"Missing config entries (ldapPort, ldapTLS, ldapTLSVerify, ldapBindUser, ldapBindPassword, ldapBase, ldapSearch) for Principals",
"Missing config entries (ldapport, ldaptls, ldaptlsverify, ldapbinduser, ldapbindpassword, ldapbase, ldapsearch) for Principals",
},
{
map[string]string{"ldapAddr": "127.0.0.1", "ldapSearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))"},
map[string]string{"ldapaddr": "127.0.0.1", "ldapsearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))"},
Principals{},
"Missing config entries (ldapPort, ldapTLS, ldapTLSVerify, ldapBindUser, ldapBindPassword, ldapBase) for Principals",
"Missing config entries (ldapport, ldaptls, ldaptlsverify, ldapbinduser, ldapbindpassword, ldapbase) for Principals",
},
{
map[string]string{
"ldapAddr": "127.0.0.1",
"ldapPort": "636",
"ldapTLS": "True",
"ldapTLSVerify": "True",
"ldapBindUser": "binduser",
"ldapBindPassword": "bindpassword",
"ldapBase": "DC=fake,DC=org",
"ldapSearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
"ldapaddr": "127.0.0.1",
"ldapport": "636",
"ldaptls": "True",
"ldaptlsverify": "True",
"ldapbinduser": "binduser",
"ldapbindpassword": "bindpassword",
"ldapbase": "DC=fake,DC=org",
"ldapsearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
},
Principals{
Address: "127.0.0.1",
Expand All @@ -129,14 +129,14 @@ func TestPrincipalsInit(t *testing.T) {
},
{
map[string]string{
"ldapAddr": "myldapserver.local",
"ldapPort": "389",
"ldapTLS": "False",
"ldapTLSVerify": "False",
"ldapBindUser": "binduser",
"ldapBindPassword": "bindpassword",
"ldapBase": "DC=fake,DC=org",
"ldapSearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
"ldapaddr": "myldapserver.local",
"ldapport": "389",
"ldaptls": "False",
"ldaptlsverify": "False",
"ldapbinduser": "binduser",
"ldapbindpassword": "bindpassword",
"ldapbase": "DC=fake,DC=org",
"ldapsearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
},
Principals{
Address: "myldapserver.local",
Expand All @@ -152,17 +152,17 @@ func TestPrincipalsInit(t *testing.T) {
},
{
map[string]string{
"ldapAddr": "myldapserver.local",
"ldapPort": "",
"ldapTLS": "False",
"ldapTLSVerify": "False",
"ldapBindUser": "binduser",
"ldapBindPassword": "",
"ldapBase": "DC=fake,DC=org",
"ldapSearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
"ldapaddr": "myldapserver.local",
"ldapport": "",
"ldaptls": "False",
"ldaptlsverify": "False",
"ldapbinduser": "binduser",
"ldapbindpassword": "",
"ldapbase": "DC=fake,DC=org",
"ldapsearch": "(&(objectClass=organizationalPerson)(sAMAccountName=%s))",
},
Principals{},
"Missing config entries (ldapPort, ldapBindPassword) for Principals",
"Missing config entries (ldapport, ldapbindpassword) for Principals",
},
}

Expand Down
32 changes: 16 additions & 16 deletions builtin/signer/vault/Signer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ type Signer struct {
// Init method is used to ingest config of Signer
func (v *Signer) Init(config map[string]string) error {
neededEntries := []string{
"vaultAddr",
"vaultPort",
"vaultTLS",
"vaultRoleID",
"vaultSecretID",
"vaultPath",
"vaultRole",
"vaultSignTTL",
"vaultaddr",
"vaultport",
"vaulttls",
"vaultroleid",
"vaultsecretid",
"vaultpath",
"vaultrole",
"vaultsignttl",
}

for _, entry := range neededEntries {
Expand All @@ -47,23 +47,23 @@ func (v *Signer) Init(config map[string]string) error {
}

// Conversions
port, err := strconv.Atoi(config["vaultPort"])
port, err := strconv.Atoi(config["vaultport"])
if err != nil {
return err
}
useTLS, err := strconv.ParseBool(config["vaultTLS"])
useTLS, err := strconv.ParseBool(config["vaulttls"])
if err != nil {
return err
}

v.Address = config["vaultAddr"]
v.Address = config["vaultaddr"]
v.Port = port
v.UseTLS = useTLS
v.RoleID = config["vaultRoleID"]
v.SecretID = config["vaultSecretID"]
v.Path = config["vaultPath"]
v.Role = config["vaultRole"]
v.SignTTL = config["vaultSignTTL"]
v.RoleID = config["vaultroleid"]
v.SecretID = config["vaultsecretid"]
v.Path = config["vaultpath"]
v.Role = config["vaultrole"]
v.SignTTL = config["vaultsignttl"]

var scheme string
if v.UseTLS {
Expand Down