forked from TrueCloudLab/lego
Properly lock jws.nonces (#319)
Before read access to `nonces` field in jws structure (in `Nonces` method) was not synchronized and we were still able to get `slice bounds out of range` panic when trying to "pop" value in `Nonces` method. The race can be actually observed by running `Nonce` method multiple times in separate goroutines with th precondition is `len(jws.nonces) == 1`.
This commit is contained in:
parent
cbd5d04c89
commit
d149f14b6b
1 changed files with 4 additions and 4 deletions
|
@ -44,6 +44,8 @@ func (j *jws) post(url string, content []byte) (*http.Response, error) {
|
|||
return nil, err
|
||||
}
|
||||
|
||||
j.Lock()
|
||||
defer j.Unlock()
|
||||
j.getNonceFromResponse(resp)
|
||||
|
||||
return resp, err
|
||||
|
@ -77,8 +79,6 @@ func (j *jws) signContent(content []byte) (*jose.JsonWebSignature, error) {
|
|||
}
|
||||
|
||||
func (j *jws) getNonceFromResponse(resp *http.Response) error {
|
||||
j.Lock()
|
||||
defer j.Unlock()
|
||||
nonce := resp.Header.Get("Replay-Nonce")
|
||||
if nonce == "" {
|
||||
return fmt.Errorf("Server did not respond with a proper nonce header.")
|
||||
|
@ -98,6 +98,8 @@ func (j *jws) getNonce() error {
|
|||
}
|
||||
|
||||
func (j *jws) Nonce() (string, error) {
|
||||
j.Lock()
|
||||
defer j.Unlock()
|
||||
nonce := ""
|
||||
if len(j.nonces) == 0 {
|
||||
err := j.getNonce()
|
||||
|
@ -108,8 +110,6 @@ func (j *jws) Nonce() (string, error) {
|
|||
if len(j.nonces) == 0 {
|
||||
return "", fmt.Errorf("Can't get nonce")
|
||||
}
|
||||
j.Lock()
|
||||
defer j.Unlock()
|
||||
nonce, j.nonces = j.nonces[len(j.nonces)-1], j.nonces[:len(j.nonces)-1]
|
||||
return nonce, nil
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue