Skip to content

Commit 439b5c0

Browse files
committed
BUG/MINOR: authentication: respect userlist settings when configured
1 parent a3a63e7 commit 439b5c0

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.aspell.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ allowed:
2929
- govulncheck
3030
- dataplaneapi
3131
- quic
32+
- userlist

configuration/configuration_storage.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -355,22 +355,19 @@ func copyConfigurationToStorage(cfg *Configuration) {
355355
cfgStorage.Dataplaneapi.Advertised = &configTypeAdvertised{}
356356
}
357357
cfgStorage.Dataplaneapi.Advertised.APIAddress = &cfg.APIOptions.APIAddress
358+
cfgStorage.Dataplaneapi.Advertised.APIPort = &cfg.APIOptions.APIPort
358359

359-
if cfgStorage.Dataplaneapi == nil {
360-
cfgStorage.Dataplaneapi = &configTypeDataplaneapi{}
360+
if cfgStorage.Dataplaneapi.Userlist == nil {
361+
cfgStorage.Dataplaneapi.Userlist = &configTypeUserlist{}
361362
}
362-
if cfgStorage.Dataplaneapi.Advertised == nil {
363-
cfgStorage.Dataplaneapi.Advertised = &configTypeAdvertised{}
364-
}
365-
cfgStorage.Dataplaneapi.Advertised.APIPort = &cfg.APIOptions.APIPort
366-
cfgStorage.Dataplaneapi.Advertised.APIPort = &cfg.APIOptions.APIPort
363+
cfgStorage.Dataplaneapi.Userlist.Userlist = &cfg.HAProxy.Userlist
364+
cfgStorage.Dataplaneapi.Userlist.UserListFile = &cfg.HAProxy.UserListFile
367365

368366
if cfgStorage.Haproxy == nil {
369367
cfgStorage.Haproxy = &configTypeHaproxy{
370368
Reload: &configTypeReload{},
371369
}
372370
}
373-
374371
cfgStorage.Haproxy.Reload.ReloadStrategy = &cfg.HAProxy.ReloadStrategy
375372

376373
if cfgStorage.LogTargets == nil {

0 commit comments

Comments
 (0)