We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit b7e3b06b authored by Brion Vibber's avatar Brion Vibber

AtomPub tetss: confirming edit URL linked properly in individual entry return

parent 247a4940
......@@ -188,6 +188,25 @@ class AtomPubClient
$activity = new Activity($dom->documentRoot);
return true;
static function entryEditURL($str) {
$dom = new DOMDocument;
$path = new DOMXPath($dom);
$path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
$links = $path->query('/atom:entry/atom:link[@rel="edit"]', $dom->documentRoot);
if ($links && $links->length) {
if ($links->length > 1) {
throw new Exception('Bad Atom entry; has multiple rel=edit links.');
$link = $links->item(0);
$url = $link->getAttribute('href');
return $url;
} else {
throw new Exception('Atom entry lists no rel=edit link.');
......@@ -254,10 +273,12 @@ $body = $notice->get();
echo "ok\n";
echo "Confirming new entry looks right... ";
// confirm that it actually is what we expected
// confirm it has an edit URL that matches $target
echo "NYI\n";
echo "Confirming new entry points to itself right... ";
$editUrl = AtomPubClient::entryEditURL($body);
if ($editUrl != $noticeUrl) {
die("Entry lists edit URL as $editUrl, no match!\n");
echo "OK\n";
echo "Refetching the collection... ";
$feed = $collection->get();
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment