Commit c4b95a0f0325636a11fc810c673d55456c52db66
2021-12-13T14:44:49
write public access file
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
diff --git a/lib/kmxgit/git_manager.ex b/lib/kmxgit/git_manager.ex
index f7b5c5f..5c97151 100644
--- a/lib/kmxgit/git_manager.ex
+++ b/lib/kmxgit/git_manager.ex
@@ -52,7 +52,6 @@ defmodule Kmxgit.GitManager do
dir = git_dir(repo)
path1 = if path == "" do "." else path end
{out, status} = System.cmd("git", ["-C", dir, "ls-tree", tree, path1], stderr_to_stdout: true)
- IO.inspect {out, status}
case status do
0 ->
list = out
@@ -163,4 +162,19 @@ defmodule Kmxgit.GitManager do
end
end
end
+
+ def public_access(repo, true) do
+ dir = git_dir(repo)
+ if ! File.exists?(export = "#{dir}/git-daemon-export-ok") do
+ File.write!(export, "")
+ end
+ :ok
+ end
+ def public_access(repo, false) do
+ dir = git_dir(repo)
+ if File.exists?(export = "#{dir}/git-daemon-export-ok") do
+ File.rm!(export)
+ end
+ :ok
+ end
end
diff --git a/lib/kmxgit/repository_manager/repository.ex b/lib/kmxgit/repository_manager/repository.ex
index a8b0dcb..9156abc 100644
--- a/lib/kmxgit/repository_manager/repository.ex
+++ b/lib/kmxgit/repository_manager/repository.ex
@@ -119,8 +119,12 @@ defmodule Kmxgit.RepositoryManager.Repository do
"#{ssh_root}:#{full_slug(repo)}.git"
end
- def splat(repo) do
- String.split(repo.slug, "/")
+ def splat(repo, rest \\ []) do
+ String.split(repo.slug, "/") ++ rest
+ end
+
+ def git_splat(repo, rest \\ []) do
+ String.split("#{repo.slug}.git", "/") ++ rest
end
def owners(repo) do
diff --git a/lib/kmxgit_web.ex b/lib/kmxgit_web.ex
index eb72bf6..52ffa53 100644
--- a/lib/kmxgit_web.ex
+++ b/lib/kmxgit_web.ex
@@ -32,6 +32,13 @@ defmodule KmxgitWeb do
|> put_view(ErrorView)
|> render(:"404")
end
+
+ def forbidden(conn, _params \\ %{}) do
+ conn
+ |> put_status(403)
+ |> put_view(ErrorView)
+ |> render(:"403")
+ end
end
end
diff --git a/lib/kmxgit_web/controllers/admin/repository_controller.ex b/lib/kmxgit_web/controllers/admin/repository_controller.ex
index 6c0964a..90b9b90 100644
--- a/lib/kmxgit_web/controllers/admin/repository_controller.ex
+++ b/lib/kmxgit_web/controllers/admin/repository_controller.ex
@@ -104,7 +104,7 @@ defmodule KmxgitWeb.Admin.RepositoryController do
end) do
{:ok, repo1} ->
case GitManager.update_auth() do
- :ok -> nil
+ :ok -> :ok = GitManager.public_access(Repository.full_slug(repo1), repo1.public_access)
error -> IO.inspect(error)
end
conn
diff --git a/lib/kmxgit_web/controllers/repository_controller.ex b/lib/kmxgit_web/controllers/repository_controller.ex
index ccb8a8f..5a799d4 100644
--- a/lib/kmxgit_web/controllers/repository_controller.ex
+++ b/lib/kmxgit_web/controllers/repository_controller.ex
@@ -281,7 +281,7 @@ defmodule KmxgitWeb.RepositoryController do
end) do
{:ok, repo1} ->
case GitManager.update_auth() do
- :ok -> nil
+ :ok -> :ok = GitManager.public_access(Repository.full_slug(repo1), repo1.public_access)
error -> IO.inspect(error)
end
conn