github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-09-18 08:15:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1465 from dmcgowan/token-server-oauth

Browse Source 
Integration token server supporting oauth
This commit is contained in:
Richard Scothern
2016-06-13 15:01:06 -07:00
committed by GitHub
parent 4e08e7d1d6 1126e32234
commit fb106e167a
6 changed files with 283 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
registry/auth/htpasswd/htpasswd.go
View File

@@ -6,6 +6,8 @@ import (
"io"
"strings"
"github.com/docker/distribution/registry/auth"
"golang.org/x/crypto/bcrypt"
)
@@ -33,12 +35,12 @@ func (htpasswd *htpasswd) authenticateUser(username string, password string) err
// timing attack paranoia
bcrypt.CompareHashAndPassword([]byte{}, []byte(password))
return ErrAuthenticationFailure
return auth.ErrAuthenticationFailure
}
err := bcrypt.CompareHashAndPassword([]byte(credentials), []byte(password))
if err != nil {
return ErrAuthenticationFailure
return auth.ErrAuthenticationFailure
}
return nil