use Friendica\BaseObject;
use Friendica\Core\Config;
+use Friendica\Core\Logger;
use Friendica\Database\DBA;
use Friendica\Model\User;
use Friendica\Model\APContact;
$sig_block = self::parseSigheader($headers['authorization']);
if (!$sig_block) {
- logger('no signature provided.');
+ Logger::log('no signature provided.');
return $result;
}
$key = $key($sig_block['keyId']);
}
- logger('Got keyID ' . $sig_block['keyId']);
+ Logger::log('Got keyID ' . $sig_block['keyId']);
if (!$key) {
return $result;
$x = Crypto::rsaVerify($signed_data, $sig_block['signature'], $key, $algorithm);
- logger('verified: ' . $x, LOGGER_DEBUG);
+ Logger::log('verified: ' . $x, Logger::DEBUG);
if (!$x) {
return $result;
/**
* @brief Transmit given data to a target for a user
*
- * @param $data
- * @param $target
- * @param $uid
+ * @param array $data Data that is about to be send
+ * @param string $target The URL of the inbox
+ * @param integer $uid User id of the sender
+ *
+ * @return boolean Was the transmission successful?
*/
public static function transmit($data, $target, $uid)
{
$headers[] = 'Content-Type: application/activity+json';
- Network::post($target, $content, $headers);
- $return_code = Network::getCurl()->getCode();
+ $postResult = Network::post($target, $content, $headers);
+ $return_code = $postResult->getReturnCode();
+
+ Logger::log('Transmit to ' . $target . ' returned ' . $return_code);
- logger('Transmit to ' . $target . ' returned ' . $return_code);
+ return ($return_code >= 200) && ($return_code <= 299);
}
/**
}
}
+ /// @todo Check if the signed date field is in an acceptable range
+
// Check the content-length when it is part of the signed data
if (in_array('content-length', $sig_block['headers'])) {
if (strlen($content) != $headers['content-length']) {
$profile = APContact::getByURL($url);
if (!empty($profile)) {
- logger('Taking key from id ' . $id, LOGGER_DEBUG);
+ Logger::log('Taking key from id ' . $id, Logger::DEBUG);
return ['url' => $url, 'pubkey' => $profile['pubkey']];
} elseif ($url != $actor) {
$profile = APContact::getByURL($actor);
if (!empty($profile)) {
- logger('Taking key from actor ' . $actor, LOGGER_DEBUG);
+ Logger::log('Taking key from actor ' . $actor, Logger::DEBUG);
return ['url' => $actor, 'pubkey' => $profile['pubkey']];
}
}