Merge remote-tracking branch 'origin/stable' into suyaplace

This reverts commit 1b560d547a.

.woodpecker/build-amd64.yml

@@ -65,6 +65,33 @@ pipeline:
       - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-ubuntu-jammy.zip
       - /bin/sh /entrypoint.sh
 
+  debian-bullseye:
+    image: hexpm/elixir:1.15.4-erlang-25.3.2.5-debian-bullseye-20230612
+    <<: *on-release
+    environment:
+      MIX_ENV: prod
+      DEBIAN_FRONTEND: noninteractive
+    commands:
+      - apt-get update && apt-get install -y cmake libmagic-dev rclone zip imagemagick libmagic-dev git build-essential g++ wget
+      - *clean
+      - echo "import Config" > config/prod.secret.exs
+      - *setup-hex
+      - *mix-clean
+      - *tag-build
+      - mix deps.get --only prod
+      - mix release --path release
+      - zip akkoma-amd64-debian-bullseye.zip -r release
+
+  release-debian-bullseye:
+    image: akkoma/releaser
+    <<: *on-release
+    secrets: *scw-secrets
+    commands:
+      - export SOURCE=akkoma-amd64-debian-bullseye.zip
+      # AMD64
+      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-debian-bullseye.zip
+      - /bin/sh /entrypoint.sh
+
   # Canonical amd64-musl
   musl:
     image: hexpm/elixir:1.14.3-erlang-25.2.2-alpine-3.18.0

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## Unreleased
+
+## Fixed
+- Issue where a bad inbox URL could break federation
+
 ## 2023.08
 
 ## Added
@@ -233,6 +238,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## 2022.08
 
+### Removed
+- Non-finch HTTP adapters. `:tesla, :adapter` is now highly recommended to be set to the default.
+
+## 2022.08
+
 ### Added
 - extended runtime module support, see config cheatsheet
 - quote posting; quotes are limited to public posts

lib/pleroma/web/activity_pub/publisher.ex

@@ -115,13 +115,18 @@ defp allowed_instances do
   def should_federate?(url) do
     %{host: host} = URI.parse(url)
 
-    with allowed <- allowed_instances(),
+    with {nil, false} <- {nil, is_nil(host)},
+         allowed <- allowed_instances(),
          false <- Enum.empty?(allowed) do
       allowed
       |> Pleroma.Web.ActivityPub.MRF.instance_list_from_tuples()
       |> Pleroma.Web.ActivityPub.MRF.subdomains_regex()
       |> Pleroma.Web.ActivityPub.MRF.subdomain_match?(host)
     else
+      # oi!
+      {nil, true} ->
+        false
+
       _ ->
         quarantined_instances =
           blocked_instances()

lib/pleroma/web/api_spec/operations/account_operation.ex

@@ -767,7 +767,7 @@ defp array_of_relationships do
           "showing_reblogs" => true,
           "followed_by" => true,
           "blocking" => false,
-          "blocked_by" => false,
+          "blocked_by" => true,
           "muting" => false,
           "muting_notifications" => false,
           "note" => "",
@@ -783,7 +783,7 @@ defp array_of_relationships do
           "showing_reblogs" => true,
           "followed_by" => true,
           "blocking" => false,
-          "blocked_by" => false,
+          "blocked_by" => true,
           "muting" => true,
           "muting_notifications" => false,
           "note" => "",

lib/pleroma/web/api_spec/schemas/account_relationship.ex

@@ -13,10 +13,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.AccountRelationship do
     description: "Relationship between current account and requested account",
     type: :object,
     properties: %{
-      blocked_by: %Schema{
-        type: :boolean,
-        description: "Represents being blocked by this user. Always false."
-      },
+      blocked_by: %Schema{type: :boolean},
       blocking: %Schema{type: :boolean},
       domain_blocking: %Schema{type: :boolean},
       endorsed: %Schema{type: :boolean},

lib/pleroma/web/mastodon_api/views/account_view.ex

@@ -124,7 +124,14 @@ def render(
           target,
           &User.blocks_user?(&1, &2)
         ),
-      blocked_by: false,
+      blocked_by:
+        UserRelationship.exists?(
+          user_relationships,
+          :block,
+          target,
+          reading_user,
+          &User.blocks_user?(&1, &2)
+        ),
       muting:
         UserRelationship.exists?(
           user_relationships,

lib/pleroma/web/plugs/o_auth_scopes_plug.ex

@@ -34,7 +34,9 @@ def perform(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do
         permissions = Enum.join(missing_scopes, " #{op} ")
 
         error_message =
-          dgettext("errors", "Insufficient permissions: %{permissions}.", permissions: permissions)
+          dgettext("errors", "Insufficient permissions: %{permissions}.",
+            permissions: permissions
+          )
 
         conn
         |> put_resp_content_type("application/json")

mix.exs

@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("3.10.3"),
+      version: version("3.10.4"),
       elixir: "~> 1.14",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix] ++ Mix.compilers(),

test/pleroma/web/activity_pub/publisher_test.exs

@@ -487,4 +487,11 @@ test "publish to url with with different ports" do
              )
     end
   end
+
+  describe "should_federate/1" do
+    test "should not obliterate itself if the inbox URL is bad" do
+      url = "/inbox"
+      refute Pleroma.Web.ActivityPub.Publisher.should_federate?(url)
+    end
+  end
 end

test/pleroma/web/mastodon_api/views/account_view_test.exs

@@ -399,22 +399,7 @@ test "represent a relationship for the blocking and blocked user" do
       expected =
         Map.merge(
           @blank_response,
-          %{following: false, blocking: true, blocked_by: false, id: to_string(other_user.id)}
-        )
-
-      test_relationship_rendering(user, other_user, expected)
-    end
-
-    test "blocks are not visible to the blocked user" do
-      user = insert(:user)
-      other_user = insert(:user)
-
-      {:ok, _user_relationship} = User.block(other_user, user)
-
-      expected =
-        Map.merge(
-          @blank_response,
-          %{following: false, blocking: false, blocked_by: false, id: to_string(other_user.id)}
+          %{following: false, blocking: true, blocked_by: true, id: to_string(other_user.id)}
         )
 
       test_relationship_rendering(user, other_user, expected)