diff options
| author | lain <lain@soykaf.club> | 2024-05-27 18:43:05 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-05-27 18:43:05 +0000 |
| commit | 121791882fc1b1f25e2a0a104ee9fde4e489e6ae (patch) | |
| tree | ef3ece881edde26fafb96d63e5ad399ce08f1397 /config | |
| parent | 3316a7ab70359b73e295018b97e4807bda10a537 (diff) | |
| parent | 81e44ced0c7251b5a6b585f297e1e00fad08c6d1 (diff) | |
| download | pleroma-121791882fc1b1f25e2a0a104ee9fde4e489e6ae.tar.gz pleroma-121791882fc1b1f25e2a0a104ee9fde4e489e6ae.zip | |
Merge branch 'explicitly-allow-unsafe-2' into 'develop'
Explicitly allow unsafe 2
See merge request pleroma/pleroma!4125
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/test.exs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index cd86816fe..956d067f3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -519,7 +519,8 @@ config :pleroma, :http_security, sts: false, sts_max_age: 31_536_000, ct_max_age: 2_592_000, - referrer_policy: "same-origin" + referrer_policy: "same-origin", + allow_unsafe_eval: false config :cors_plug, max_age: 86_400, diff --git a/config/test.exs b/config/test.exs index 3345bb3a9..6c88ad3c6 100644 --- a/config/test.exs +++ b/config/test.exs @@ -154,6 +154,7 @@ config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock 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 peer_module = if String.to_integer(System.otp_release()) >= 25 do |