Add 2FA for write operations

Author: ericmj

lib/hex/api/client.ex

@@ -11,6 +11,7 @@ defmodule Hex.API.Client do
 
     config
     |> maybe_put_api_key(opts)
+    |> maybe_put_otp(opts)
     |> maybe_put_organization(opts)
     |> maybe_put_repository(opts)
   end
@@ -34,6 +35,14 @@ defmodule Hex.API.Client do
     end
   end
 
+  defp maybe_put_otp(config, opts) do
+    if otp = opts[:otp] do
+      Map.put(config, :api_otp, otp)
+    else
+      config
+    end
+  end
+
   defp maybe_put_organization(config, opts) do
     if org = opts[:organization] || opts[:api_organization] do
       Map.put(config, :api_organization, to_string(org))

lib/hex/api/key.ex

@@ -4,15 +4,17 @@ defmodule Hex.API.Key do
   alias Hex.API.Client
 
   def new(name, permissions, auth) do
-    config = Client.config(auth)
+    Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+      config = Client.config(auth_with_otp)
 
-    # Convert permissions to binary map format expected by hex_core
-    permissions =
-      Enum.map(permissions, fn perm ->
-        Map.new(perm, fn {k, v} -> {to_string(k), to_string(v)} end)
-      end)
+      # Convert permissions to binary map format expected by hex_core
+      permissions =
+        Enum.map(permissions, fn perm ->
+          Map.new(perm, fn {k, v} -> {to_string(k), to_string(v)} end)
+        end)
 
-    :mix_hex_api_key.add(config, to_string(name), permissions)
+      :mix_hex_api_key.add(config, to_string(name), permissions)
+    end)
   end
 
   def get(auth) do
@@ -21,13 +23,17 @@ defmodule Hex.API.Key do
   end
 
   def delete(name, auth) do
-    config = Client.config(auth)
-    :mix_hex_api_key.delete(config, to_string(name))
+    Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+      config = Client.config(auth_with_otp)
+      :mix_hex_api_key.delete(config, to_string(name))
+    end)
   end
 
   def delete_all(auth) do
-    config = Client.config(auth)
-    :mix_hex_api_key.delete_all(config)
+    Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+      config = Client.config(auth_with_otp)
+      :mix_hex_api_key.delete_all(config)
+    end)
   end
 
   defmodule Organization do
@@ -36,15 +42,17 @@ defmodule Hex.API.Key do
     alias Hex.API.Client
 
     def new(organization, name, permissions, auth) do
-      config = Client.config(Keyword.put(auth, :api_organization, to_string(organization)))
+      Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+        config = Client.config(Keyword.put(auth_with_otp, :api_organization, to_string(organization)))
 
-      # Convert permissions to binary map format expected by hex_core
-      permissions =
-        Enum.map(permissions, fn perm ->
-          Map.new(perm, fn {k, v} -> {to_string(k), to_string(v)} end)
-        end)
+        # Convert permissions to binary map format expected by hex_core
+        permissions =
+          Enum.map(permissions, fn perm ->
+            Map.new(perm, fn {k, v} -> {to_string(k), to_string(v)} end)
+          end)
 
-      :mix_hex_api_key.add(config, to_string(name), permissions)
+        :mix_hex_api_key.add(config, to_string(name), permissions)
+      end)
     end
 
     def get(organization, auth) do
@@ -53,13 +61,17 @@ defmodule Hex.API.Key do
     end
 
     def delete(organization, name, auth) do
-      config = Client.config(Keyword.put(auth, :api_organization, to_string(organization)))
-      :mix_hex_api_key.delete(config, to_string(name))
+      Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+        config = Client.config(Keyword.put(auth_with_otp, :api_organization, to_string(organization)))
+        :mix_hex_api_key.delete(config, to_string(name))
+      end)
     end
 
     def delete_all(organization, auth) do
-      config = Client.config(Keyword.put(auth, :api_organization, to_string(organization)))
-      :mix_hex_api_key.delete_all(config)
+      Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+        config = Client.config(Keyword.put(auth_with_otp, :api_organization, to_string(organization)))
+        :mix_hex_api_key.delete_all(config)
+      end)
     end
   end
 end

lib/hex/api/package.ex

@@ -21,25 +21,29 @@ defmodule Hex.API.Package do
     alias Hex.API.Client
 
     def add(repo, package, owner, level, transfer, auth) when package != "" do
-      config = Client.build_config(repo, auth)
-
-      :mix_hex_api_package_owner.add(
-        config,
-        to_string(package),
-        to_string(owner),
-        to_string(level),
-        transfer
-      )
+      Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+        config = Client.build_config(repo, auth_with_otp)
+
+        :mix_hex_api_package_owner.add(
+          config,
+          to_string(package),
+          to_string(owner),
+          to_string(level),
+          transfer
+        )
+      end)
     end
 
     def delete(repo, package, owner, auth) when package != "" do
-      config = Client.build_config(repo, auth)
-
-      :mix_hex_api_package_owner.delete(
-        config,
-        to_string(package),
-        to_string(owner)
-      )
+      Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+        config = Client.build_config(repo, auth_with_otp)
+
+        :mix_hex_api_package_owner.delete(
+          config,
+          to_string(package),
+          to_string(owner)
+        )
+      end)
     end
 
     def get(repo, package, auth) when package != "" do

lib/hex/api/release.ex

@@ -12,33 +12,41 @@ defmodule Hex.API.Release do
   def publish(repo, tar, auth, progress \\ fn _ -> nil end, replace \\ false)
 
   def publish(repo, tar, auth, progress, replace?) do
-    config = Client.build_config(repo, auth)
+    Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+      config = Client.build_config(repo, auth_with_otp)
 
-    # Pass progress callback through adapter config
-    adapter_config = %{progress_callback: progress}
-    config = Map.put(config, :http_adapter, {Hex.HTTP, adapter_config})
+      # Pass progress callback through adapter config
+      adapter_config = %{progress_callback: progress}
+      config = Map.put(config, :http_adapter, {Hex.HTTP, adapter_config})
 
-    params = [{:replace, replace?}]
-    :mix_hex_api_release.publish(config, tar, params)
+      params = [{:replace, replace?}]
+      :mix_hex_api_release.publish(config, tar, params)
+    end)
   end
 
   def delete(repo, name, version, auth) do
-    config = Client.build_config(repo, auth)
+    Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+      config = Client.build_config(repo, auth_with_otp)
 
-    :mix_hex_api_release.delete(config, to_string(name), to_string(version))
+      :mix_hex_api_release.delete(config, to_string(name), to_string(version))
+    end)
   end
 
   def retire(repo, name, version, body, auth) do
-    config = Client.build_config(repo, auth)
-    # Convert body to binary map for hex_core
-    params = Map.new(body, fn {k, v} -> {to_string(k), to_string(v)} end)
+    Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+      config = Client.build_config(repo, auth_with_otp)
+      # Convert body to binary map for hex_core
+      params = Map.new(body, fn {k, v} -> {to_string(k), to_string(v)} end)
 
-    :mix_hex_api_release.retire(config, to_string(name), to_string(version), params)
+      :mix_hex_api_release.retire(config, to_string(name), to_string(version), params)
+    end)
   end
 
   def unretire(repo, name, version, auth) do
-    config = Client.build_config(repo, auth)
+    Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+      config = Client.build_config(repo, auth_with_otp)
 
-    :mix_hex_api_release.unretire(config, to_string(name), to_string(version))
+      :mix_hex_api_release.unretire(config, to_string(name), to_string(version))
+    end)
   end
 end

lib/hex/api/release_docs.ex

@@ -19,38 +19,42 @@ defmodule Hex.API.ReleaseDocs do
   end
 
   def publish(repo, name, version, tar, auth, progress \\ fn _ -> nil end) do
-    config = Client.build_config(repo, auth)
-
-    # Pass progress callback through adapter config
-    adapter_config = %{progress_callback: progress}
-    config = Map.put(config, :http_adapter, {Hex.HTTP, adapter_config})
-
-    path =
-      :mix_hex_api.build_repository_path(config, [
-        "packages",
-        to_string(name),
-        "releases",
-        to_string(version),
-        "docs"
-      ])
-
-    body = {"application/octet-stream", tar}
-
-    :mix_hex_api.post(config, path, body)
+    Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+      config = Client.build_config(repo, auth_with_otp)
+
+      # Pass progress callback through adapter config
+      adapter_config = %{progress_callback: progress}
+      config = Map.put(config, :http_adapter, {Hex.HTTP, adapter_config})
+
+      path =
+        :mix_hex_api.build_repository_path(config, [
+          "packages",
+          to_string(name),
+          "releases",
+          to_string(version),
+          "docs"
+        ])
+
+      body = {"application/octet-stream", tar}
+
+      :mix_hex_api.post(config, path, body)
+    end)
   end
 
   def delete(repo, name, version, auth) do
-    config = Client.build_config(repo, auth)
-
-    path =
-      :mix_hex_api.build_repository_path(config, [
-        "packages",
-        to_string(name),
-        "releases",
-        to_string(version),
-        "docs"
-      ])
-
-    :mix_hex_api.delete(config, path)
+    Mix.Tasks.Hex.with_otp_retry(auth, fn auth_with_otp ->
+      config = Client.build_config(repo, auth_with_otp)
+
+      path =
+        :mix_hex_api.build_repository_path(config, [
+          "packages",
+          to_string(name),
+          "releases",
+          to_string(version),
+          "docs"
+        ])
+
+      :mix_hex_api.delete(config, path)
+    end)
   end
 end

lib/hex/api/user.ex

@@ -13,6 +13,7 @@ defmodule Hex.API.User do
     :mix_hex_api_user.get(config, to_string(username))
   end
 
+  # NOTE: Only used for testing
   def new(username, email, password) do
     config = Client.config()
 
@@ -23,9 +24,4 @@ defmodule Hex.API.User do
       to_string(email)
     )
   end
-
-  def password_reset(name) do
-    config = Client.config()
-    :mix_hex_api_user.reset_password(config, to_string(name))
-  end
 end

lib/hex/state.ex

@@ -12,6 +12,9 @@ defmodule Hex.State do
       env: ["HEX_API_KEY"],
       config: [:api_key]
     },
+    api_otp: %{
+      env: ["HEX_OTP"]
+    },
     oauth_tokens: %{
       config: [:"$oauth_tokens"]
     },