2FA fixes

Author: ericmj

lib/hex/http.ex

@@ -53,6 +53,16 @@ defmodule Hex.HTTP do
     {body, extra_headers} = wrap_body_with_progress(body, progress_callback)
     headers = Map.merge(headers, extra_headers)
 
+    # Work around httpc bug: disable connection reuse when using Expect: 100-continue
+    # httpc doesn't properly handle connection state when receiving final status (401)
+    # instead of 100 Continue response
+    headers =
+      if headers["expect"] == "100-continue" do
+        Map.put(headers, "connection", "close")
+      else
+        headers
+      end
+
     http_opts = build_http_opts(url, timeout)
     opts = [body_format: :binary]
     request = build_request(url, headers, body)
@@ -397,7 +407,6 @@ defmodule Hex.HTTP do
       {content_type, binary_body}
       when is_binary(binary_body) and is_function(progress_callback, 1) ->
         total_size = byte_size(binary_body)
-        progress_callback.(0)
 
         body_fn = fn
           size when size < total_size ->

lib/mix/tasks/hex.ex

@@ -455,6 +455,8 @@ defmodule Mix.Tasks.Hex do
   end
 
   defp prompt_otp() do
+    Hex.Shell.info("")
+
     Hex.Shell.prompt("Enter your 2FA code:")
     |> String.trim()
   end
@@ -588,17 +590,17 @@ defmodule Mix.Tasks.Hex do
   def with_otp_retry(auth, fun) when is_function(fun, 1) do
     case fun.(auth) do
       {:error, :otp_required} ->
-        # Server requires OTP, prompt for it and retry
         otp = prompt_otp()
+        Hex.State.put(:api_otp, otp)
         auth_with_otp = Keyword.put(auth, :otp, otp)
-        fun.(auth_with_otp)
+        with_otp_retry(auth_with_otp, fun)
 
       {:error, :invalid_totp} ->
-        # Invalid OTP code provided, show error and prompt again
         Hex.Shell.error("Invalid two-factor authentication code")
         otp = prompt_otp()
+        Hex.State.put(:api_otp, otp)
         auth_with_otp = Keyword.put(auth, :otp, otp)
-        fun.(auth_with_otp)
+        with_otp_retry(auth_with_otp, fun)
 
       result ->
         result
@@ -636,8 +638,6 @@ defmodule Mix.Tasks.Hex do
   end
 
   def progress(max) do
-    put_progress(0, 0)
-
     fn size ->
       fraction = size / max
       completed = trunc(fraction * @progress_steps)

lib/mix/tasks/hex.publish.ex

@@ -150,6 +150,8 @@ defmodule Mix.Tasks.Hex.Publish do
         case create_release(build, organization, auth, opts) do
           :ok ->
             Hex.Shell.info("Publishing docs...")
+            # Refresh auth to pick up cached OTP from package publish
+            auth = Mix.Tasks.Hex.auth_info(:write)
             create_docs(build, organization, auth, opts)
             transfer_owner(build, owner, auth, opts)