diff options
| author | lain <lain@soykaf.club> | 2024-05-28 11:22:34 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-05-28 11:22:34 +0000 |
| commit | bef15cde6141a977aebdfc998d6091a31c4fc2d6 (patch) | |
| tree | efd0a502a422296b5fc47bb5e91b2ac14fc868a3 /config | |
| parent | 25903a4996d12306d454be960a0a7478541b1879 (diff) | |
| parent | 335691bae1a002c1a3bec956884fe665114285ec (diff) | |
| download | pleroma-bef15cde6141a977aebdfc998d6091a31c4fc2d6.tar.gz pleroma-bef15cde6141a977aebdfc998d6091a31c4fc2d6.zip | |
Merge branch 'secure-mode' into 'develop'
Reject requests from specified instances if `authorized_fetch_mode` is enabled
See merge request pleroma/pleroma!3711
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 12 | ||||
| -rw-r--r-- | config/test.exs | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 3804dd809..c3b8ae0b7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -192,6 +192,7 @@ config :pleroma, :instance, allow_relay: true, public: true, quarantined_instances: [], + rejected_instances: [], static_dir: "instance/static/", allowed_post_formats: [ "text/plain", diff --git a/config/description.exs b/config/description.exs index a9c285421..12beec842 100644 --- a/config/description.exs +++ b/config/description.exs @@ -775,6 +775,18 @@ config :pleroma, :config_description, [ ] }, %{ + key: :rejected_instances, + type: {:list, :tuple}, + key_placeholder: "instance", + value_placeholder: "reason", + description: + "List of ActivityPub instances to reject requests from if authorized_fetch_mode is enabled", + suggestions: [ + {"rejected.com", "Reason"}, + {"*.rejected.com", "Reason"} + ] + }, + %{ key: :static_dir, type: :string, description: "Instance static directory", diff --git a/config/test.exs b/config/test.exs index 6c88ad3c6..0d4c82e0e 100644 --- a/config/test.exs +++ b/config/test.exs @@ -155,6 +155,10 @@ config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfig config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock config :pleroma, Pleroma.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMock config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.StaticStubbedConfigMock +config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug, config_impl: Pleroma.StaticStubbedConfigMock + +config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug, + http_signatures_impl: Pleroma.StubbedHTTPSignaturesMock peer_module = if String.to_integer(System.otp_release()) >= 25 do |