Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9660 from gyuho/SA4004

Browse Source 
auth: fix SA4004 - unconditionally terminated for-loop
This commit is contained in:
Gyuho Lee 2018-04-30 11:19:33 -07:00 committed by GitHub
commit 9718dd81d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
auth/store.go
View File

@ -1129,7 +1129,7 @@ func (as *authStore) Revision() uint64 {
return atomic.LoadUint64(&as.revision) return atomic.LoadUint64(&as.revision)
} }
func (as *authStore) AuthInfoFromTLS(ctx context.Context) *AuthInfo { func (as *authStore) AuthInfoFromTLS(ctx context.Context) (ai *AuthInfo) {
peer, ok := peer.FromContext(ctx) peer, ok := peer.FromContext(ctx)
if !ok || peer == nil || peer.AuthInfo == nil { if !ok || peer == nil || peer.AuthInfo == nil {
return nil return nil
@ -1137,18 +1137,26 @@ func (as *authStore) AuthInfoFromTLS(ctx context.Context) *AuthInfo {
tlsInfo := peer.AuthInfo.(credentials.TLSInfo) tlsInfo := peer.AuthInfo.(credentials.TLSInfo)
for _, chains := range tlsInfo.State.VerifiedChains { for _, chains := range tlsInfo.State.VerifiedChains {
for _, chain := range chains { if len(chains) < 1 {
cn := chain.Subject.CommonName continue
if as.lg != nil {
as.lg.Debug("found command name", zap.String("common-name", cn))
} else {
plog.Debugf("found common name %s", cn)
}
return &AuthInfo{Username: cn, Revision: as.Revision()}
} }
ai = &AuthInfo{
Username: chains[0].Subject.CommonName,
Revision: as.Revision(),
}
if as.lg != nil {
as.lg.Debug(
"found command name",
zap.String("common-name", ai.Username),
zap.String("user-name", ai.Username),
zap.Uint64("revision", ai.Revision),
)
} else {
plog.Debugf("found common name %s", ai.Username)
}
break
} }
return ai
return nil
} }
func (as *authStore) AuthInfoFromCtx(ctx context.Context) (*AuthInfo, error) { func (as *authStore) AuthInfoFromCtx(ctx context.Context) (*AuthInfo, error) {

2
test
View File

@ -473,7 +473,7 @@ function staticcheck_pass {
if [ -n "${staticcheckResult}" ]; then if [ -n "${staticcheckResult}" ]; then
# TODO: resolve these after go1.8 migration # TODO: resolve these after go1.8 migration
# See https://github.com/dominikh/go-tools/tree/master/cmd/staticcheck # See https://github.com/dominikh/go-tools/tree/master/cmd/staticcheck
STATIC_CHECK_MASK="SA(1012|1019|2002|4004)" STATIC_CHECK_MASK="SA(1012|1019|2002)"
if echo "${staticcheckResult}" | grep -vE "$STATIC_CHECK_MASK"; then if echo "${staticcheckResult}" | grep -vE "$STATIC_CHECK_MASK"; then
echo -e "staticcheck checking failed:\\n${staticcheckResult}" echo -e "staticcheck checking failed:\\n${staticcheckResult}"
exit 255 exit 255