Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop 2023-08-08 #197

Merged
merged 22 commits into from
Aug 8, 2023
Merged

Merge develop 2023-08-08 #197

merged 22 commits into from
Aug 8, 2023

Conversation

kphrx
Copy link
Owner

@kphrx kphrx commented Aug 8, 2023

No description provided.

tusooa and others added 22 commits July 18, 2023 18:39
This fix is for this case:

  config :pleroma, :restrict_unauthenticated,
    activities: %{local: true, remote: true}
/api/v1/statuses/:id/context: filter context activities using Visibility.visible_for_user?/2

See merge request pleroma/pleroma!3801
Restrict attachments to only uploaded files only

Closes #3154

See merge request pleroma/pleroma!3923
…ve 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
Git doesn't manages file permissions precisely enough for us.
Mergeback: 2.5.3

Closes #3135

See merge request pleroma/pleroma!3927
Mergeback: 2.5.4

See merge request pleroma/pleroma!3930
gentoo_otp_en.md: Indicate which install method it covers

See merge request pleroma/pleroma!3928
Completely disable xml entity resolution

See merge request pleroma/pleroma!3932
@kphrx kphrx merged commit 6c57967 into pl.kpherox.dev Aug 8, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants