mirror of
https://github.com/weaveworks/scope.git
synced 2026-07-15 19:41:02 +00:00
use env to override basic auth settings
This commit is contained in:
@@ -300,7 +300,6 @@ func appMain(flags appFlags) {
|
||||
}
|
||||
|
||||
if flags.basicAuth {
|
||||
log.Infof("Basic authentication enabled")
|
||||
handler = BasicAuthentication{
|
||||
Realm: "Restricted",
|
||||
User: flags.username,
|
||||
|
||||
19
prog/main.go
19
prog/main.go
@@ -459,6 +459,25 @@ func main() {
|
||||
flags.probe.kubernetesNodeName = os.Getenv("KUBERNETES_NODENAME")
|
||||
}
|
||||
|
||||
if strings.ToLower(os.Getenv("DISABLE_BASICAUTH")) == "true" {
|
||||
log.Infof("Basic authentication disabled.")
|
||||
flags.probe.basicAuth = false
|
||||
flags.app.basicAuth = false
|
||||
|
||||
} else {
|
||||
log.Infof("Basic authentication enabled.")
|
||||
username := os.Getenv("BASICAUTH_USERNAME")
|
||||
if username != "" {
|
||||
flags.probe.username = username
|
||||
flags.app.username = username
|
||||
}
|
||||
password := os.Getenv("BASICAUTH_PASSWORD")
|
||||
if password != "" {
|
||||
flags.probe.password = password
|
||||
flags.app.password = password
|
||||
}
|
||||
}
|
||||
|
||||
if flags.dryRun {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -129,7 +129,6 @@ func probeMain(flags probeFlags, targets []appclient.Target) {
|
||||
}
|
||||
|
||||
if flags.basicAuth {
|
||||
log.Infof("Basic authentication enabled")
|
||||
token = base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", flags.username, flags.password)))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user