Commit b38c94609b518b2073db9310ff2238c2cbaa1d5e
2022-05-10T19:51:18
use Kmxgit.GitAuth port to update git auth
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 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420
diff --git a/bin/update_auth b/bin/update_auth
new file mode 100755
index 0000000..ed01ae9
--- /dev/null
+++ b/bin/update_auth
@@ -0,0 +1,6 @@
+#!/bin/sh
+while read LINE; do
+ echo "update auth" >&2
+ bin/update_etc_git_auth
+ bin/update_git_ssh_authorized_keys
+done
diff --git a/lib/kmxgit/application.ex b/lib/kmxgit/application.ex
index 79c4264..75aca4a 100644
--- a/lib/kmxgit/application.ex
+++ b/lib/kmxgit/application.ex
@@ -8,16 +8,11 @@ defmodule Kmxgit.Application do
@impl true
def start(_type, _args) do
children = [
- # Start the Ecto repository
Kmxgit.Repo,
- # Start the Telemetry supervisor
+ Kmxgit.GitAuth,
KmxgitWeb.Telemetry,
- # Start the PubSub system
{Phoenix.PubSub, name: Kmxgit.PubSub},
- # Start the Endpoint (http/https)
KmxgitWeb.Endpoint
- # Start a worker by calling: Kmxgit.Worker.start_link(arg)
- # {Kmxgit.Worker, arg}
]
# See https://hexdocs.pm/elixir/Supervisor.html
diff --git a/lib/kmxgit/git.ex b/lib/kmxgit/git.ex
index 8179575..abd0632 100644
--- a/lib/kmxgit/git.ex
+++ b/lib/kmxgit/git.ex
@@ -37,7 +37,7 @@ defmodule Kmxgit.Git do
{:ok, files} ->
files1 = files
|> Enum.map(fn file ->
- Map.put(file, :url, "#{parent}/#{file.name}")
+ Map.put(file, :url, "#{parent}/#{path}/#{file.name}")
end)
{:ok, files1}
x -> x
diff --git a/lib/kmxgit/git_auth.ex b/lib/kmxgit/git_auth.ex
new file mode 100644
index 0000000..d1a249d
--- /dev/null
+++ b/lib/kmxgit/git_auth.ex
@@ -0,0 +1,23 @@
+defmodule Kmxgit.GitAuth do
+ use GenServer
+
+ def start_link(_opts) do
+ GenServer.start_link(__MODULE__, nil, name: __MODULE__)
+ end
+
+ @impl true
+ def init(_opts) do
+ port = Port.open({:spawn_executable, "bin/update_auth"}, [:binary])
+ {:ok, %{port: port}}
+ end
+
+ @impl true
+ def handle_cast(:update, state = %{port: port}) do
+ Port.command(port, "\n")
+ {:noreply, state}
+ end
+
+ def update() do
+ GenServer.cast(__MODULE__, :update)
+ end
+end
diff --git a/lib/kmxgit_web/controllers/admin/organisation_controller.ex b/lib/kmxgit_web/controllers/admin/organisation_controller.ex
index 14eda1e..74ee36f 100644
--- a/lib/kmxgit_web/controllers/admin/organisation_controller.ex
+++ b/lib/kmxgit_web/controllers/admin/organisation_controller.ex
@@ -2,6 +2,7 @@ defmodule KmxgitWeb.Admin.OrganisationController do
use KmxgitWeb, :controller
alias Kmxgit.IndexParams
+ alias Kmxgit.GitAuth
alias Kmxgit.GitManager
alias Kmxgit.OrganisationManager
alias Kmxgit.Repo
@@ -82,10 +83,7 @@ defmodule KmxgitWeb.Admin.OrganisationController do
if org.slug.slug != org1.slug.slug do
case GitManager.rename_dir(org.slug.slug, org1.slug.slug) do
:ok ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
org1
{:error, err} -> Repo.rollback(err)
end
@@ -123,10 +121,7 @@ defmodule KmxgitWeb.Admin.OrganisationController do
org = OrganisationManager.get_organisation!(params["organisation_id"])
case OrganisationManager.add_user(org, login) do
{:ok, org1} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.admin_organisation_path(conn, :show, org1))
{:error, _} ->
@@ -150,10 +145,7 @@ defmodule KmxgitWeb.Admin.OrganisationController do
org = OrganisationManager.get_organisation!(params["organisation_id"])
case OrganisationManager.remove_user(org, login) do
{:ok, org} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.admin_organisation_path(conn, :show, org))
{:error, _} ->
@@ -169,10 +161,7 @@ defmodule KmxgitWeb.Admin.OrganisationController do
if org do
case OrganisationManager.delete_organisation(org) do
{:ok, _} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.admin_organisation_path(conn, :index))
{:error, _} ->
diff --git a/lib/kmxgit_web/controllers/admin/repository_controller.ex b/lib/kmxgit_web/controllers/admin/repository_controller.ex
index d70e044..de31cfd 100644
--- a/lib/kmxgit_web/controllers/admin/repository_controller.ex
+++ b/lib/kmxgit_web/controllers/admin/repository_controller.ex
@@ -2,6 +2,7 @@ defmodule KmxgitWeb.Admin.RepositoryController do
use KmxgitWeb, :controller
alias Kmxgit.IndexParams
+ alias Kmxgit.GitAuth
alias Kmxgit.GitManager
alias Kmxgit.RepositoryManager
alias Kmxgit.RepositoryManager.Repository
@@ -72,10 +73,8 @@ defmodule KmxgitWeb.Admin.RepositoryController do
end
end) do
{:ok, repo} ->
- case GitManager.update_auth() do
- :ok -> :ok = GitManager.public_access(Repository.full_slug(repo), repo.public_access)
- error -> IO.inspect(error)
- end
+ GitAuth.update()
+ :ok = GitManager.public_access(Repository.full_slug(repo), repo.public_access)
conn
|> redirect(to: Routes.admin_repository_path(conn, :show, repo))
{:error, changeset} ->
@@ -121,10 +120,8 @@ defmodule KmxgitWeb.Admin.RepositoryController do
end
end) do
{:ok, repo1} ->
- case GitManager.update_auth() do
- :ok -> :ok = GitManager.public_access(Repository.full_slug(repo1), repo1.public_access)
- error -> IO.inspect(error)
- end
+ GitAuth.update()
+ :ok = GitManager.public_access(Repository.full_slug(repo1), repo1.public_access)
conn
|> redirect(to: Routes.admin_repository_path(conn, :show, repo1))
{:error, changeset} ->
@@ -149,10 +146,7 @@ defmodule KmxgitWeb.Admin.RepositoryController do
repo = RepositoryManager.get_repository!(params["repository_id"])
case RepositoryManager.add_member(repo, login) do
{:ok, repo} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.admin_repository_path(conn, :show, repo))
{:error, _} ->
@@ -176,10 +170,7 @@ defmodule KmxgitWeb.Admin.RepositoryController do
repo = RepositoryManager.get_repository!(params["repository_id"])
case RepositoryManager.remove_member(repo, login) do
{:ok, repo} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.admin_repository_path(conn, :show, repo))
{:error, _} ->
@@ -200,10 +191,7 @@ defmodule KmxgitWeb.Admin.RepositoryController do
end
end) do
{:ok, _} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.admin_repository_path(conn, :index))
{:error, changeset} ->
diff --git a/lib/kmxgit_web/controllers/admin/user_controller.ex b/lib/kmxgit_web/controllers/admin/user_controller.ex
index 4116d11..350ce5e 100644
--- a/lib/kmxgit_web/controllers/admin/user_controller.ex
+++ b/lib/kmxgit_web/controllers/admin/user_controller.ex
@@ -2,6 +2,7 @@ defmodule KmxgitWeb.Admin.UserController do
use KmxgitWeb, :controller
alias Kmxgit.IndexParams
+ alias Kmxgit.GitAuth
alias Kmxgit.GitManager
alias Kmxgit.RepositoryManager
alias Kmxgit.UserManager
@@ -85,10 +86,7 @@ defmodule KmxgitWeb.Admin.UserController do
if user do
case UserManager.admin_update_user(user, params["user"]) do
{:ok, user1} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.admin_user_path(conn, :show, user1))
{:error, changeset} ->
@@ -137,10 +135,7 @@ defmodule KmxgitWeb.Admin.UserController do
def delete(conn, params) do
if user = UserManager.get_user(params["id"]) do
{:ok, _} = UserManager.delete_user(user)
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.admin_user_path(conn, :index))
else
diff --git a/lib/kmxgit_web/controllers/organisation_controller.ex b/lib/kmxgit_web/controllers/organisation_controller.ex
index f64a7cb..40ff9ac 100644
--- a/lib/kmxgit_web/controllers/organisation_controller.ex
+++ b/lib/kmxgit_web/controllers/organisation_controller.ex
@@ -1,6 +1,7 @@
defmodule KmxgitWeb.OrganisationController do
use KmxgitWeb, :controller
+ alias Kmxgit.GitAuth
alias Kmxgit.GitManager
alias Kmxgit.OrganisationManager
alias Kmxgit.OrganisationManager.Organisation
@@ -54,10 +55,7 @@ defmodule KmxgitWeb.OrganisationController do
if org.slug.slug != org1.slug.slug do
case GitManager.rename_dir(org.slug.slug, org1.slug.slug) do
:ok ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
org1
{:error, err} -> Repo.rollback(err)
end
@@ -101,10 +99,7 @@ defmodule KmxgitWeb.OrganisationController do
if org && Organisation.owner?(org, current_user) do
case OrganisationManager.add_user(org, login) do
{:ok, org} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.slug_path(conn, :show, org.slug.slug))
{:error, _e} ->
@@ -138,10 +133,7 @@ defmodule KmxgitWeb.OrganisationController do
if org && Organisation.owner?(org, current_user) do
case OrganisationManager.remove_user(org, login) do
{:ok, org} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.slug_path(conn, :show, org.slug.slug))
{:error, _} ->
@@ -164,10 +156,7 @@ defmodule KmxgitWeb.OrganisationController do
{:ok, _} ->
case GitManager.delete_dir(org.slug.slug) do
:ok ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
:ok
{:error, out} -> Repo.rollback(status: out)
end
diff --git a/lib/kmxgit_web/controllers/repository_controller.ex b/lib/kmxgit_web/controllers/repository_controller.ex
index 50c45f2..ea5fde6 100644
--- a/lib/kmxgit_web/controllers/repository_controller.ex
+++ b/lib/kmxgit_web/controllers/repository_controller.ex
@@ -80,10 +80,8 @@ defmodule KmxgitWeb.RepositoryController do
end
end) do
{:ok, repo} ->
- case GitManager.update_auth() do
- :ok -> :ok = GitManager.public_access(Repository.full_slug(repo), repo.public_access)
- error -> IO.inspect(error)
- end
+ GitAuth.update()
+ :ok = GitManager.public_access(Repository.full_slug(repo), repo.public_access)
conn
|> redirect(to: Routes.repository_path(conn, :show, owner.slug.slug, Repository.splat(repo)))
{:error, changeset} ->
@@ -524,10 +522,8 @@ defmodule KmxgitWeb.RepositoryController do
end)
case tr do
{:ok, repo1} ->
- case GitManager.update_auth() do
- :ok -> :ok = GitManager.public_access(Repository.full_slug(repo1), repo1.public_access)
- error -> IO.inspect(error)
- end
+ GitAuth.update()
+ :ok = GitManager.public_access(Repository.full_slug(repo1), repo1.public_access)
conn
|> redirect(to: Routes.repository_path(conn, :show, Repository.owner_slug(repo1), Repository.splat(repo1)))
{:error, changeset} ->
@@ -570,10 +566,7 @@ defmodule KmxgitWeb.RepositoryController do
org = repo.organisation
case RepositoryManager.add_member(repo, login) do
{:ok, repo} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.repository_path(conn, :show, params["owner"], Repository.splat(repo)))
{:error, _} ->
@@ -615,10 +608,7 @@ defmodule KmxgitWeb.RepositoryController do
org = repo.organisation
case RepositoryManager.remove_member(repo, login) do
{:ok, repo} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.repository_path(conn, :show, params["owner"], Repository.splat(repo)))
{:error, _} ->
@@ -646,10 +636,7 @@ defmodule KmxgitWeb.RepositoryController do
end
end) do
{:ok, _} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.slug_path(conn, :show, params["owner"]))
{:error, _changeset} ->
@@ -767,10 +754,7 @@ defmodule KmxgitWeb.RepositoryController do
end
end) do
{:ok, repo} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.repository_path(conn, :show, owner.slug.slug, Repository.splat(repo)))
{:error, changeset} ->
diff --git a/lib/kmxgit_web/controllers/user_controller.ex b/lib/kmxgit_web/controllers/user_controller.ex
index 4596661..13c0b7a 100644
--- a/lib/kmxgit_web/controllers/user_controller.ex
+++ b/lib/kmxgit_web/controllers/user_controller.ex
@@ -1,6 +1,7 @@
defmodule KmxgitWeb.UserController do
use KmxgitWeb, :controller
+ alias Kmxgit.GitAuth
alias Kmxgit.GitManager
alias Kmxgit.Repo
alias Kmxgit.UserManager
@@ -59,10 +60,7 @@ defmodule KmxgitWeb.UserController do
end
end) do
{:ok, user} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update()
conn
|> redirect(to: Routes.slug_path(conn, :show, User.login(user)))
{:error, changeset} ->
@@ -164,10 +162,7 @@ defmodule KmxgitWeb.UserController do
end
end) do
{:ok, _} ->
- case GitManager.update_auth() do
- :ok -> nil
- error -> IO.inspect(error)
- end
+ GitAuth.update() do
conn
|> redirect(to: "/")
{:error, changeset} ->