Modify GitRekt.WireProtocol.reference_discovery/1

See issues #1 and #8 for more details.

apps/gitgud/lib/gitgud/ssh_server.ex

@@ -103,10 +103,10 @@ defmodule GitGud.SSHServer do
   @impl true
   def handle_ssh_msg({:ssh_cm, conn, {:exec, chan, _reply, cmd}}, %__MODULE__{conn: conn, chan: chan, user: user} = state) do
     [exec|args] = String.split(to_string(cmd))
-    [repo|args] = parse_args(args)
-    if has_permission?(user, repo, exec) && Enum.empty?(args) do
+    [repo|_args] = parse_args(args)
+    if has_permission?(user, repo, exec) do
       {:ok, repo} = Git.repository_open(Repo.workdir(repo))
-      :ssh_connection.send(conn, chan, WireProtocol.reference_discovery(repo))
+      :ssh_connection.send(conn, chan, WireProtocol.reference_discovery(repo, exec))
       {:ok, %{state|repo: repo, exec: exec}}
     else
       {:stop, chan, state}

apps/gitgud_web/lib/gitgud_web/controllers/git_backend_controller.ex

@@ -112,7 +112,7 @@ defmodule GitGud.Web.GitBackendController do
   defp git_info_refs(conn, repo, service) do
     if has_permission?(conn, repo, service) do
       {:ok, handle} = Git.repository_open(Repo.workdir(repo))
-      refs = WireProtocol.reference_discovery(handle)
+      refs = WireProtocol.reference_discovery(handle, service)
       refs = [WireProtocol.pkt_line("# service=#{service}"), WireProtocol.pkt_line] ++ refs
       conn
       |> put_resp_content_type("application/x-#{service}-advertisement")

apps/gitrekt/lib/gitrekt/wire_protocol.ex

@@ -6,16 +6,18 @@ defmodule GitRekt.WireProtocol do
   alias GitRekt.Git
   alias GitRekt.Packfile
 
-  @server_capabilities ~w(report-status delete-refs)
+  @upload_caps ~w()
+  @receive_caps ~w(report-status delete-refs)
 
   @doc """
   Returns a *PKT-LINE* stream describing each ref and it current value.
   """
-  @spec reference_discovery(Git.repo) :: [binary]
-  def reference_discovery(repo) do
+  @spec reference_discovery(Git.repo, binary) :: [binary]
+  def reference_discovery(repo, service) do
     [reference_head(repo), reference_list(repo), reference_tags(repo)]
     |> List.flatten()
     |> Enum.map(&format_ref_line/1)
+    |> List.update_at(0, &(&1 <> "\0" <> server_capabilities(service)))
     |> Enum.map(&pkt_line/1)
     |> Enum.concat([pkt_line()])
   end
@@ -83,11 +85,12 @@ defmodule GitRekt.WireProtocol do
   # Helpers
   #
 
-  defp server_capabilities, do: Enum.join(@server_capabilities, " ")
+  defp server_capabilities("git-upload-pack"), do: Enum.join(@upload_caps, " ")
+  defp server_capabilities("git-receive-pack"), do: Enum.join(@receive_caps, " ")
 
   defp reference_head(repo) do
     case Git.reference_resolve(repo, "HEAD") do
-      {:ok, _refname, _shorthand, oid} -> {oid, "HEAD\0#{server_capabilities()}"}
+      {:ok, _refname, _shorthand, oid} -> {oid, "HEAD"}
       {:error, _reason} -> []
     end
   end