hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17,927 commits 2 branches 0 tags 243 MiB
Commit graph

17,927 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henry Jameson
26234c032d Merge branch 'pleroma-mastoapi-account-relationships-3392' into shigusegubu-new 2026-01-26 22:06:34 +02:00
lain
d6bec8b6b7 Merge branch 'delete-outdated-docs' into 'develop' 
Docs: Remove outdated, incorrect, inappropriate or unmaintained install docs

See merge request pleroma/pleroma!4432
 2026-01-25 05:46:31 +00:00
Phantasm
54092d2b7c Docs: Remove outdated, incorrect, inappropriate or unmaintained install docs 2026-01-25 05:46:28 +00:00
Phantasm
9b5afe9cd4
 		MastoAPI AccountView AccountController: Add more block/mute expiry tests 2026-01-24 21:35:27 +01:00
Phantasm
56b3db71ff
 		MastoAPI AccountView: Readd block/mute expiry outside the relationship 2026-01-24 21:33:49 +01:00
Phantasm
ddc1a86f40
 		MastoAPI AccountView: Add mute/block expiry to the relationship key 2026-01-24 21:32:42 +01:00
Haelwenn (lanodan) Monnier
6f86883cca
 		Web: remove legacy :set_put_layout plug 
Phoenix 1.8 requires a View module with put_layout so can't set it that early.

It was introduced in 2019 with
commit 1097ce6d9f
but nothing seems to provide app.html (anymore?) and it would likely
better be set by something like OAuthController / OAuthView.
 2026-01-18 10:40:10 +01:00
Haelwenn (lanodan) Monnier
be327ca982
 		Switch Phoenix back to upstream 
See <https://github.com/phoenixframework/phoenix/pull/6094>
for `:sec_websocket_protocol` -> `:sec_websocket_headers`
 2026-01-18 10:40:10 +01:00
lain
a7a3978a20 Merge branch 'revert-d6888e24' into 'develop' 
Update Hackney, fix redirect issues

See merge request pleroma/pleroma!4412
 2026-01-17 11:09:27 +00:00
Lain Soykaf
a4fb651fac ConfigController: Don't allow whitelist modification. 2026-01-17 13:30:07 +04:00
Lain Soykaf
117b0bd79e Config: Don't crash on falsy whitelist config 2026-01-17 13:03:02 +04:00
Lain Soykaf
49f9ab3034 Cheatsheet: Fix double slash 2026-01-17 13:02:18 +04:00
Lain Soykaf
0b871ff1f2 ConfigController: Don't allow updating the whitelist 2026-01-17 12:32:10 +04:00
Lain Soykaf
77a1d79f92 ConfigTest: Don't crash when whitelist is unset / disabled 2026-01-17 12:31:35 +04:00
Lain Soykaf
e7d2d9bd89 mrf(media_proxy_warming): avoid adapter-level redirects 
Drop follow_redirect/force_redirect from the HTTP options used when warming MediaProxy, relying on Tesla middleware instead (Hackney redirect handling can crash behind CONNECT proxies).

Also add a regression assertion in the policy test and document the upstream Hackney issues in ReverseProxy redirect handling.
 2026-01-17 02:24:07 +04:00
nicole mikołajczyk
49985b1614 Update tests 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:37:02 +01:00
nicole mikołajczyk
92fd157cd8 Update cheatsheet 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:35:53 +01:00
nicole mikołajczyk
b66b93a94a Add task for filtering non-whitelisted configs 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:35:22 +01:00
nicole mikołajczyk
f0669997d3 Add test for default whitelist config 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:34:06 +01:00
nicole mikołajczyk
57a3b1f6d0 Add sane defaults for :database_config_whitelist 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:33:14 +01:00
nicole mikołajczyk
1af8997462 do not ever allow setting database_config_whitelist to database 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-01-16 21:32:35 +01:00
Lain Soykaf
346014b897 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into revert-d6888e24 2026-01-16 22:43:10 +04:00
Lain Soykaf
1a6a8f6fb4 test(http): cover reverse proxy redirects via CONNECT proxy 
Exercises Pleroma.ReverseProxy.Client.Hackney with follow_redirect enabled behind an HTTPS CONNECT proxy, ensuring the client follows a relative redirect and can stream the final body.
 2026-01-16 22:14:27 +04:00
Mark Felder
9b1941366f In-house redirect handler for mediaproxy with Hackney adapter 
Also ensure we always pass an absolute URL to Hackney when parsing a redirect response

(cherry picked from commit 00ac6bce8d244eec7e2460358296619e5cacba6b)
 2026-01-16 22:14:27 +04:00
Lain Soykaf
e67b4cd8b2 test(http): reproduce hackney follow_redirect crash via CONNECT proxy 
Hackney 1.25 crashes when follow_redirect is enabled behind an HTTPS CONNECT proxy and the Location header is relative (hackney_http_connect transport).
This test demonstrates the failure and verifies Tesla-level redirects work when hackney redirects are disabled.
 2026-01-16 21:17:40 +04:00
Lain Soykaf
52fc344b0a test(http): cover pooled redirect with hackney 
Reproduces the Hackney 1.25 pooled redirect cleanup issue which can surface as :req_not_found when the adapter returns a Ref and the body is later fetched.
 2026-01-16 21:17:40 +04:00
Lain Soykaf
ef0f04ca48 http(hackney): disable adapter redirects by default 
Hackney 1.25.x has redirect handling issues behind CONNECT proxies and with pools.
Disable hackney-level redirects and rely on Tesla.Middleware.FollowRedirects instead.
Also default to with_body: true so redirects can be followed reliably.
 2026-01-16 21:17:40 +04:00
lain
c920241c04 Merge branch 'instance-domain-blocks' into 'develop' 
Add v1/instance/domain_blocks endpoint

See merge request pleroma/pleroma!4353
 2026-01-16 13:30:33 +00:00
Lain Soykaf
e91bb2144d InstanceView: Omit comment if it's empty 2026-01-16 16:17:21 +04:00
Lain Soykaf
656c4368d3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-instance-domain-blocks 2026-01-16 14:24:14 +04:00
lain
09aad75b33 Merge branch 'fix-oauth-app-registration' into 'develop' 
Change redirect_uris to accept array of strings

See merge request pleroma/pleroma!4423
 2026-01-16 10:21:41 +00:00
Lain Soykaf
4df7f93a23 Fix OAuth registration redirect_uris array support 2026-01-16 12:10:21 +04:00
lain
6001ed39fa Merge branch 'vix-0.36.0' into 'develop' 
mix: upgrade vix from `~> 0.26.0` to `~> 0.36`

Closes #3393

See merge request pleroma/pleroma!4424
 2026-01-14 06:48:00 +00:00
Haelwenn (lanodan) Monnier
05704ec86e
 		mix: upgrade vix from "~> 0.26.0" to "~> 0.36" 
Dropping the last zero should allow to get 0.x updates rather
than only 0.36.x updates.

Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/3393
 2026-01-14 03:11:37 +01:00
MediaFormat
12002830bc fix tests 2026-01-11 17:47:27 +00:00
lain
9fcf918e1c Merge branch 'phnt/oban-web' into 'develop' 
Add Oban Web and upgrade LiveView, plug

See merge request pleroma/pleroma!4422
 2026-01-11 05:40:47 +00:00
lain
c945a8a467 Merge branch 'less-flaky-tests' into 'develop' 
Less flaky tests

See merge request pleroma/pleroma!4421
 2026-01-11 05:38:17 +00:00
MediaFormat
87f3459f8c fix field type, fix formatting 2026-01-11 05:34:17 +00:00
MediaFormat
7da1d429a2 add changelog.d entry 2026-01-11 01:15:55 +00:00
MediaFormat
aa95855a7f Change redirect_uris to accept array of strings 2026-01-11 01:12:42 +00:00
Phantasm
5e114931f5
 		Move LiveDashboard to /pleroma/live_dashboard 2026-01-09 11:55:16 +01:00
Phantasm
39279292b2
 		Docs: Add admin documentation for LiveDashboard and Oban Web 2026-01-08 22:23:38 +01:00
Haelwenn
792d473778 Merge branch 'paginate-follow-requests' into 'develop' 
Paginate follow requests (adapted from Akkoma)

See merge request pleroma/pleroma!4420
 2026-01-08 10:25:45 +00:00
Lain Soykaf
4984aaa183 Streamer: Fix Marker streaming bug, fix caching in tests. 2026-01-08 14:06:24 +04:00
Lain Soykaf
0b498833cd Add changelog 2026-01-08 13:40:51 +04:00
Lain Soykaf
07b0e6c1dc Mix: Silence migrations 2026-01-08 13:40:43 +04:00
Lain Soykaf
3ecc861fa7 StripLocation, ReadDescription: Silence noisy errors. 2026-01-08 13:40:25 +04:00
Lain Soykaf
100cfe4db8 Config: Make streaming in tests actually synchronous 2026-01-08 13:39:55 +04:00
Phantasm
619ff5b9e3
 		Remove /pleroma/oban and /phoenix/live_dashboard from API routes 
This is needed to prevent admin frontend overrides from misbehaving when
overriding AdminFE located at /pleroma/admin, since API routes are
interpreted as the first portion of their full path, ie:
/api/v1/pleroma/admin -> /api
 2026-01-08 00:33:18 +01:00
Phantasm
30839063ef
 		changelog 2026-01-07 21:12:28 +01:00