fix

Author: wxiaoguang

routers/api/packages/container/container.go

@@ -48,7 +48,20 @@ type containerHeaders struct {
 	Status        int
 	ContentDigest string
 	UploadUUID    string
-	Range         string
+
+	// https://github.com/opencontainers/distribution-spec/blob/main/spec.md
+	// The <range> refers to the byte range of the chunk, and MUST be inclusive on both ends.
+	// The first chunk's range MUST begin with 0. It MUST match the following regular expression:
+	//   ^[0-9]+-[0-9]+$
+	// Each successful chunk upload MUST have a 202 Accepted response code, and MUST have the following headers:
+	//   Location: <location>
+	//   Range: 0-<end-of-range>
+	// Chunks MUST be uploaded in order, with the first byte of a chunk being the last chunk's <end-of-range> plus one
+	// FIXME: It seems that the spec made a mess, it's impossible to present an empty blob, range "0-0" means one byte
+	//
+	// Fortunately, spec v1.0 doesn't require the "Range" header: https://specs.opencontainers.org/distribution-spec/?v=v1.0.0#post-then-put
+	Range string
+
 	Location      string
 	ContentType   string
 	ContentLength optional.Option[int64]
@@ -312,8 +325,8 @@ func InitiateUploadBlob(ctx *context.Context) {
 	}
 
 	setResponseHeaders(ctx.Resp, &containerHeaders{
-		Location:   fmt.Sprintf("/v2/%s/%s/blobs/uploads/%s", ctx.Package.Owner.LowerName, image, upload.ID),
-		Range:      "0-0",
+		Location: fmt.Sprintf("/v2/%s/%s/blobs/uploads/%s", ctx.Package.Owner.LowerName, image, upload.ID),
+		// Range:      "0-0", // FIXME: not right, the "range end" should be "len-1"
 		UploadUUID: upload.ID,
 		Status:     http.StatusAccepted,
 	})
@@ -334,7 +347,7 @@ func GetUploadBlob(ctx *context.Context) {
 	}
 
 	setResponseHeaders(ctx.Resp, &containerHeaders{
-		Range:      fmt.Sprintf("0-%d", upload.BytesReceived),
+		// Range:      fmt.Sprintf("0-%d", upload.BytesReceived), // FIXME: not right, the "range end" should be "len-1"
 		UploadUUID: upload.ID,
 		Status:     http.StatusNoContent,
 	})
@@ -378,8 +391,8 @@ func UploadBlob(ctx *context.Context) {
 	}
 
 	setResponseHeaders(ctx.Resp, &containerHeaders{
-		Location:   fmt.Sprintf("/v2/%s/%s/blobs/uploads/%s", ctx.Package.Owner.LowerName, image, uploader.ID),
-		Range:      fmt.Sprintf("0-%d", uploader.Size()-1),
+		Location: fmt.Sprintf("/v2/%s/%s/blobs/uploads/%s", ctx.Package.Owner.LowerName, image, uploader.ID),
+		// Range:      fmt.Sprintf("0-%d", uploader.Size()-1), // FIXME: not right, when "uploader.Size()" is 0, it results in "0--1" which is not a valid range
 		UploadUUID: uploader.ID,
 		Status:     http.StatusAccepted,
 	})

tests/integration/api_packages_container_test.go

@@ -302,7 +302,7 @@ func TestPackageContainer(t *testing.T) {
 				resp = MakeRequest(t, req, http.StatusAccepted)
 
 				assert.Equal(t, uuid, resp.Header().Get("Docker-Upload-Uuid"))
-				assert.Equal(t, contentRange, resp.Header().Get("Range"))
+				// assert.Equal(t, contentRange, resp.Header().Get("Range"))
 
 				uploadURL = resp.Header().Get("Location")
 
@@ -311,7 +311,7 @@ func TestPackageContainer(t *testing.T) {
 				resp = MakeRequest(t, req, http.StatusNoContent)
 
 				assert.Equal(t, uuid, resp.Header().Get("Docker-Upload-Uuid"))
-				assert.Equal(t, fmt.Sprintf("0-%d", len(blobContent)), resp.Header().Get("Range"))
+				// assert.Equal(t, fmt.Sprintf("0-%d", len(blobContent)), resp.Header().Get("Range"))
 
 				pbu, err = packages_model.GetBlobUploadByID(db.DefaultContext, uuid)
 				assert.NoError(t, err)
@@ -342,7 +342,7 @@ func TestPackageContainer(t *testing.T) {
 					resp = MakeRequest(t, req, http.StatusNoContent)
 
 					assert.Equal(t, uuid, resp.Header().Get("Docker-Upload-Uuid"))
-					assert.Equal(t, "0-0", resp.Header().Get("Range"))
+					// assert.Equal(t, "0-0", resp.Header().Get("Range"))
 
 					req = NewRequest(t, "DELETE", setting.AppURL+uploadURL[1:]).
 						AddTokenAuth(userToken)