Merge remote-tracking branch 'upstream/stable' into mergeback/2.6.1

2023-12-15 19:43:07 -05:00 · 2023-12-15 19:43:07 -05:00 · 453cb6a388
commit 453cb6a388
parent 7622a83973 6722b7f395
28 changed files with 32 additions and 25 deletions
--- a/changelog.d/akkoma-xml-remote-entities.security
+++ b/changelog.d/akkoma-xml-remote-entities.security
@ -1 +0,0 @@
-Fix XML External Entity (XXE) loading vulnerability allowing to fetch arbitary files from the server's filesystem
--- a/changelog.d/check-attachment-attribution.security
+++ b/changelog.d/check-attachment-attribution.security
@ -1 +0,0 @@
-CommonAPI: Prevent users from accessing media of other users by creating a status with reused attachment ID
--- a/changelog.d/emoji-pack-sanitization.security
+++ b/changelog.d/emoji-pack-sanitization.security
@ -1 +0,0 @@
-Emoji pack loader sanitizes pack names
--- a/changelog.d/otp_perms.security
+++ b/changelog.d/otp_perms.security
@ -1 +0,0 @@
- Reduced permissions of config files and directories, distros requiring greater permissions like group-read need to pre-create the directories
				`@ -1 +0,0 @@`
				`Fix XML External Entity (XXE) loading vulnerability allowing to fetch arbitary files from the server's filesystem`
				`@ -1 +0,0 @@`
				`CommonAPI: Prevent users from accessing media of other users by creating a status with reused attachment ID`
				`@ -1 +0,0 @@`
				`- Reduced permissions of config files and directories, distros requiring greater permissions like group-read need to pre-create the directories`