diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-02-15 01:48:03 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-02-15 01:48:03 +0000 |
| commit | f28dcc9cb748fc75d41cfc3038209fa45f2b90c7 (patch) | |
| tree | a5b0be5db3125cf8e33c3abe2291cc84b828e108 | |
| parent | d19642d7eba9adc51de48b113f5a5ebfafbaf40d (diff) | |
| parent | 3b82864bccee1af625dd19faed511d5b76f66f9d (diff) | |
| download | pleroma-f28dcc9cb748fc75d41cfc3038209fa45f2b90c7.tar.gz pleroma-f28dcc9cb748fc75d41cfc3038209fa45f2b90c7.zip | |
Merge branch 'config-stat-symlink' into 'develop'
Config: Check the permissions of the linked file instead of the symlink
See merge request pleroma/pleroma!4061
| -rw-r--r-- | changelog.d/config-stat-symlink.fix | 1 | ||||
| -rw-r--r-- | lib/pleroma/config/release_runtime_provider.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/config-stat-symlink.fix b/changelog.d/config-stat-symlink.fix new file mode 100644 index 000000000..c8b98225d --- /dev/null +++ b/changelog.d/config-stat-symlink.fix @@ -0,0 +1 @@ +- Config: Check the permissions of the linked file instead of the symlink diff --git a/lib/pleroma/config/release_runtime_provider.ex b/lib/pleroma/config/release_runtime_provider.ex index 9ec0f975e..351639836 100644 --- a/lib/pleroma/config/release_runtime_provider.ex +++ b/lib/pleroma/config/release_runtime_provider.ex @@ -21,7 +21,7 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do with_runtime_config = if File.exists?(config_path) do # <https://git.pleroma.social/pleroma/pleroma/-/issues/3135> - %File.Stat{mode: mode} = File.lstat!(config_path) + %File.Stat{mode: mode} = File.stat!(config_path) if Bitwise.band(mode, 0o007) > 0 do raise "Configuration at #{config_path} has world-permissions, execute the following: chmod o= #{config_path}" |