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:
parent
6e96ca8304
commit
3dce7d3a60
1 changed files with 450 additions and 29 deletions
|
|
@ -11,6 +11,7 @@ use App\Models\Media;
|
|||
use App\Models\Note;
|
||||
use App\Services\Micropub\Data\MicropubData;
|
||||
use App\Services\Micropub\Data\UpdateData;
|
||||
use App\Services\Micropub\NoteResolver;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class UpdateHandler implements MicropubHandlerInterface
|
||||
|
|
@ -36,18 +37,18 @@ class UpdateHandler implements MicropubHandlerInterface
|
|||
throw new InvalidTokenScopeException;
|
||||
}
|
||||
|
||||
$urlPath = parse_url($data->updateUrl, PHP_URL_PATH);
|
||||
|
||||
if (mb_substr($urlPath, 1, 5) !== 'notes') {
|
||||
throw new MicropubUnsupportedModelException('This implementation currently only supports the updating of notes');
|
||||
if ($data->updateUrl === null) {
|
||||
throw new MicropubHandlerException('The url parameter is required');
|
||||
}
|
||||
|
||||
$note = Note::nb60(basename($urlPath))->firstOrFail();
|
||||
$note = resolve(NoteResolver::class)->fromUrl($data->updateUrl);
|
||||
|
||||
if ($data->updateReplace === null && $data->updateAdd === null && $data->updateDelete === null) {
|
||||
throw new MicropubHandlerException('Unsupported update operation');
|
||||
}
|
||||
|
||||
$this->validateOperations($data);
|
||||
|
||||
if ($data->updateReplace !== null) {
|
||||
foreach ($data->updateReplace as $property => $value) {
|
||||
match ($property) {
|
||||
|
|
@ -89,6 +90,66 @@ class UpdateHandler implements MicropubHandlerInterface
|
|||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Check the whole request before applying any of it, so that a malformed
|
||||
* value can't leave a note partially updated. The spec requires the values
|
||||
* of each property to be arrays.
|
||||
*
|
||||
* @throws MicropubHandlerException
|
||||
*/
|
||||
private function validateOperations(UpdateData $data): void
|
||||
{
|
||||
foreach ([$data->updateReplace ?? [], $data->updateAdd ?? []] as $operation) {
|
||||
foreach ($operation as $property => $values) {
|
||||
if (! is_string($property) || ! is_array($values) || $values === [] || ! array_is_list($values)) {
|
||||
throw new MicropubHandlerException('The values of each property must be a non-empty array');
|
||||
}
|
||||
|
||||
$this->validateValues($property, $values);
|
||||
}
|
||||
}
|
||||
|
||||
$delete = $data->updateDelete ?? [];
|
||||
|
||||
if (array_is_list($delete)) {
|
||||
foreach ($delete as $property) {
|
||||
if (! is_string($property)) {
|
||||
throw new MicropubHandlerException('The properties to delete must be strings');
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
foreach ($delete as $property => $values) {
|
||||
if (! is_array($values) || ! array_is_list($values)) {
|
||||
throw new MicropubHandlerException('The values of each property must be an array');
|
||||
}
|
||||
|
||||
$this->validateValues($property, $values);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws MicropubHandlerException
|
||||
*/
|
||||
private function validateValues(string $property, array $values): void
|
||||
{
|
||||
if (! in_array($property, ['content', 'syndication', 'photo'], true)) {
|
||||
return;
|
||||
}
|
||||
|
||||
foreach ($values as $value) {
|
||||
if ($property === 'content' && is_array($value)) {
|
||||
$value = $value['html'] ?? $value['value'] ?? null;
|
||||
}
|
||||
|
||||
if (! is_string($value)) {
|
||||
throw new MicropubHandlerException("The {$property} property has an invalid value");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function applyDelete(Note $note, array $delete): void
|
||||
{
|
||||
if (array_is_list($delete)) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue