Remove excessive warnings with x509 certificate auth
Suppress common name verify warning log and roll up into returned error remove glog test dependency Kubernetes-commit: bb3124c48a4d276ed280175e5825ea9db022d699
This commit is contained in:
parent
c30426fbcf
commit
a948ad1df7
|
|
@ -23,7 +23,6 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/golang/glog"
|
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
|
|
||||||
utilerrors "k8s.io/apimachinery/pkg/util/errors"
|
utilerrors "k8s.io/apimachinery/pkg/util/errors"
|
||||||
|
|
@ -168,8 +167,7 @@ func (a *Verifier) verifySubject(subject pkix.Name) error {
|
||||||
if a.allowedCommonNames.Has(subject.CommonName) {
|
if a.allowedCommonNames.Has(subject.CommonName) {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
glog.Warningf("x509: subject with cn=%s is not in the allowed list: %v", subject.CommonName, a.allowedCommonNames.List())
|
return fmt.Errorf("x509: subject with cn=%s is not in the allowed list", subject.CommonName)
|
||||||
return fmt.Errorf("x509: subject with cn=%s is not allowed", subject.CommonName)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DefaultVerifyOptions returns VerifyOptions that use the system root certificates, current time,
|
// DefaultVerifyOptions returns VerifyOptions that use the system root certificates, current time,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue