AtomPub fixes: return '201 Created' on POST of new message; better error checking on Atom input

This commit is contained in:
Brion Vibber 2010-12-14 13:12:24 -08:00
parent 0f26d6eb70
commit 54a0e801f3

View File

@ -309,9 +309,15 @@ class ApiTimelineUserAction extends ApiBareAuthAction
return; return;
} }
$xml = file_get_contents('php://input'); $xml = trim(file_get_contents('php://input'));
if (empty($xml)) {
$this->clientError(_('Atom post must not be empty.'));
}
$dom = DOMDocument::loadXML($xml); $dom = DOMDocument::loadXML($xml);
if (!$dom) {
$this->clientError(_('Atom post must be well-formed XML.'));
}
if ($dom->documentElement->namespaceURI != Activity::ATOM || if ($dom->documentElement->namespaceURI != Activity::ATOM ||
$dom->documentElement->localName != 'entry') { $dom->documentElement->localName != 'entry') {
@ -349,6 +355,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
} }
if (!empty($saved)) { if (!empty($saved)) {
header('HTTP/1.1 201 Created');
header("Location: " . common_local_url('ApiStatusesShow', array('notice_id' => $saved->id, header("Location: " . common_local_url('ApiStatusesShow', array('notice_id' => $saved->id,
'format' => 'atom'))); 'format' => 'atom')));
$this->showSingleAtomStatus($saved); $this->showSingleAtomStatus($saved);