use Friendica\BaseObject;
use Friendica\Core\Config;
+use Friendica\Core\Logger;
use Friendica\Database\DBA;
use Friendica\Model\User;
+use Friendica\Model\APContact;
use Friendica\Protocol\ActivityPub;
/**
*
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/Zotlabs/Web/HTTPSig.php
*
+ * Other parts of the code for HTTP signing are taken from the Osada project.
+ * https://framagit.org/macgirvin/osada
+ *
* @see https://tools.ietf.org/html/draft-cavage-http-signatures-07
*/
class HTTPSignature
{
// See draft-cavage-http-signatures-08
+ /**
+ * @brief Verifies a magic request
+ *
+ * @param $key
+ *
+ * @return array with verification data
+ */
public static function verifyMagic($key)
{
$headers = null;
$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;
return '';
}
- /**
+ /*
* Functions for ActivityPub
*/
+ /**
+ * @brief Transmit given data to a target for a user
+ *
+ * @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)
{
$owner = User::getOwnerDataById($uid);
return;
}
- $content = json_encode($data);
+ $content = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
// Header data that is about to be signed.
$host = parse_url($target, PHP_URL_HOST);
$headers[] = 'Content-Type: application/activity+json';
- Network::post($target, $content, $headers);
- $return_code = BaseObject::getApp()->get_curl_code();
+ $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);
}
- public static function verifyAP($content, $http_headers)
+ /**
+ * @brief Gets a signer from a given HTTP request
+ *
+ * @param $content
+ * @param $http_headers
+ *
+ * @return signer string
+ */
+ public static function getSigner($content, $http_headers)
{
$object = json_decode($content, true);
return false;
}
- if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key, $algorithm)) {
+ if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key['pubkey'], $algorithm)) {
return false;
}
}
}
+ /// @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']) {
}
}
- return true;
-
+ return $key['url'];
}
+ /**
+ * @brief fetches a key for a given id and actor
+ *
+ * @param $id
+ * @param $actor
+ *
+ * @return array with actor url and public key
+ */
private static function fetchKey($id, $actor)
{
$url = (strpos($id, '#') ? substr($id, 0, strpos($id, '#')) : $id);
- $profile = ActivityPub::fetchprofile($url);
+ $profile = APContact::getByURL($url);
if (!empty($profile)) {
- return $profile['pubkey'];
+ Logger::log('Taking key from id ' . $id, Logger::DEBUG);
+ return ['url' => $url, 'pubkey' => $profile['pubkey']];
} elseif ($url != $actor) {
- $profile = ActivityPub::fetchprofile($actor);
+ $profile = APContact::getByURL($actor);
if (!empty($profile)) {
- return $profile['pubkey'];
+ Logger::log('Taking key from actor ' . $actor, Logger::DEBUG);
+ return ['url' => $actor, 'pubkey' => $profile['pubkey']];
}
}