UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add preliminary Authorize Interaction support

Browse source
This commit is contained in:
Daniel Supernault 2024-08-13 00:00:51 -06:00
parent ebf989a943
commit 4ca7c6c328
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
5 changed files with 57 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/Http/Controllers/AuthorizeInteractionController.php Normal file
View file

@ -0,0 +1,37 @@
<?php
namespace App\Http\Controllers;
use App\Util\ActivityPub\Helpers;
use Illuminate\Http\Request;
class AuthorizeInteractionController extends Controller
{
public function get(Request $request)
{
$request->validate([
'uri' => 'required|url',
]);
abort_unless((bool) config_cache('federation.activitypub.enabled'), 404);
$uri = Helpers::validateUrl($request->input('uri'), true);
abort_unless($uri, 404);
if (! $request->user()) {
return redirect('/login?next='.urlencode($uri));
}
$status = Helpers::statusFetch($uri);
if ($status && isset($status['id'])) {
return redirect('/i/web/post/'.$status['id']);
}
$profile = Helpers::profileFetch($uri);
if ($profile && isset($profile['id'])) {
return redirect('/i/web/profile/'.$profile['id']);
}
return redirect('/i/web');
}
}

4
app/Http/Controllers/FederationController.php
View file

@ -66,6 +66,10 @@ class FederationController extends Controller
'type' => 'application/activity+json',
'href' => 'https://'.$domain.'/i/actor',
],
[
'rel' => 'http://ostatus.org/schema/1.0/subscribe',
'template' => 'https://'.$domain.'/authorize_interaction?uri={uri}',
],
],
];

3
app/Util/Lexer/RestrictedNames.php
View file

@ -83,6 +83,9 @@ class RestrictedNames
'admin',
'administrator',
// Federation
'authorize_interaction',
// Static Assets
'assets',
'public',

15
app/Util/Webfinger/Webfinger.php
View file

@ -5,8 +5,11 @@ namespace App\Util\Webfinger;
class Webfinger
{
protected $user;
protected $subject;
protected $aliases;
protected $links;
public function __construct($user)
@ -30,17 +33,17 @@ class Webfinger
];
$this->links = [
[
'rel' => 'http://webfinger.net/rel/profile-page',
'rel' => 'http://webfinger.net/rel/profile-page',
'type' => 'text/html',
'href' => $user->url(),
],
[
'rel' => 'http://schemas.google.com/g/2010#updates-from',
'rel' => 'http://schemas.google.com/g/2010#updates-from',
'type' => 'application/atom+xml',
'href' => $user->permalink('.atom'),
],
[
'rel' => 'self',
'rel' => 'self',
'type' => 'application/activity+json',
'href' => $user->permalink(),
],
@ -49,6 +52,10 @@ class Webfinger
'type' => $avatarType,
'href' => $avatar,
],
[
'rel' => 'http://ostatus.org/schema/1.0/subscribe',
'template' => 'https://'.config_cache('pixelfed.domain.app').'/authorize_interaction?uri={uri}',
],
];
}
@ -57,7 +64,7 @@ class Webfinger
return [
'subject' => $this->subject,
'aliases' => $this->aliases,
'links' => $this->links,
'links' => $this->links,
];
}
}

3
routes/web.php
View file

@ -5,6 +5,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::redirect('/home', '/')->name('home');
Route::get('web/directory', 'LandingController@directoryRedirect');
Route::get('web/explore', 'LandingController@exploreRedirect');
Route::get('authorize_interaction', 'AuthorizeInteractionController@get');
Auth::routes();
Route::get('auth/raw/mastodon/start', 'RemoteAuthController@startRedirect');
@ -67,7 +68,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::get('lang/{locale}', 'SiteController@changeLocale');
Route::get('restored', 'AccountController@accountRestored');
Route::get('verify-email', 'AccountController@verifyEmail');
Route::get('verify-email', 'AccountController@verifyEmail')->name('account.verify_email');
Route::post('verify-email', 'AccountController@sendVerifyEmail');
Route::get('verify-email/request', 'InternalApiController@requestEmailVerification');
Route::post('verify-email/request', 'InternalApiController@requestEmailVerificationStore');