gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-16 19:14:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Incorporating comments

Browse Source 
Signed-off-by: Matthias Hanel <mh@synadia.com>
This commit is contained in:
Matthias Hanel
2020-06-02 18:38:17 -04:00
parent cf6fcda75c
commit 0a3e89c64a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/config_check_test.go
View File

@@ -750,8 +750,8 @@ func TestConfigCheck(t *testing.T) {
http_port = 8222
`,
err: errors.New(`Duplicate user "foo" detected`),
errorLine: 5,
errorPos: 19,
errorLine: 6,
errorPos: 21,
},
{
name: "when accounts block imports are not a list",

6
server/opts.go
View File

@@ -1791,6 +1791,7 @@ func parseAccounts(v interface{}, opts *Options, errors *[]error, warnings *[]er
var (
users []*User
nkeyUsr []*NkeyUser
usersTk token
)
acc := NewAccount(aname)
opts.Accounts = append(opts.Accounts, acc)
@@ -1830,6 +1831,7 @@ func parseAccounts(v interface{}, opts *Options, errors *[]error, warnings *[]er
}
case "users":
var err error
usersTk = tk
nkeyUsr, users, err = parseUsers(mv, opts, errors, warnings)
if err != nil {
*errors = append(*errors, err)
@@ -1857,7 +1859,7 @@ func parseAccounts(v interface{}, opts *Options, errors *[]error, warnings *[]er
applyDefaultPermissions(users, nkeyUsr, acc.defaultPerms)
for _, u := range nkeyUsr {
if _, ok := uorn[u.Nkey]; ok {
err := &configErr{tk, fmt.Sprintf("Duplicate nkey %q detected", u.Nkey)}
err := &configErr{usersTk, fmt.Sprintf("Duplicate nkey %q detected", u.Nkey)}
*errors = append(*errors, err)
continue
}
@@ -1867,7 +1869,7 @@ func parseAccounts(v interface{}, opts *Options, errors *[]error, warnings *[]er
opts.Nkeys = append(opts.Nkeys, nkeyUsr...)
for _, u := range users {
if _, ok := uorn[u.Username]; ok {
err := &configErr{tk, fmt.Sprintf("Duplicate user %q detected", u.Username)}
err := &configErr{usersTk, fmt.Sprintf("Duplicate user %q detected", u.Username)}
*errors = append(*errors, err)
continue
}