diff options
| author | Mark Felder <feld@feld.me> | 2024-05-25 16:27:59 -0400 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-05-26 14:02:20 -0400 |
| commit | 807782b7f96ee0e053ad59b464766d750f8a8800 (patch) | |
| tree | 4ddb69e73e4b58cb6bc860cbd3c023eb752d5f92 | |
| parent | 354b700bedf8ad6e9187245977165ebd7bc2fa1c (diff) | |
| download | pleroma-807782b7f96ee0e053ad59b464766d750f8a8800.tar.gz pleroma-807782b7f96ee0e053ad59b464766d750f8a8800.zip | |
Fix rich media parsing some Amazon URLs
| -rw-r--r-- | changelog.d/richmediattl.fix | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/richmediattl.fix b/changelog.d/richmediattl.fix new file mode 100644 index 000000000..98de63015 --- /dev/null +++ b/changelog.d/richmediattl.fix @@ -0,0 +1 @@ +Parsing of RichMedia TTLs for Amazon URLs when query parameters are nil diff --git a/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex b/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex index 948c727e1..1172a120a 100644 --- a/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex +++ b/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex @@ -23,7 +23,7 @@ defmodule Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl do %URI{host: host, query: query} = URI.parse(image) is_binary(host) and String.contains?(host, "amazonaws.com") and - String.contains?(query, "X-Amz-Expires") + is_binary(query) and String.contains?(query, "X-Amz-Expires") end defp aws_signed_url?(_), do: nil |