diff options
| author | feld <feld@feld.me> | 2024-07-24 20:58:31 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-07-24 20:58:31 +0000 |
| commit | 700c1066801ba1400a32c819fb0e608aa834aa51 (patch) | |
| tree | d3b034ccdde9bb3b03738380e5c1ccd49e3c0450 /config/config.exs | |
| parent | f32a837afa694999426d644d00ddbe0c521d0bb3 (diff) | |
| parent | 659891921371fd3a8788089fbc96a9158f07f289 (diff) | |
| download | pleroma-700c1066801ba1400a32c819fb0e608aa834aa51.tar.gz pleroma-700c1066801ba1400a32c819fb0e608aa834aa51.zip | |
Merge branch 'oban/rich-media-hardening' into 'develop'
Harden Rich Media parsing against very slow or malicious URLs
See merge request pleroma/pleroma!4192
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 044f951f6..30626d4a1 100644 --- a/config/config.exs +++ b/config/config.exs @@ -448,7 +448,7 @@ config :pleroma, :rich_media, Pleroma.Web.RichMedia.Parsers.TwitterCard, Pleroma.Web.RichMedia.Parsers.OEmbed ], - failure_backoff: 60_000, + timeout: 5_000, ttl_setters: [ Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl, Pleroma.Web.RichMedia.Parser.TTL.Opengraph @@ -580,6 +580,8 @@ config :pleroma, Pleroma.User, ], email_blacklist: [] +# The Pruner :max_age must be longer than Worker :unique +# value or it cannot enforce uniqueness. config :pleroma, Oban, repo: Pleroma.Repo, log: false, @@ -593,7 +595,7 @@ config :pleroma, Oban, search_indexing: [limit: 10, paused: true], slow: 5 ], - plugins: [Oban.Plugins.Pruner], + plugins: [{Oban.Plugins.Pruner, max_age: 900}], crontab: [ {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}, {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker} |