Josh Fabean
|
f3738d69c5
|
Adding extra proxy_set_header to fix redirect issue on media. ref #194
|
2023-06-19 22:38:30 -04:00 |
|
Alex Gleason
|
e8928e2295
|
Merge branch 'merge-pleroma' into 'develop'
Merge Pleroma
See merge request soapbox-pub/rebased!247
|
2023-06-07 21:50:27 +00:00 |
|
Mark Felder
|
91d19122ff
|
changelog.d
|
2023-06-07 10:26:40 -05:00 |
|
Mark Felder
|
bc2fe1b672
|
Revert MediaProxy Host header validation
Something is going wrong here even though the tests are correct.
|
2023-06-07 10:26:36 -05:00 |
|
Alex Gleason
|
0c0dac661c
|
Disable analysis CI
|
2023-06-07 09:16:59 -05:00 |
|
Alex Gleason
|
b7b428eb59
|
Merge branch 'spam-mrf-fix3' into 'develop'
AntiMentionSpamPolicy: remove followers check
See merge request soapbox-pub/rebased!252
|
2023-06-05 20:49:36 +00:00 |
|
Mark Felder
|
b271041857
|
Use response_content_type test assertion from Phoenix.ConnTest
|
2023-06-05 15:43:44 -05:00 |
|
Mark Felder
|
bf5fa7d193
|
Switch to filtering out various xml and html types by focusing on the subtype
|
2023-06-05 15:43:39 -05:00 |
|
Mark Felder
|
478f899e76
|
Fix scrubbing for files served by Plug.Static
Using this :headers option we can rewrite the content-type before the conn is halted
|
2023-06-05 15:43:30 -05:00 |
|
Mark Felder
|
a2ee5e4ccf
|
Scrub content-type of uploaded media before serving
|
2023-06-05 15:43:26 -05:00 |
|
Alex Gleason
|
944fd73b36
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2023-06-05 15:38:19 -05:00 |
|
Haelwenn
|
e8d3525665
|
Merge branch 'bump-gettext' into 'develop'
mix: bump gettext to 0.22
See merge request pleroma/pleroma!3831
|
2023-06-02 01:38:41 +00:00 |
|
Haelwenn (lanodan) Monnier
|
313e68c180
|
mix: bump gettext to ~0.20
Includes https://github.com/elixir-gettext/gettext/pull/304 in 0.20.0+
Includes https://github.com/elixir-gettext/expo/issues/91 in 0.22+ via expo 0.2.0+
|
2023-06-02 03:06:32 +02:00 |
|
Haelwenn
|
e2a63dadd1
|
Merge branch 'test_improvement' into 'develop'
Use Phoenix.ConnTest.redirected_to/2
See merge request pleroma/pleroma!3899
|
2023-06-01 09:40:25 +00:00 |
|
Mark Felder
|
46c799f528
|
Use Phoenix.ConnTest.redirected_to/2
|
2023-05-31 09:54:37 -04:00 |
|
Haelwenn
|
d998a114e2
|
Merge branch 'validate-host' into 'develop'
Validate Host header for MediaProxy and Uploads
See merge request pleroma/pleroma!3896
|
2023-05-31 00:50:01 +00:00 |
|
Mark Felder
|
b3c3bd99c3
|
Switch from serving a 400 to a 302
|
2023-05-30 16:56:09 -04:00 |
|
lain
|
da6b4003ac
|
Merge branch 'only_media_filter' into 'develop'
Add OnlyMedia Upload Filter
See merge request pleroma/pleroma!3897
|
2023-05-30 08:04:23 +00:00 |
|
Mark Felder
|
50a20f3bbd
|
Esacpe the asterisks in Markdown
|
2023-05-29 15:53:16 -04:00 |
|
Mark Felder
|
9caa0b0be1
|
Add OnlyMedia Upload Filter to simplify restricting uploads to audio, image, and video types
|
2023-05-29 15:49:04 -04:00 |
|
Mark Felder
|
da7394f33b
|
Fix unused assignment
|
2023-05-29 15:09:31 -04:00 |
|
Mark Felder
|
43bb2f39db
|
Remove unwanted parameter
|
2023-05-29 15:05:37 -04:00 |
|
Mark Felder
|
84974efe4c
|
Host header validation is now required for MediaProxy and Uploads
|
2023-05-29 14:17:27 -04:00 |
|
Mark Felder
|
a60dd0d92d
|
Validate Host header matches expected value before allowing access to Uploads
|
2023-05-29 14:16:03 -04:00 |
|
Mark Felder
|
843fcca5b4
|
Validate Host header matches expected value before allowing access to MediaProxy
|
2023-05-29 13:59:51 -04:00 |
|
Mark Felder
|
506a1c98e7
|
ConnCase: Make sure the host we use in tests is the actual Endpoint host
|
2023-05-29 13:55:48 -04:00 |
|
|
|
c705e917bb
|
Remove test, we don't drop fep-e232 quotes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-05-27 13:18:10 +02:00 |
|
|
|
a1567f2c68
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-05-27 01:33:43 +02:00 |
|
marcin mikołajczak
|
d9316c4804
|
Merge branch 'revoke-tokens' into 'develop'
Add route to revoke all tokens
See merge request soapbox-pub/rebased!253
|
2023-05-26 22:25:13 +00:00 |
|
Haelwenn
|
31ec5cd35e
|
Merge branch 'mergeback/2.5.2' into 'develop'
Mergeback: 2.5.2
Closes #3030, #3062, and #3045
See merge request pleroma/pleroma!3893
|
2023-05-26 22:16:18 +00:00 |
|
|
|
c7309f723c
|
Add route to revoke all tokens
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-05-27 00:06:45 +02:00 |
|
Haelwenn (lanodan) Monnier
|
869f0d24a6
|
Merge branch 'release/2.5.2' into mergeback/2.5.2
|
2023-05-26 23:47:50 +02:00 |
|
Haelwenn
|
cd9d6a12ab
|
Merge branch 'issue/3126' into 'develop'
Filter OEmbed HTML tags
See merge request pleroma/pleroma!3891
|
2023-05-26 18:26:40 +00:00 |
|
Haelwenn (lanodan) Monnier
|
7618e562b3
|
Version 2.5.2
|
2023-05-26 19:57:00 +02:00 |
|
Mark Felder
|
4505bc1e58
|
Filter OEmbed HTML tags
|
2023-05-26 19:56:36 +02:00 |
|
Mark Felder
|
0d68804aa7
|
Filter OEmbed HTML tags
|
2023-05-26 19:54:24 +02:00 |
|
tusooa
|
d0c2e0830b
|
Enforce unauth restrictions for public streaming endpoints
|
2023-05-26 19:24:08 +02:00 |
|
Haelwenn
|
b36263e5ff
|
Merge branch 'issue/3126' into 'develop'
MediaProxyController: Apply CSP sandbox
See merge request pleroma/pleroma!3890
|
2023-05-26 19:24:08 +02:00 |
|
Haelwenn
|
4339230f64
|
Merge branch 'tusooa/fix-object-test' into 'develop'
Fix ObjectTest
See merge request pleroma/pleroma!3887
|
2023-05-26 19:24:08 +02:00 |
|
Haelwenn
|
72833c84b5
|
Merge branch 'tusooa/rework-refetch' into 'develop'
Make sure object refetching follows update rules
See merge request pleroma/pleroma!3883
|
2023-05-26 19:24:08 +02:00 |
|
Haelwenn
|
47e66c9500
|
Merge branch 'issue/3126' into 'develop'
MediaProxyController: Apply CSP sandbox
See merge request pleroma/pleroma!3890
|
2023-05-26 17:12:18 +00:00 |
|
Mark Felder
|
38bcf6b19e
|
MediaProxyController: Apply CSP sandbox
|
2023-05-26 12:34:01 -04:00 |
|
Haelwenn
|
5433742faf
|
Merge branch 'tusooa/fix-object-test' into 'develop'
Fix ObjectTest
See merge request pleroma/pleroma!3887
|
2023-05-23 01:57:07 +00:00 |
|
Alex Gleason
|
0b2f8ed96d
|
AntiMentionSpamPolicy: remove followers check
|
2023-05-22 15:50:34 -05:00 |
|
tusooa
|
819a82da99
|
Fix unused variable
|
2023-05-22 08:19:58 -04:00 |
|
tusooa
|
6aafa7fe76
|
Add changelog
|
2023-05-22 08:16:14 -04:00 |
|
tusooa
|
505e58d4eb
|
Fix ObjectTest
|
2023-05-22 08:14:20 -04:00 |
|
Alex Gleason
|
8f6fde01b0
|
Merge branch 'spam-mrf-hotfix-2' into 'develop'
AntiMentionSpamPolicy: fix user age check
See merge request soapbox-pub/rebased!251
|
2023-05-22 00:33:02 +00:00 |
|
Alex Gleason
|
7e375cbdd1
|
AntiMentionSpamPolicy: fix user age check
|
2023-05-21 19:31:56 -05:00 |
|
Alex Gleason
|
8810045840
|
Merge branch 'spam-mrf-hotfix' into 'develop'
Spam MRF hotfix
See merge request soapbox-pub/rebased!250
|
2023-05-21 21:29:26 +00:00 |
|
