github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-01 19:25:29 +00:00
Code Issues Projects Releases Wiki Activity

proxy: Change the imgid to uint64

Browse Source 
In PR review for a different issue, the question of what happens
if we hit overflow for the imageid serial was hit.  This feels
pretty unlikely; if I did the math right, it'd require opening
an average of 136 images per second to overflow it in a year.
Nevertheless, in practice what we're sending on the wire is just a JSON
number, and if we extend this to the "max safe JSON number" of 2^53,
it'd take 285,616,414 images per second to overflow in a year, going
from implausible to probably impossible.

With a bit more work of course, we could make this a sparse mapping
and reuse freed numbers, but eh.

Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
Colin Walters 2022-10-13 16:28:52 -04:00 committed by Miloslav Trmač
parent a39972ca35
commit f7dc084799
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/skopeo/proxy.go
View File

@ -156,7 +156,7 @@ type activePipe struct {
// openImage is an opened image reference // openImage is an opened image reference
type openImage struct { type openImage struct {
// id is an opaque integer handle // id is an opaque integer handle
id uint32 id uint64
src types.ImageSource src types.ImageSource
cachedimg types.Image cachedimg types.Image
} }
@ -171,9 +171,9 @@ type proxyHandler struct {
cache types.BlobInfoCache cache types.BlobInfoCache
// imageSerial is a counter for open images // imageSerial is a counter for open images
imageSerial uint32 imageSerial uint64
// images holds our opened images // images holds our opened images
images map[uint32]*openImage images map[uint64]*openImage
// activePipes maps from "pipeid" to a pipe + goroutine pair // activePipes maps from "pipeid" to a pipe + goroutine pair
activePipes map[uint32]*activePipe activePipes map[uint32]*activePipe
} }
@ -326,14 +326,6 @@ func (h *proxyHandler) CloseImage(args []any) (replyBuf, error) {
return ret, nil return ret, nil
} }
func parseImageID(v any) (uint32, error) {
imgidf, ok := v.(float64)
if !ok {
return 0, fmt.Errorf("expecting integer imageid, not %T", v)
}
return uint32(imgidf), nil
}
// parseUint64 validates that a number fits inside a JavaScript safe integer // parseUint64 validates that a number fits inside a JavaScript safe integer
func parseUint64(v any) (uint64, error) { func parseUint64(v any) (uint64, error) {
f, ok := v.(float64) f, ok := v.(float64)
@ -347,7 +339,7 @@ func parseUint64(v any) (uint64, error) {
} }
func (h *proxyHandler) parseImageFromID(v any) (*openImage, error) { func (h *proxyHandler) parseImageFromID(v any) (*openImage, error) {
imgid, err := parseImageID(v) imgid, err := parseUint64(v)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -847,7 +839,7 @@ func (h *proxyHandler) processRequest(readBytes []byte) (rb replyBuf, terminate
func (opts *proxyOptions) run(args []string, stdout io.Writer) error { func (opts *proxyOptions) run(args []string, stdout io.Writer) error {
handler := &proxyHandler{ handler := &proxyHandler{
opts: opts, opts: opts,
images: make(map[uint32]*openImage), images: make(map[uint64]*openImage),
activePipes: make(map[uint32]*activePipe), activePipes: make(map[uint32]*activePipe),
} }
defer handler.close() defer handler.close()

6
integration/proxy_test.go
View File

@ -239,7 +239,7 @@ func runTestGetManifestAndConfig(p *proxy, img string) error {
if !ok { if !ok {
return fmt.Errorf("OpenImage return value is %T", v) return fmt.Errorf("OpenImage return value is %T", v)
} }
imgid := uint32(imgidv) imgid := uint64(imgidv)
if imgid == 0 { if imgid == 0 {
return fmt.Errorf("got zero from expected image") return fmt.Errorf("got zero from expected image")
} }
@ -254,7 +254,7 @@ func runTestGetManifestAndConfig(p *proxy, img string) error {
if !ok { if !ok {
return fmt.Errorf("OpenImageOptional return value is %T", v) return fmt.Errorf("OpenImageOptional return value is %T", v)
} }
imgid2 := uint32(imgidv) imgid2 := uint64(imgidv)
if imgid2 == 0 { if imgid2 == 0 {
return fmt.Errorf("got zero from expected image") return fmt.Errorf("got zero from expected image")
} }
@ -325,7 +325,7 @@ func runTestOpenImageOptionalNotFound(p *proxy, img string) error {
if !ok { if !ok {
return fmt.Errorf("OpenImageOptional return value is %T", v) return fmt.Errorf("OpenImageOptional return value is %T", v)
} }
imgid := uint32(imgidv) imgid := uint64(imgidv)
if imgid != 0 { if imgid != 0 {
return fmt.Errorf("Unexpected optional image id %v", imgid) return fmt.Errorf("Unexpected optional image id %v", imgid)
} }