diff options
author | Max Kostikov <max@kostikov.co> | 2021-01-20 22:12:15 +0100 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2021-01-20 22:12:15 +0100 |
commit | ab4455c54c457d2eff773d7b7c1a723489c13bad (patch) | |
tree | 7c23d66e1f55bd4e2048a0a18297912f7628defa /include/network.php | |
parent | 15b2aa660ba99b7a17aa811041a40739f258672f (diff) | |
parent | 6cca06f6414547b3b7f38044ee808620e8dfdf43 (diff) | |
download | volse-hubzilla-ab4455c54c457d2eff773d7b7c1a723489c13bad.tar.gz volse-hubzilla-ab4455c54c457d2eff773d7b7c1a723489c13bad.tar.bz2 volse-hubzilla-ab4455c54c457d2eff773d7b7c1a723489c13bad.zip |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!2
Diffstat (limited to 'include/network.php')
-rw-r--r-- | include/network.php | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/include/network.php b/include/network.php index 324a99eba..f5ff48fce 100644 --- a/include/network.php +++ b/include/network.php @@ -1,8 +1,10 @@ <?php +use Zotlabs\Lib\LDSignatures; use Zotlabs\Lib\Zotfinger; use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Queue; +use Zotlabs\Web\HTTPSig; /** * @file include/network.php @@ -404,6 +406,31 @@ function json_return_and_die($x, $content_type = 'application/json') { killme(); } +function as_return_and_die($obj,$channel) { + + $x = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + z_root() . ZOT_APSCHEMA_REV + ]], $obj ); + + $headers = []; + $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ; + $x['signature'] = LDSignatures::sign($x,$channel); + $ret = json_encode($x, JSON_UNESCAPED_SLASHES); + logger('data: ' . jindent($ret), LOGGER_DATA); + $headers['Date'] = datetime_convert('UTC','UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'); + $headers['Digest'] = HTTPSig::generate_digest_header($ret); + $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; + + $h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel)); + HTTPSig::set_headers($h); + + echo $ret; + killme(); + +} + /** * @brief Send HTTP status header. * @@ -1978,7 +2005,7 @@ function getBestSupportedMimeType($mimeTypes = null, $acceptedTypes = false) { // check if there is a different quality if (strpos($a, ';q=')) { // divide "mime/type;q=X" into two parts: "mime/type" i "X" - list($a, $q) = explode(';q=', $a); + [$a, $q] = explode(';q=', $a); } // mime-type $a is accepted with the quality $q // WARNING: $q == 0 means, that mime-type isn’t supported! |