[#2497] Customized exexec launch to support root operation (currently required by Gitlab CI).

This commit is contained in:
Ivan Tashkinov 2020-05-21 21:47:32 +03:00
parent 610343edb3
commit 3a1e810aaa
6 changed files with 59 additions and 4 deletions

View file

@ -6,6 +6,7 @@ variables: &global_variables
POSTGRES_PASSWORD: postgres POSTGRES_PASSWORD: postgres
DB_HOST: postgres DB_HOST: postgres
MIX_ENV: test MIX_ENV: test
USER: root
cache: &global_cache_policy cache: &global_cache_policy
key: ${CI_COMMIT_REF_SLUG} key: ${CI_COMMIT_REF_SLUG}

View file

@ -681,6 +681,10 @@ config :pleroma, :restrict_unauthenticated,
config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
config :pleroma, :exexec,
root_mode: false,
options: %{}
# Import environment specific config. This must remain at the bottom # Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above. # of this file so it overrides the configuration defined above.
import_config "#{Mix.env()}.exs" import_config "#{Mix.env()}.exs"

38
lib/pleroma/exec.ex Normal file
View file

@ -0,0 +1,38 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Exec do
@moduledoc "Pleroma wrapper around Exexec commands."
alias Pleroma.Config
def ensure_started(options_overrides \\ %{}) do
options =
if Config.get([:exexec, :root_mode]) || System.get_env("USER") == "root" do
# Note: running as `root` is discouraged (yet Gitlab CI does that by default)
%{root: true, user: "root", limit_users: ["root"]}
else
%{}
end
options =
options
|> Map.merge(Config.get([:exexec, :options], %{}))
|> Map.merge(options_overrides)
with {:error, {:already_started, pid}} <- Exexec.start(options) do
{:ok, pid}
end
end
def run(cmd, options \\ %{}) do
ensure_started()
Exexec.run(cmd, options)
end
def cmd(cmd, options \\ %{}) do
options = Map.merge(%{sync: true, stdout: true}, options)
run(cmd, options)
end
end

View file

@ -7,8 +7,6 @@ defmodule Pleroma.Helpers.MediaHelper do
Handles common media-related operations. Handles common media-related operations.
""" """
@ffmpeg_opts [{:sync, true}, {:stdout, true}]
def ffmpeg_resize_remote(uri, %{max_width: max_width, max_height: max_height}) do def ffmpeg_resize_remote(uri, %{max_width: max_width, max_height: max_height}) do
cmd = ~s""" cmd = ~s"""
curl -L "#{uri}" | curl -L "#{uri}" |
@ -20,7 +18,7 @@ defmodule Pleroma.Helpers.MediaHelper do
cat cat
""" """
with {:ok, [stdout: stdout_list]} <- Exexec.run(cmd, @ffmpeg_opts) do with {:ok, [stdout: stdout_list]} <- Pleroma.Exec.cmd(cmd) do
{:ok, Enum.join(stdout_list)} {:ok, Enum.join(stdout_list)}
end end
end end

View file

@ -197,7 +197,8 @@ defmodule Pleroma.Mixfile do
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"}, ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:mox, "~> 0.5", only: :test}, {:mox, "~> 0.5", only: :test},
{:restarter, path: "./restarter"}, {:restarter, path: "./restarter"},
{:exexec, "~> 0.2"}, # Note: `runtime: true` for :exexec makes CI fail due to `root` user (see Pleroma.Exec)
{:exexec, "~> 0.2", runtime: false},
{:open_api_spex, {:open_api_spex,
git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git", git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git",
ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"} ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"}

13
test/exec_test.exs Normal file
View file

@ -0,0 +1,13 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.ExecTest do
alias Pleroma.Exec
use Pleroma.DataCase
test "it starts" do
assert {:ok, _} = Exec.ensure_started()
end
end