UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-26 06:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add signed GET for secure mode compatibility

Browse source
This commit is contained in:
Daniel Supernault 2021-01-17 12:51:07 -07:00
parent b29b845533
commit 3ee1215a4a
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
3 changed files with 14 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
app/Services/ActivityPubFetchService.php
View file

@ -9,51 +9,16 @@ use App\Util\ActivityPub\HttpSignature;
class ActivityPubFetchService class ActivityPubFetchService
{ {
public $signed = true; public static function get($url)
public $actor;
public $url;
public $headers = [
'Accept' => 'application/activity+json, application/json',
'User-Agent' => '(Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')'
];
public static function queue()
{ {
return new self; $headers = HttpSignature::instanceActorSign($url, false, [
} 'Accept' => 'application/activity+json, application/json',
'User-Agent' => '(Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')'
]);
public function signed($signed = true) return Zttp::withHeaders($headers)
{ ->timeout(30)
$this->signed = $signed; ->get($url)
return $this; ->body();
}
public function actor($profile)
{
$this->actor = $profile;
return $this;
}
public function url($url)
{
if(!Helpers::validateUrl($url)) {
throw new \Exception('Invalid URL');
}
$this->url = $url;
return $this;
}
public function get()
{
if($this->signed == true && $this->actor == null) {
throw new \Exception('Cannot sign request without actor');
}
return $this->signedRequest();
}
protected function signedRequest()
{
$this->headers = HttpSignature::sign($this->actor, $this->url, false, $this->headers);
return Zttp::withHeaders($this->headers)->get($this->url)->body();
} }
} }

5
app/Util/ActivityPub/Helpers.php
View file

@ -23,6 +23,7 @@ use App\Jobs\ImageOptimizePipeline\{ImageOptimize,ImageThumbnail};
use App\Jobs\StatusPipeline\NewStatusPipeline; use App\Jobs\StatusPipeline\NewStatusPipeline;
use App\Util\ActivityPub\HttpSignature; use App\Util\ActivityPub\HttpSignature;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use App\Services\ActivityPubFetchService;
use App\Services\ActivityPubDeliveryService; use App\Services\ActivityPubDeliveryService;
use App\Services\MediaPathService; use App\Services\MediaPathService;
use App\Services\MediaStorageService; use App\Services\MediaStorageService;
@ -214,8 +215,8 @@ class Helpers {
$ttl = now()->addMinutes(5); $ttl = now()->addMinutes(5);
return Cache::remember($key, $ttl, function() use($url) { return Cache::remember($key, $ttl, function() use($url) {
$res = Zttp::withoutVerifying()->withHeaders(self::zttpUserAgent())->get($url); $res = ActivityPubFetchService::get($url);
$res = json_decode($res->body(), true, 8); $res = json_decode($res, true, 8);
if(json_last_error() == JSON_ERROR_NONE) { if(json_last_error() == JSON_ERROR_NONE) {
return $res; return $res;
} else { } else {

4
app/Util/ActivityPub/HttpSignature.php
View file

@ -43,7 +43,7 @@ class HttpSignature {
$digest = self::_digest($body); $digest = self::_digest($body);
} }
$headers = self::_headersToSign($url, $body ? $digest : false); $headers = self::_headersToSign($url, $body ? $digest : false);
$headers = array_merge($headers, $addlHeaders); $headers = array_unique(array_merge($headers, $addlHeaders));
$stringToSign = self::_headersToSigningString($headers); $stringToSign = self::_headersToSigningString($headers);
$signedHeaders = implode(' ', array_map('strtolower', array_keys($headers))); $signedHeaders = implode(' ', array_map('strtolower', array_keys($headers)));
$key = openssl_pkey_get_private($privateKey); $key = openssl_pkey_get_private($privateKey);
@ -53,7 +53,7 @@ class HttpSignature {
unset($headers['(request-target)']); unset($headers['(request-target)']);
$headers['Signature'] = $signatureHeader; $headers['Signature'] = $signatureHeader;
return self::_headersToCurlArray($headers); return $headers;
} }
public static function parseSignatureHeader($signature) { public static function parseSignatureHeader($signature) {