Update FederationController, remove old code
This commit is contained in:
parent
fe4d880f2c
commit
0309f8a4e1
|
@ -103,107 +103,9 @@ class FederationController extends Controller
|
|||
$headers = $request->headers->all();
|
||||
$payload = $request->getContent();
|
||||
InboxValidator::dispatchNow($username, $headers, $payload)->onQueue('high');
|
||||
// $profile = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
|
||||
// if($profile->status != null) {
|
||||
// return ProfileController::accountCheck($profile);
|
||||
// }
|
||||
// $body = $request->getContent();
|
||||
// $bodyDecoded = json_decode($body, true, 12);
|
||||
// if($this->verifySignature($request, $profile) == true) {
|
||||
// InboxWorker::dispatch($request->headers->all(), $profile, $bodyDecoded);
|
||||
// } else if($this->blindKeyRotation($request, $profile) == true) {
|
||||
// InboxWorker::dispatch($request->headers->all(), $profile, $bodyDecoded);
|
||||
// } else {
|
||||
// abort(400, 'Bad Signature');
|
||||
// }
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
protected function verifySignature(Request $request, Profile $profile)
|
||||
{
|
||||
$body = $request->getContent();
|
||||
$bodyDecoded = json_decode($body, true, 8);
|
||||
$signature = $request->header('signature');
|
||||
$date = $request->header('date');
|
||||
$digest = $request->header('digest');
|
||||
if(!$digest) {
|
||||
abort(400, 'Missing digest header');
|
||||
}
|
||||
if(!$signature) {
|
||||
abort(400, 'Missing signature header');
|
||||
}
|
||||
if(!$date) {
|
||||
abort(400, 'Missing date header');
|
||||
}
|
||||
if(!now()->parse($date)->gt(now()->subDays(1)) || !now()->parse($date)->lt(now()->addDays(1))) {
|
||||
abort(400, 'Invalid date');
|
||||
}
|
||||
$signatureData = HttpSignature::parseSignatureHeader($signature);
|
||||
$keyId = Helpers::validateUrl($signatureData['keyId']);
|
||||
$id = Helpers::validateUrl($bodyDecoded['id']);
|
||||
$keyDomain = parse_url($keyId, PHP_URL_HOST);
|
||||
$idDomain = parse_url($id, PHP_URL_HOST);
|
||||
if($keyDomain == config('pixelfed.domain.app') || $idDomain == config('pixelfed.domain.app')) {
|
||||
return false;
|
||||
}
|
||||
if(isset($bodyDecoded['object'])
|
||||
&& is_array($bodyDecoded['object'])
|
||||
&& isset($bodyDecoded['object']['attributedTo'])
|
||||
) {
|
||||
if(parse_url($bodyDecoded['object']['attributedTo'], PHP_URL_HOST) !== $keyDomain) {
|
||||
abort(400, 'Invalid request');
|
||||
}
|
||||
}
|
||||
if(!$keyDomain || !$idDomain || $keyDomain !== $idDomain) {
|
||||
abort(400, 'Invalid request');
|
||||
}
|
||||
$actor = Profile::whereKeyId($keyId)->first();
|
||||
if(!$actor) {
|
||||
$actor = Helpers::profileFirstOrNew($bodyDecoded['actor']);
|
||||
}
|
||||
if(!$actor) {
|
||||
return false;
|
||||
}
|
||||
$pkey = openssl_pkey_get_public($actor->public_key);
|
||||
$inboxPath = "/users/{$profile->username}/inbox";
|
||||
list($verified, $headers) = HttpSignature::verify($pkey, $signatureData, $request->headers->all(), $inboxPath, $body);
|
||||
if($verified == 1) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
protected function blindKeyRotation(Request $request, Profile $profile)
|
||||
{
|
||||
$signature = $request->header('signature');
|
||||
$date = $request->header('date');
|
||||
if(!$signature) {
|
||||
abort(400, 'Missing signature header');
|
||||
}
|
||||
if(!$date) {
|
||||
abort(400, 'Missing date header');
|
||||
}
|
||||
if(!now()->parse($date)->gt(now()->subDays(1)) || !now()->parse($date)->lt(now()->addDays(1))) {
|
||||
abort(400, 'Invalid date');
|
||||
}
|
||||
$signatureData = HttpSignature::parseSignatureHeader($signature);
|
||||
$keyId = Helpers::validateUrl($signatureData['keyId']);
|
||||
$actor = Profile::whereKeyId($keyId)->whereNotNull('remote_url')->firstOrFail();
|
||||
$res = Zttp::timeout(5)->withHeaders([
|
||||
'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
|
||||
'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
|
||||
])->get($actor->remote_url);
|
||||
$res = json_decode($res->body(), true, 8);
|
||||
if($res['publicKey']['id'] !== $actor->key_id) {
|
||||
return false;
|
||||
}
|
||||
$actor->public_key = $res['publicKey']['publicKeyPem'];
|
||||
$actor->save();
|
||||
return $this->verifySignature($request, $profile);
|
||||
}
|
||||
|
||||
public function userFollowing(Request $request, $username)
|
||||
{
|
||||
abort_if(!config('federation.activitypub.enabled'), 404);
|
||||
|
|
Loading…
Reference in a new issue