bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #13090 from abanink/feature-openwebauth

Browse source 
improve OpenWebAuth client support
This commit is contained in:
Hypolite Petovan 2023-05-05 09:59:27 -04:00 committed by GitHub
parent 148f12580b 7fd1db0ec6
commit 41030f596b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 58 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/Module/Magic.php
View file

@ -69,43 +69,78 @@ class Magic extends BaseModule
$this->logger->debug('args', ['request' => $_REQUEST]); $this->logger->debug('args', ['request' => $_REQUEST]);
$addr = $_REQUEST['addr'] ?? ''; $addr = $request['addr'] ?? '';
$dest = $_REQUEST['dest'] ?? ''; $dest = $request['dest'] ?? '';
$owa = (!empty($_REQUEST['owa']) ? intval($_REQUEST['owa']) : 0); $bdest = $request['bdest'] ?? '';
$owa = intval($request['owa'] ?? 0);
$cid = 0; $cid = 0;
// bdest is preferred as it is hex-encoded and can survive url rewrite and argument parsing
if (!empty($bdest)) {
$dest = hex2bin($bdest);
$this->logger->info('bdest detected. ', ['dest' => $dest]);
}
if (!empty($addr)) { if (!empty($addr)) {
$cid = Contact::getIdForURL($addr); $cid = Contact::getIdForURL($addr);
} elseif (!empty($dest)) { } elseif (!empty($dest)) {
$cid = Contact::getIdForURL($dest); $cid = Contact::getIdForURL($dest);
} }
$this->logger->info('Contact ID: ', ['cid' => $cid]);
$contact = false;
if (!$cid) { if (!$cid) {
$this->logger->info('No contact record found', $_REQUEST); $this->logger->info('No contact record found', $_REQUEST);
// @TODO Finding a more elegant possibility to redirect to either internal or external URL
$this->app->redirect($dest);
}
$contact = $this->dba->selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
// Redirect if the contact is already authenticated on this site. if (!$owa) {
if ($this->app->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl)) !== false) { // @TODO Finding a more elegant possibility to redirect to either internal or external URL
$this->logger->info('Contact is already authenticated'); $this->app->redirect($dest);
System::externalRedirect($dest); }
} else {
$contact = $this->dba->selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
// Redirect if the contact is already authenticated on this site.
if ($this->app->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl)) !== false) {
$this->logger->info('Contact is already authenticated');
System::externalRedirect($dest);
}
$this->logger->info('Contact URL: ', ['url' => $contact['url']]);
} }
// OpenWebAuth // OpenWebAuth
if ($this->userSession->getLocalUserId() && $owa) { if ($this->userSession->getLocalUserId() && $owa) {
$this->logger->info('Checking OWA now');
$user = User::getById($this->userSession->getLocalUserId()); $user = User::getById($this->userSession->getLocalUserId());
// Extract the basepath $basepath = false;
// NOTE: we need another solution because this does only work if (!empty($contact)) {
// for friendica contacts :-/ . We should have the basepath $this->logger->info('Contact found - trying friendica style basepath extraction');
// of a contact also in the contact table. // Extract the basepath
$exp = explode('/profile/', $contact['url']); // NOTE: we need another solution because this does only work
$basepath = $exp[0]; // for friendica contacts :-/ . We should have the basepath
// of a contact also in the contact table.
$contact_url = $contact['url'];
if (!(strpos($contact_url, '/profile/') === false)) {
$exp = explode('/profile/', $contact['url']);
$basepath = $exp[0];
$this->logger->info('Basepath: ', ['basepath' => $basepath]);
} else {
$this->logger->info('Not possible to extract basepath in friendica style');
}
}
if (!$basepath) {
// For the rest of the OpenWebAuth-enabled Fediverse
$parsed = parse_url($dest);
$this->logger->info('Parsed URL: ', ['parsed URL' => $parsed]);
if (!$parsed) {
System::externalRedirect($dest);
}
$basepath = $parsed['scheme'] . '://' . $parsed['host'] . (isset($parsed['port']) ? ':' . $parsed['port'] : '');
}
$accept_headers = ['application/x-dfrn+json', 'application/x-zot+json'];
$header = [ $header = [
'Accept' => ['application/x-dfrn+json', 'application/x-zot+json'], 'Accept' => $accept_headers,
'X-Open-Web-Auth' => [Strings::getRandomHex()], 'X-Open-Web-Auth' => [Strings::getRandomHex()],
]; ];
@ -116,11 +151,14 @@ class Magic extends BaseModule
'acct:' . $user['nickname'] . '@' . $this->baseUrl->getHost() . ($this->baseUrl->getPath() ? '/' . $this->baseUrl->getPath() : '') 'acct:' . $user['nickname'] . '@' . $this->baseUrl->getHost() . ($this->baseUrl->getPath() ? '/' . $this->baseUrl->getPath() : '')
); );
$this->logger->info('Headers: ', ['headers' => $header]);
// Try to get an authentication token from the other instance. // Try to get an authentication token from the other instance.
$curlResult = $this->httpClient->get($basepath . '/owa', HttpClientAccept::DEFAULT, [HttpClientOptions::HEADERS => $header]); $curlResult = $this->httpClient->get($basepath . '/owa', HttpClientAccept::DEFAULT, [HttpClientOptions::HEADERS => $header, HttpClientOptions::ACCEPT_CONTENT => $accept_headers]);
if ($curlResult->isSuccess()) { if ($curlResult->isSuccess()) {
$j = json_decode($curlResult->getBody(), true); $j = json_decode($curlResult->getBody(), true);
$this->logger->info('Curl result body: ', ['body' => $j]);
if ($j['success']) { if ($j['success']) {
$token = ''; $token = '';