Compare commits

..

No commits in common. "7ce0445eea3ebe6c7a87ab13e97ee5c978730898" and "c3418694b9d29753c7b3ece5fcac7849621cb2ec" have entirely different histories.

5 changed files with 3 additions and 14 deletions

View file

@ -1,5 +1,5 @@
labels:
platform: linux/arm64
platform: linux/aarch64
depends_on:
- test

View file

@ -4,12 +4,6 @@ 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
## 2025.01.01
Hotfix: Federation could break if a null value found its way into `should_federate?\1`
## 2025.01
## Added

View file

@ -112,7 +112,7 @@ defp allowed_instances do
Config.get([:mrf_simple, :accept])
end
def should_federate?(url) when is_binary(url) do
def should_federate?(url) do
%{host: host} = URI.parse(url)
with {nil, false} <- {nil, is_nil(host)},
@ -137,8 +137,6 @@ def should_federate?(url) when is_binary(url) do
end
end
def should_federate?(_), do: false
@spec recipients(User.t(), Activity.t()) :: list(User.t()) | []
defp recipients(actor, activity) do
followers =

View file

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

View file

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