baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve basic auth handling.

Browse source 
- Enrich logging.
- Move error closer to producer.
This commit is contained in:
Timo Reimann 2017-06-28 01:32:19 +02:00 committed by Ludovic Fernandez
parent c5c63071ca
commit 4d89ff7e18
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
provider/kubernetes/kubernetes.go
View file

@ -110,11 +110,11 @@ func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *s
} }
notify := func(err error, time time.Duration) { notify := func(err error, time time.Duration) {
log.Errorf("Provider connection error %+v, retrying in %s", err, time) log.Errorf("Provider connection error: %s; retrying in %s", err, time)
} }
err := backoff.RetryNotify(safe.OperationWithRecover(operation), job.NewBackOff(backoff.NewExponentialBackOff()), notify) err := backoff.RetryNotify(safe.OperationWithRecover(operation), job.NewBackOff(backoff.NewExponentialBackOff()), notify)
if err != nil { if err != nil {
log.Errorf("Cannot connect to Provider server %+v", err) log.Errorf("Cannot connect to Provider: %s", err)
} }
}) })
@ -290,18 +290,15 @@ func handleBasicAuthConfig(i *v1beta1.Ingress, k8sClient Client) ([]string, erro
return nil, nil return nil, nil
} }
if strings.ToLower(authType) != "basic" { if strings.ToLower(authType) != "basic" {
return nil, fmt.Errorf("unsupported auth-type: %q", authType) return nil, fmt.Errorf("unsupported auth-type on annotation ingress.kubernetes.io/auth-type: %q", authType)
} }
authSecret := i.Annotations["ingress.kubernetes.io/auth-secret"] authSecret := i.Annotations["ingress.kubernetes.io/auth-secret"]
if authSecret == "" { if authSecret == "" {
return nil, errors.New("auth-secret annotation must be set") return nil, errors.New("auth-secret annotation ingress.kubernetes.io/auth-secret must be set")
} }
basicAuthCreds, err := loadAuthCredentials(i.Namespace, authSecret, k8sClient) basicAuthCreds, err := loadAuthCredentials(i.Namespace, authSecret, k8sClient)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to load auth credentials: %s", err)
}
if len(basicAuthCreds) == 0 {
return nil, errors.New("secret file without credentials")
} }
return basicAuthCreds, nil return basicAuthCreds, nil
} }
@ -314,9 +311,9 @@ func loadAuthCredentials(namespace, secretName string, k8sClient Client) ([]stri
case !ok: case !ok:
return nil, fmt.Errorf("secret %q/%q not found", namespace, secretName) return nil, fmt.Errorf("secret %q/%q not found", namespace, secretName)
case secret == nil: case secret == nil:
return nil, errors.New("secret data must not be nil") return nil, fmt.Errorf("data for secret %q/%q must not be nil", namespace, secretName)
case len(secret.Data) != 1: case len(secret.Data) != 1:
return nil, errors.New("secret must contain single element only") return nil, fmt.Errorf("found %d elements for secret %q/%q, must be single element exactly", len(secret.Data), namespace, secretName)
default: default:
} }
var firstSecret []byte var firstSecret []byte
@ -331,6 +328,10 @@ func loadAuthCredentials(namespace, secretName string, k8sClient Client) ([]stri
creds = append(creds, cred) creds = append(creds, cred)
} }
} }
if len(creds) == 0 {
return nil, fmt.Errorf("secret %q/%q does not contain any credentials", namespace, secretName)
}
return creds, nil return creds, nil
} }