hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into audit-mix-audit-report

Browse source
This commit is contained in:
Phantasm 2026-09-08 21:58:23 +02:00
commit 72d45a9f8b
No known key found for this signature in database
GPG key ID: 2669E588BCC634C8
12 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.woodpecker/docker-combine.yaml
View file

@ -18,7 +18,7 @@ labels:
steps:
docker-develop-combine:
image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
image: &docker_image git.pleroma.social/phnt/wpc-docker-tagger:0.9.1
when:
- event: push
branch: ${CI_REPO_DEFAULT_BRANCH}
@ -31,14 +31,14 @@ steps:
tags:
- latest
- develop
- ${CI_COMMIT_SHA:0:8}
- "${CI_COMMIT_SHA:0:8}"
username:
from_secret: pleroma-ci-user
password:
from_secret: pleroma-ci-password
docker-stable-combine:
image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
image: *docker_image
when:
- evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG == ""'
settings:
@ -46,10 +46,10 @@ steps:
tags: &stable_docker_tags
- latest
- stable
- ${CI_COMMIT_SHA:0:8}
- "${CI_COMMIT_SHA:0:8}"
docker-stable-tag-combine:
image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
image: *docker_image
when:
- event: tag
- evaluate: 'CI_PIPELINE_EVENT == "manual" && CI_COMMIT_BRANCH == "stable" && CI_COMMIT_TAG != ""'
@ -57,4 +57,4 @@ steps:
<<: *docker_settings
tags:
- <<: *stable_docker_tags
- ${CI_COMMIT_TAG}
- "${CI_COMMIT_TAG}"

6
.woodpecker/otp-musl.yaml
View file

@ -33,10 +33,10 @@ variables:
- mkdir release
- export PLEROMA_BUILD_BRANCH=${CI_COMMIT_BRANCH}
- mix release --path release
build_image_amd64: &build_image_amd64 docker.io/hexpm/elixir-amd64:1.17.3-erlang-27.3.4.2-alpine-3.22.1
build_image_amd64: &build_image_amd64 docker.io/hexpm/elixir:1.17.3-erlang-27.3.4.17-alpine-3.22.5
build_image_arm: &build_image_arm docker.io/arm32v7/elixir:1.17.3-alpine
build_image_arm64: &build_image_arm64 docker.io/hexpm/elixir-arm64:1.17.3-erlang-27.3.4.2-alpine-3.22.1
artifacts_uploader_image: &artifacts_uploader_image docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0
build_image_arm64: &build_image_arm64 docker.io/hexpm/elixir:1.17.3-erlang-27.3.4.17-alpine-3.22.5
artifacts_uploader_image: &artifacts_uploader_image docker.io/woodpeckercommunity/plugin-gitea-package:0.5.1
artifacts_uploader_settings: &artifacts_uploader_settings
user:
from_secret: pleroma-ci-user

6
.woodpecker/otp.yaml
View file

@ -33,10 +33,10 @@ variables:
- mkdir release
- export PLEROMA_BUILD_BRANCH=${CI_COMMIT_BRANCH}
- mix release --path release
build_image_amd64: &build_image_amd64 docker.io/hexpm/elixir-amd64:1.17.3-erlang-27.3.4.2-ubuntu-noble-20250716
build_image_amd64: &build_image_amd64 docker.io/hexpm/elixir:1.17.3-erlang-27.3.4.17-ubuntu-noble-20260810
build_image_arm: &build_image_arm docker.io/arm32v7/elixir:1.17.3
build_image_arm64: &build_image_arm64 docker.io/hexpm/elixir-arm64:1.17.3-erlang-27.3.4.2-ubuntu-noble-20250716
artifacts_uploader_image: &artifacts_uploader_image docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0
build_image_arm64: &build_image_arm64 docker.io/hexpm/elixir:1.17.3-erlang-27.3.4.17-ubuntu-noble-20260810
artifacts_uploader_image: &artifacts_uploader_image docker.io/woodpeckercommunity/plugin-gitea-package:0.5.1
artifacts_uploader_settings: &artifacts_uploader_settings
user:
from_secret: pleroma-ci-user

2
.woodpecker/paradedb-integration.yaml
View file

@ -52,12 +52,14 @@ steps:
services:
postgres:
image: docker.io/postgres:13-alpine
failure: ignore
environment:
POSTGRES_DB: pleroma_test
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
paradedb:
image: docker.io/paradedb/paradedb:0.24.3-pg15@sha256:997d62f6c2605becb7c45878af3f8c8c698f355006b675b3ce212d4eb2d14f2e
failure: ignore
environment:
POSTGRES_DB: paradedb
POSTGRES_USER: postgres

1
.woodpecker/unit-testing-elixir-1.15.yaml
View file

@ -40,6 +40,7 @@ steps:
services:
postgres:
image: postgres:13-alpine
failure: ignore
environment:
POSTGRES_DB: pleroma_test
POSTGRES_USER: postgres

1
.woodpecker/unit-testing-elixir-1.19.yaml
View file

@ -40,6 +40,7 @@ steps:
services:
postgres:
image: postgres:13-alpine
failure: ignore
environment:
POSTGRES_DB: pleroma_test
POSTGRES_USER: postgres

1
changelog.d/domain-block-subplan-cost.fix Normal file
View file

@ -0,0 +1 @@
Fix notification and timeline queries for users with domain blocks choosing a plan that scans every active user per row; the followed-accounts exception is now an `ARRAY(SELECT ...)` InitPlan that the planner costs once.

0
changelog.d/idempotency-plug-func-typo.skip Normal file
View file

0
changelog.d/wpc-tagger-mirror.skip Normal file
View file

10
lib/pleroma/following_relationship.ex
View file

@ -258,10 +258,16 @@ defmodule Pleroma.FollowingRelationship do
[_, user_actor: user_actor],
fragment(
# "(actor's domain NOT in domain_blocks) OR (actor IS in followed AP IDs)"
#
# ARRAY(SELECT ...) makes the followed-ids lookup an InitPlan that is
# evaluated and costed once. As a plain subselect, the planner charges
# its startup cost on every rescan of the actor lookup, which inflates
# the cost of the index plan enough for it to lose to a plan that
# materialises every active user for every candidate row.
"""
NOT (substring(? from '.*://([^/]*)') = ANY(?)) OR
? = ANY(SELECT ap_id FROM users AS u INNER JOIN following_relationships AS fr
ON u.id = fr.following_id WHERE fr.follower_id = ? AND fr.state = ?)
? = ANY(ARRAY(SELECT ap_id FROM users AS u INNER JOIN following_relationships AS fr
ON u.id = fr.following_id WHERE fr.follower_id = ? AND fr.state = ?))
""",
user_actor.ap_id,
^user.domain_blocks,

4
lib/pleroma/web/plugs/idempotency_plug.ex
View file

@ -33,7 +33,7 @@ defmodule Pleroma.Web.Plugs.IdempotencyPlug do
case @cachex.get(:idempotency_cache, cache_key) do
{:ok, nil} ->
cache_resposnse(conn, key, cache_key)
cache_response(conn, key, cache_key)
{:ok, record} ->
send_cached(conn, key, record)
@ -43,7 +43,7 @@ defmodule Pleroma.Web.Plugs.IdempotencyPlug do
end
end
defp cache_resposnse(conn, key, cache_key) do
defp cache_response(conn, key, cache_key) do
register_before_send(conn, &maybe_cache_response(&1, key, cache_key))
end

15
test/pleroma/notification_test.exs
View file

@ -1028,6 +1028,21 @@ defmodule Pleroma.NotificationTest do
assert Notification.for_user(user) == []
end
test "it doesn't return notifications from a blocked domain unless the actor is followed",
%{user: user} do
blocked_domain = "blocked.example"
stranger = insert(:user, local: false, domain: blocked_domain)
followed = insert(:user, local: false, domain: blocked_domain)
{:ok, user, followed} = User.follow(user, followed)
{:ok, user} = User.block_domain(user, blocked_domain)
{:ok, _} = CommonAPI.post(stranger, %{status: "hey @#{user.nickname}"})
{:ok, followed_activity} = CommonAPI.post(followed, %{status: "hey @#{user.nickname}"})
assert [%{activity: %{id: followed_id}}] = Notification.for_user(user)
assert followed_id == followed_activity.id
end
test "it doesn't return notifications for domain-blocked non-followed user", %{user: user} do
blocked = insert(:user, ap_id: "http://some-domain.com")
{:ok, user} = User.block_domain(user, "some-domain.com")