Commit 5e83f65d9da6ae8e2d6e1c657b46fd19368b927f
2022-03-05T15:37:00
fix 500 in repository show, op_params parser
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
diff --git a/lib/kmxgit_web/controllers/op_params.ex b/lib/kmxgit_web/controllers/op_params.ex
new file mode 100644
index 0000000..a16a473
--- /dev/null
+++ b/lib/kmxgit_web/controllers/op_params.ex
@@ -0,0 +1,5 @@
+defmodule KmxgitWeb.OpParams do
+
+ defstruct tree: nil, from: nil, git: nil, org: nil, path: nil, repo: nil, to: nil, user: nil
+
+end
diff --git a/lib/kmxgit_web/controllers/repository_controller.ex b/lib/kmxgit_web/controllers/repository_controller.ex
index 1c9842a..f730459 100644
--- a/lib/kmxgit_web/controllers/repository_controller.ex
+++ b/lib/kmxgit_web/controllers/repository_controller.ex
@@ -8,6 +8,7 @@ defmodule KmxgitWeb.RepositoryController do
alias Kmxgit.SlugManager
alias Kmxgit.UserManager.User
alias Kmxgit.Repo
+ alias KmxgitWeb.OpParams
def new(conn, params) do
action = Routes.repository_path(conn, :create, params["owner"])
@@ -99,9 +100,9 @@ defmodule KmxgitWeb.RepositoryController do
chunks = params["slug"] |> chunk_path()
slug = chunks |> Enum.at(0) |> Enum.join("/")
op = get_op(chunks)
- op_params = get_op_params(op, chunks)
- repo = RepositoryManager.get_repository_by_owner_and_slug(params["owner"], slug)
- if repo && repo.public_access || Repository.member?(repo, current_user) do
+ if op_params = get_op_params(op, chunks)
+ && repo = RepositoryManager.get_repository_by_owner_and_slug(params["owner"], slug)
+ && repo.public_access || Repository.member?(repo, current_user) do
org = repo.organisation
user = repo.user
git = setup_git(repo, conn, op, op_params)
@@ -110,7 +111,7 @@ defmodule KmxgitWeb.RepositoryController do
nil -> nil
end
tree1 = op_params.tree || first_tree
- op_params = %{op_params | tree: tree1, git: git, org: org, repo: repo, user: user}
+ op_params = %OpParams{op_params | tree: tree1, git: git, org: org, repo: repo, user: user}
if git.valid do
show_op(conn, op || :tree, op_params)
else
@@ -157,12 +158,14 @@ defmodule KmxgitWeb.RepositoryController do
end
defp get_op_params(nil, _) do
- %{tree: nil, from: nil, git: nil, org: nil, path: nil, repo: nil, to: nil, user: nil}
+ %OpParams{}
end
defp get_op_params(:diff, chunks) do
path = chunks |> Enum.at(1)
- {[_, from, to], _} = path |> Enum.split(3)
- %{tree: nil, from: from, git: nil, org: nil, path: nil, repo: nil, to: to, user: nil}
+ case path |> Enum.split(3) do
+ {[_, from, to], _} -> %OpParams{from: from, to: to}
+ _ -> nil
+ end
end
defp get_op_params(_, chunks) do
path = chunks |> Enum.at(1)
@@ -170,12 +173,16 @@ defmodule KmxgitWeb.RepositoryController do
rest1 = rest |> Enum.map(fn x ->
Enum.join(x, "/")
end)
- {[_, tree], path1} = path |> Enum.split(2)
- path2 = (path1 ++ rest1)
- |> Enum.reject(&(!&1 || &1 == ""))
- |> Enum.join("/")
- path3 = if path2 != "", do: path2
- %{tree: tree, from: nil, git: nil, org: nil, path: path3, repo: nil, to: nil, user: nil}
+ case path |> Enum.split(2) do
+ {[_, tree], path1} ->
+ path2 = (path1 ++ rest1)
+ |> Enum.reject(&(!&1 || &1 == ""))
+ |> Enum.join("/")
+ path3 = if path2 != "", do: path2
+ %OpParams{tree: tree, path: path3}
+ _ ->
+ nil
+ end
end
defp setup_git(repo, conn, op, %{path: path}) do