bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16010 commits 1 branch 0 tags 292 MiB
Commit graph

16010 commits

This branch
This branch
All branches
Author SHA1 Message Date
niggy
0eeb8ea74e
Update pack.ex 2023-09-04 08:47:01 +00:00
Alex Gleason
9db714fe01
Merge branch 'pleroma-security-fix' into 'develop' 
Pleroma security fix

See merge request soapbox-pub/rebased!272
 2023-09-03 16:22:56 +00:00
Alex Gleason
82d99b835e
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2023-09-03 10:09:05 -05:00
Haelwenn
a94cf2ad4f Merge branch 'check-attachment-attribution' into 'develop' 
Prevent users from attaching other users' attachments

See merge request pleroma/pleroma!3947
 2023-09-03 09:09:27 +00:00
Mint
1afde067b1 CommonAPI: Prevent users from accessing media of other users 2023-09-03 10:41:37 +02:00
Haelwenn
9da4f89b7b Merge branch 'tusooa/lint' into 'develop' 
Make lint happy

See merge request pleroma/pleroma!3944
 2023-08-31 22:24:30 +00:00
tusooa
3c5ecca377
Skip changelog 2023-08-30 20:37:45 -04:00
tusooa
3d09bc320e
Make lint happy 2023-08-30 20:36:52 -04:00
marcin mikołajczak
9526197925 Merge branch 'webfinger-validation' into 'develop' 
Fix validate_webfinger when running a different domain for Webfinger

See merge request soapbox-pub/rebased!271
 2023-08-24 06:10:16 +00:00
marcin mikołajczak
acaae4c992 Fix tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-08-24 01:22:20 +02:00
marcin mikołajczak
f08184b0fa Fix validate_webfinger when running a different domain for Webfinger 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-08-24 00:37:39 +02:00
Alex Gleason
38b1697b01 Merge branch 'webfinger-spoofing' into 'develop' 
Prevent webfinger spoofing

See merge request soapbox-pub/rebased!270
 2023-08-23 18:23:04 +00:00
Alex Gleason
2f52806410
Prevent webfinger spoofing 2023-08-23 13:10:19 -05:00
marcin mikołajczak
a9575da9de Merge branch 'rebased-scope' into 'develop' 
Add /api/1/rebased scope for Rebased-specific routes

See merge request soapbox-pub/rebased!269
 2023-08-20 20:36:54 +00:00
marcin mikołajczak
f6de23a1cf Add /api/1/soapbox scope for Rebased-specific routes 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-08-20 22:22:53 +02:00
Haelwenn
1e685c8302 Merge branch 'csp-flash' into 'develop' 
allow https: so that flash works across instances without need for media proxy

See merge request pleroma/pleroma!3879
 2023-08-16 13:37:49 +00:00
Haelwenn
d838d1990b Apply lanodan's suggestion(s) to 1 file(s) 2023-08-16 13:34:32 +00:00
marcin mikołajczak
bf50f18eeb Merge branch 'logger_deprecated_warn' into 'develop' 
Replace deprecated Logger.warn/1 with Logger.warning

See merge request soapbox-pub/rebased!267
 2023-08-10 21:53:27 +00:00
marcin mikołajczak
83054ebd5e Replace deprecated Logger.warn/1 with Logger.warning 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-08-10 23:29:35 +02:00
tusooa
b729a8b140 Merge branch 'fix-dockerfile-perms' into 'develop' 
Fix config ownership in dockerfile to pass restriction test

See merge request pleroma/pleroma!3931
 2023-08-10 00:42:29 +00:00
Cat pony Black
c298e0165c Fix config ownership in dockerfile to pass restriction test 2023-08-08 19:07:48 +02:00
Haelwenn
4e355b8595 Merge branch 'disable-xml-entities-completely' into 'develop' 
Completely disable xml entity resolution

See merge request pleroma/pleroma!3932
 2023-08-06 08:27:27 +00:00
marcin mikołajczak
b094e92c50 Merge branch 'merge-pleroma' into 'develop' 
Merge Pleroma (security fix)

See merge request soapbox-pub/rebased!264
 2023-08-05 13:27:42 +00:00
marcin mikołajczak
cc5053fb92 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2023-08-05 15:26:32 +02:00
marcin mikołajczak
96a6b4dbc8 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-08-05 15:22:01 +02:00
mae
48b1e9bdc7 Completely disable xml entity resolution 2023-08-05 14:17:04 +02:00
Haelwenn
17c336de66 Merge branch 'docs/gentoo-otp-intro' into 'develop' 
gentoo_otp_en.md: Indicate which install method it covers

See merge request pleroma/pleroma!3928
 2023-08-05 11:04:32 +00:00
Haelwenn
d0f7a5c4f5 Merge branch 'mergeback/2.5.4' into 'develop' 
Mergeback: 2.5.4

See merge request pleroma/pleroma!3930
 2023-08-05 08:13:03 +00:00
Haelwenn (lanodan) Monnier
4099ddb3dc Mergeback release 2.5.4 2023-08-05 08:58:05 +02:00
Mark Felder
6d48b0f1a9 Document and test that XXE processing is disabled 
https://vuln.be/post/xxe-in-erlang-and-elixir/
 2023-08-05 08:14:27 +02:00
FloatingGhost
307692cee8 Add unit test for external entity loading 2023-08-05 08:14:27 +02:00
Mae
ca0859b90f Prevent XML parser from loading external entities 2023-08-04 22:35:13 -04:00
Haelwenn (lanodan) Monnier
0e321698d2 gentoo_otp_en.md: Indicate which install method it covers 2023-08-04 17:11:20 +02:00
Alex Gleason
a2a85bc88e Merge branch 'merge-pleroma' into 'develop' 
Merge Pleroma (security fix)

See merge request soapbox-pub/rebased!263
 2023-08-04 14:52:20 +00:00
Alex Gleason
fa4f0ae328
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2023-08-04 09:32:59 -05:00
Haelwenn
1062185ba0 Merge branch 'mergeback/2.5.3' into 'develop' 
Mergeback: 2.5.3

Closes #3135

See merge request pleroma/pleroma!3927
 2023-08-04 09:38:01 +00:00
Haelwenn (lanodan) Monnier
6a0fd77c48 Release 2.5.53 2023-08-04 09:50:28 +02:00
Haelwenn (lanodan) Monnier
65ef8f19c5 release_runtime_provider_test: chmod config for hardened permissions 
Git doesn't manages file permissions precisely enough for us.
 2023-08-04 09:50:28 +02:00
Haelwenn (lanodan) Monnier
9f0ad901ed changelog: Entry for config permissions restrictions 
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3135
 2023-08-04 09:50:28 +02:00
Haelwenn (lanodan) Monnier
69caedc591 instance gen: Reduce permissions of pleroma directories and config files 2023-08-04 09:50:28 +02:00
Haelwenn (lanodan) Monnier
8cc8100120 Config: Restrict permissions of OTP config file 2023-08-04 09:50:28 +02:00
Mark Felder
2c79509453 Resolve information disclosure vulnerability through emoji pack archive download endpoint 
The pack name has been sanitized so an attacker cannot upload a media
file called pack.json with their own handcrafted list of emoji files as
arbitrary files on the filesystem and then call the emoji pack archive
download endpoint with a pack name crafted to the location of the media
file they uploaded which tricks Pleroma into generating a zip file of
the target files the attacker wants to download.

The attack only works if the Pleroma instance does not have the
AnonymizeFilename upload filter enabled, which is currently the default.

Reported by: graf@poast.org
 2023-08-04 08:40:27 +02:00
Haelwenn
819fccb7d1 Merge branch 'tusooa/3154-attachment-type-check' into 'develop' 
Restrict attachments to only uploaded files only

Closes #3154

See merge request pleroma/pleroma!3923
 2023-08-03 10:01:32 +00:00
marcin mikołajczak
12bba8717d Merge branch 'merge-pleroma' into 'develop' 
merge Pleroma

See merge request soapbox-pub/rebased!261
 2023-07-28 22:31:17 +00:00
tusooa
b08cbe76f1 Merge branch 'fix/2927-disallow-unauthenticated-access' into 'develop' 
/api/v1/statuses/:id/context: filter context activities using Visibility.visible_for_user?/2

See merge request pleroma/pleroma!3801
 2023-07-28 15:05:46 +00:00
faried nawaz
11ce81d4af add changelog entry 2023-07-28 18:49:05 +05:00
Faried Nawaz
e5e76ec445 cleaner ecto query to handle restrict_unauthenticated for activities 
This fix is for this case:

  config :pleroma, :restrict_unauthenticated,
    activities: %{local: true, remote: true}
 2023-07-28 18:45:59 +05:00
faried nawaz
dc4de79d43 status context: perform visibility check on activities around a status 
issue #2927
 2023-07-28 18:45:59 +05:00
marcin mikołajczak
eb05a5524c Remove test? 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-07-28 00:49:46 +02:00
marcin mikołajczak
f1592b2947 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-07-26 22:32:27 +02:00