diff options
| author | lain <lain@soykaf.club> | 2025-03-11 16:04:14 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2025-03-11 16:04:14 +0000 |
| commit | 66687beddaf6cee236a2e035c0f4582ec586f957 (patch) | |
| tree | 9ee7bf53ef26d1fc2f39922808b8beb24c18414f /config | |
| parent | af6d5470d29f294e9b356da36cccbcaf85379f78 (diff) | |
| parent | 5ce612b2723381a978f3810a414a3c3038a1859c (diff) | |
| download | pleroma-stable.tar.gz pleroma-stable.zip | |
Merge branch 'release/2.9.1' into 'stable'stable
Release/2.9.1
See merge request pleroma/pleroma!4338
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 10 | ||||
| -rw-r--r-- | config/description.exs | 13 | ||||
| -rw-r--r-- | config/test.exs | 7 |
3 files changed, 29 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 31783b488..50672cfc8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -65,7 +65,8 @@ config :pleroma, Pleroma.Upload, proxy_remote: false, filename_display_max_length: 30, default_description: nil, - base_url: nil + base_url: nil, + allowed_mime_types: ["image", "audio", "video"] config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" @@ -806,6 +807,13 @@ config :pleroma, :frontends, "https://lily-is.land/infra/glitch-lily/-/jobs/artifacts/${ref}/download?job=build", "ref" => "servant", "build_dir" => "public" + }, + "pl-fe" => %{ + "name" => "pl-fe", + "git" => "https://github.com/mkljczk/pl-fe", + "build_url" => "https://pl.mkljczk.pl/pl-fe.zip", + "ref" => "develop", + "build_dir" => "." } } diff --git a/config/description.exs b/config/description.exs index f091e4924..996978298 100644 --- a/config/description.exs +++ b/config/description.exs @@ -117,6 +117,19 @@ config :pleroma, :config_description, [ key: :filename_display_max_length, type: :integer, description: "Set max length of a filename to display. 0 = no limit. Default: 30" + }, + %{ + key: :allowed_mime_types, + label: "Allowed MIME types", + type: {:list, :string}, + description: + "List of MIME (main) types uploads are allowed to identify themselves with. Other types may still be uploaded, but will identify as a generic binary to clients. WARNING: Loosening this over the defaults can lead to security issues. Removing types is safe, but only add to the list if you are sure you know what you are doing.", + suggestions: [ + "image", + "audio", + "video", + "font" + ] } ] }, diff --git a/config/test.exs b/config/test.exs index 1903ac9ee..0f8b12ffe 100644 --- a/config/test.exs +++ b/config/test.exs @@ -147,6 +147,7 @@ config :pleroma, Pleroma.Search.Meilisearch, url: "http://127.0.0.1:7700/", priv config :phoenix, :plug_init_mode, :runtime config :pleroma, :config_impl, Pleroma.UnstubbedConfigMock +config :pleroma, :datetime_impl, Pleroma.DateTimeMock config :pleroma, Pleroma.PromEx, disabled: true @@ -161,6 +162,12 @@ config :pleroma, Pleroma.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMoc config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.StaticStubbedConfigMock config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug, config_impl: Pleroma.StaticStubbedConfigMock +config :pleroma, Pleroma.Upload.Filter.AnonymizeFilename, + config_impl: Pleroma.StaticStubbedConfigMock + +config :pleroma, Pleroma.Upload.Filter.Mogrify, config_impl: Pleroma.StaticStubbedConfigMock +config :pleroma, Pleroma.Upload.Filter.Mogrify, mogrify_impl: Pleroma.MogrifyMock + config :pleroma, Pleroma.Signature, http_signatures_impl: Pleroma.StubbedHTTPSignaturesMock peer_module = |