Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use constant time comparison for client secret verification #1861

Merged
merged 4 commits into from May 17, 2021
Merged

Use constant time comparison for client secret verification #1861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec6f3a2
use bcrypt when comparing client secrets
Apr 17, 2020
d658c24
add dex config flag for enabling client secret encryption
Sep 25, 2020
ecea593
fix a bug in hash comparison function
May 14, 2021
fe8085b
remove client secret encryption option
May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion server/handlers.go
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@ package server

import (
"crypto/sha256"
"crypto/subtle"
"encoding/base64"
"encoding/json"
"errors"
Expand Down Expand Up @@ -679,7 +680,8 @@ func (s *Server) handleToken(w http.ResponseWriter, r *http.Request) {
}
return
}
if client.Secret != clientSecret {

if subtle.ConstantTimeCompare([]byte(client.Secret), []byte(clientSecret)) != 1 {
if clientSecret == "" {
s.logger.Infof("missing client_secret on token request for client: %s", client.ID)
} else {
Expand Down
1 change: 1 addition & 0 deletions server/server.go
View file
Open in desktop
Expand Up @@ -189,6 +189,7 @@ func newServer(ctx context.Context, c Config, rotationStrategy rotationStrategy)
if c.Storage == nil {
return nil, errors.New("server: storage cannot be nil")
}

if len(c.SupportedResponseTypes) == 0 {
c.SupportedResponseTypes = []string{responseTypeCode}
}
Expand Down