Add Micropub q=source and reject malformed requests

Servers supporting updates must support the source content query. It
was falling through to the token response, so clients got a 200 with no
post in it. Return the raw note as microformats2 JSON, honouring
properties[].

Malformed requests could cause a 500 or worse. A replace value sent as a
string overwrote the note with its first character, because $value[0]
indexes the string. Validate update operations before applying any of
them, and return invalid_request for wrongly shaped properties, unknown
or malformed q values, and missing update URLs.

Share URL resolution between updates and q=source in NoteResolver, which
also rejects URLs on other hosts and invalid note IDs. Those IDs used to
decode to a real note because invalid characters were skipped.

Allow photo objects without alt text, and parse the published date
before saving so that an invalid date doesn't leave a stray note behind.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jonny Barnes 2026-11-02 18:59:23 +00:00
commit 3dce7d3a60
Signed by: jonny
SSH key fingerprint: SHA256:CTuSlns5U7qlD9jqHvtnVmfYV3Zwl2Z7WnJ4/dqOaL8

View file

@ -0,0 +1,69 @@
<?php
declare(strict_types=1);
namespace App\Services\Micropub;
use App\Models\Note;
/**
* Builds the microformats2 JSON for a q=source query.
*/
class NoteSource
{
/**
* Per the spec, the type is only included when all properties are returned.
*
* @param string[] $requested The properties to return, or empty for all of them
*/
public function toArray(Note $note, array $requested = []): array
{
$properties = $this->properties($note);
if ($requested !== []) {
return ['properties' => (object) array_intersect_key($properties, array_flip($requested))];
}
return ['type' => ['h-entry'], 'properties' => (object) $properties];
}
private function properties(Note $note): array
{
$media = $note->media;
return array_filter([
// the raw source, as the note accessor returns the rendered HTML
'content' => array_filter([$note->getRawOriginal('note')], fn ($value) => $value !== null),
'published' => [$note->created_at->toIso8601String()],
'in-reply-to' => array_filter([$note->in_reply_to]),
'category' => $note->tags->pluck('tag')->all(),
'photo' => $media->where('type', 'image')->map(fn ($item) => $item->pivot->alt_text
? ['value' => $item->url, 'alt' => $item->pivot->alt_text]
: $item->url)->values()->all(),
'video' => $media->where('type', 'video')->pluck('url')->all(),
'audio' => $media->where('type', 'audio')->pluck('url')->all(),
'syndication' => array_values(array_filter([
$note->tweet_id ? 'https://twitter.com/i/web/status/'.$note->tweet_id : null,
$note->facebook_url,
$note->swarm_url,
$note->instagram_url,
$note->mastodon_url,
$note->bluesky_url,
])),
'location' => $this->location($note),
], fn (array $values) => $values !== []);
}
private function location(Note $note): array
{
if ($note->place !== null) {
return [$note->place->uri];
}
if ($note->getRawOriginal('location') !== null) {
return ['geo:'.$note->latitude.','.$note->longitude];
}
return [];
}
}