fdcfc56f7b
This refactors the hmac state token to take control of the layerUploadState json message, which has been removed from the storage backend. It also moves away from the concept of a LayerUploadStateStore callback object, which was short-lived. This allows for upload offset to be managed by the web application logic in the face of an inconsistent backend. By controlling the upload offset externally, we reduce the possibility of misreporting upload state to a client. We may still want to modify the way this works after getting production experience. Signed-off-by: Stephen J Day <stephen.day@docker.com>
72 lines
1.7 KiB
Go
72 lines
1.7 KiB
Go
package registry
|
|
|
|
import (
|
|
"crypto/hmac"
|
|
"crypto/sha256"
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"fmt"
|
|
"time"
|
|
)
|
|
|
|
// layerUploadState captures the state serializable state of the layer upload.
|
|
type layerUploadState struct {
|
|
// name is the primary repository under which the layer will be linked.
|
|
Name string
|
|
|
|
// UUID identifies the upload.
|
|
UUID string
|
|
|
|
// offset contains the current progress of the upload.
|
|
Offset int64
|
|
|
|
// StartedAt is the original start time of the upload.
|
|
StartedAt time.Time
|
|
}
|
|
|
|
type hmacKey string
|
|
|
|
// unpackUploadState unpacks and validates the layer upload state from the
|
|
// token, using the hmacKey secret.
|
|
func (secret hmacKey) unpackUploadState(token string) (layerUploadState, error) {
|
|
var state layerUploadState
|
|
|
|
tokenBytes, err := base64.URLEncoding.DecodeString(token)
|
|
if err != nil {
|
|
return state, err
|
|
}
|
|
mac := hmac.New(sha256.New, []byte(secret))
|
|
|
|
if len(tokenBytes) < mac.Size() {
|
|
return state, fmt.Errorf("Invalid token")
|
|
}
|
|
|
|
macBytes := tokenBytes[:mac.Size()]
|
|
messageBytes := tokenBytes[mac.Size():]
|
|
|
|
mac.Write(messageBytes)
|
|
if !hmac.Equal(mac.Sum(nil), macBytes) {
|
|
return state, fmt.Errorf("Invalid token")
|
|
}
|
|
|
|
if err := json.Unmarshal(messageBytes, &state); err != nil {
|
|
return state, err
|
|
}
|
|
|
|
return state, nil
|
|
}
|
|
|
|
// packUploadState packs the upload state signed with and hmac digest using
|
|
// the hmacKey secret, encoding to url safe base64. The resulting token can be
|
|
// used to share data with minimized risk of external tampering.
|
|
func (secret hmacKey) packUploadState(lus layerUploadState) (string, error) {
|
|
mac := hmac.New(sha256.New, []byte(secret))
|
|
p, err := json.Marshal(lus)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
mac.Write(p)
|
|
|
|
return base64.URLEncoding.EncodeToString(append(mac.Sum(nil), p...)), nil
|
|
}
|