UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-17 20:11:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5344 from pixelfed/staging

Browse source 
Update AP helpers, reject statuses with invalid dates
This commit is contained in:
daniel 2024-11-11 21:49:54 -07:00 committed by GitHub
commit 41d1e8cb99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
# Release Notes
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.12.3...dev)
- Update AP helpers, reject statuses with invalid dates ([960f3849](https://github.com/pixelfed/pixelfed/commit/960f3849))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.12.4 (2024-11-08)](https://github.com/pixelfed/pixelfed/compare/v0.12.4...dev)

20
app/Util/ActivityPub/Helpers.php
View file

@ -298,6 +298,22 @@ class Helpers
return null;
}
public static function validateTimestamp($timestamp)
{
try {
$date = Carbon::parse($timestamp);
$now = Carbon::now();
$tenYearsAgo = $now->copy()->subYears(10);
$isMoreThanTenYearsOld = $date->lt($tenYearsAgo);
$tomorrow = $now->copy()->addDay();
$isMoreThanOneDayFuture = $date->gt($tomorrow);
return ! ($isMoreThanTenYearsOld || $isMoreThanOneDayFuture);
} catch (\Exception $e) {
return false;
}
}
public static function statusFirstOrFetch($url, $replyTo = false)
{
$url = self::validateUrl($url);
@ -329,6 +345,10 @@ class Helpers
return;
}
if (! self::validateTimestamp($res['published'])) {
return;
}
if (config('autospam.live_filters.enabled')) {
$filters = config('autospam.live_filters.filters');
if (! empty($filters) && isset($res['content']) && ! empty($res['content']) && strlen($filters) > 3) {