fmt + content-length:0

Author: coryodaniel

lib/oci/plug/handler.ex

@@ -271,7 +271,16 @@ defmodule OCI.Plug.Handler do
     raw_manifest = conn.assigns[:oci_raw_manifest]
     manifest_digest = conn.assigns[:oci_digest]
 
-    with :ok <- Registry.store_manifest(registry, repo, reference, manifest, raw_manifest, manifest_digest, ctx) do
+    with :ok <-
+           Registry.store_manifest(
+             registry,
+             repo,
+             reference,
+             manifest,
+             raw_manifest,
+             manifest_digest,
+             ctx
+           ) do
       conn
       |> maybe_set_oci_subject(manifest)
       |> put_resp_header("location", Registry.manifests_reference_path(repo, reference))
@@ -334,18 +343,20 @@ defmodule OCI.Plug.Handler do
   end
 
   defp maybe_upload_final_chunk(conn, registry, repo, uuid, ctx) do
-    # The Content-Length header is required, but may be 0 if no final chunk is being uploaded.
-    conn
-    |> get_req_header("content-length")
-    |> List.first()
-    |> String.to_integer()
-    |> case do
+    # The closing PUT may have no body and no Content-Length header when the
+    # final chunk was uploaded earlier via PATCH (spec: "Content-Length: <length
+    # of chunk, if present>" and "OPTIONAL: <final chunk byte stream>").
+    content_length =
+      case get_req_header(conn, "content-length") do
+        [val | _] -> String.to_integer(val)
+        [] -> 0
+      end
+
+    case content_length do
       0 ->
-        # No chunk to upload with final PUT
         :ok
 
       _ ->
-        # Final chunk is included, upload it before completing the blob
         case Registry.upload_blob_chunk(
                registry,
                repo,

lib/oci/registry.ex

@@ -223,7 +223,15 @@ defmodule OCI.Registry do
     end
   end
 
-  def store_manifest(%{storage: storage}, repo, reference, manifest, raw_manifest, manifest_digest, ctx) do
+  def store_manifest(
+        %{storage: storage},
+        repo,
+        reference,
+        manifest,
+        raw_manifest,
+        manifest_digest,
+        ctx
+      ) do
     required_blobs = referenced_blobs(manifest)
 
     missing =

test/plug_test.exs

@@ -121,4 +121,31 @@ defmodule OCI.PlugTest do
              }
     end
   end
+
+  describe "PUT /v2/<name>/blobs/uploads/<uuid> closing PUT" do
+    test "finalizes a zero-byte blob when Content-Length header is omitted", %{conn: conn} do
+      open = post(conn, "/myimage/blobs/uploads")
+      assert open.status == 202
+      [location] = get_resp_header(open, "location")
+      uuid = location |> String.split("/") |> List.last()
+
+      empty_digest = digest("")
+
+      assert empty_digest ==
+               "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+
+      closing =
+        :put
+        |> conn("/myimage/blobs/uploads/#{uuid}?digest=#{empty_digest}", nil)
+        |> Map.put(:script_name, ["v2"])
+        |> Map.put(:assigns, %{oci_opts: conn.assigns.oci_opts})
+        |> basic_auth("myuser", "mypass")
+        |> OCI.Plug.call(conn.assigns.oci_opts)
+
+      assert get_req_header(closing, "content-length") == []
+      assert closing.status == 201
+      assert [blob_location] = get_resp_header(closing, "location")
+      assert blob_location == "/v2/myimage/blobs/#{empty_digest}"
+    end
+  end
 end