clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/2021.12-rc' into api-direct-messages

This commit is contained in:
Michael 2021-12-19 07:02:33 +00:00
parent 1110f4abf7 ff80e0876e
commit 94439a3b42
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/GServer.php
View File

@ -349,9 +349,9 @@ class GServer
}
// On a redirect follow the new host but mark the old one as failure
if ($curlResult->isSuccess() && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
if ($curlResult->isSuccess() && !empty($curlResult->getRedirectUrl()) && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
$curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
if (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
if (!empty($curlResult->getRedirectUrl()) && parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
self::setFailure($url);
self::detect($curlResult->getRedirectUrl(), $network, $only_nodeinfo);
@ -388,7 +388,7 @@ class GServer
$curlResult = DI::httpClient()->get($baseurl, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
if ($curlResult->isSuccess()) {
if ((parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
if (!empty($curlResult->getRedirectUrl()) && (parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
self::setFailure($url);
self::detect($curlResult->getRedirectUrl(), $network, $only_nodeinfo);

1
src/Module/Api/Mastodon/Apps.php
View File

@ -37,6 +37,7 @@ class Apps extends BaseApi
{
return parent::run($request, false);
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/

6
src/Module/OAuth/Acknowledge.php
View File

@ -24,12 +24,18 @@ namespace Friendica\Module\OAuth;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseApi;
use Psr\Http\Message\ResponseInterface;
/**
* Acknowledgement of OAuth requests
*/
class Acknowledge extends BaseApi
{
public function run(array $request = [], bool $scopecheck = true): ResponseInterface
{
return parent::run($request, false);
}
protected function post(array $request = [])
{
DI::session()->set('oauth_acknowledge', true);

6
src/Module/OAuth/Revoke.php
View File

@ -26,12 +26,18 @@ use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\BaseApi;
use Psr\Http\Message\ResponseInterface;
/**
* @see https://docs.joinmastodon.org/spec/oauth/
*/
class Revoke extends BaseApi
{
public function run(array $request = [], bool $scopecheck = true): ResponseInterface
{
return parent::run($request, false);
}
protected function post(array $request = [])
{
$request = $this->getRequest([

6
src/Module/OAuth/Token.php
View File

@ -28,6 +28,7 @@ use Friendica\DI;
use Friendica\Module\BaseApi;
use Friendica\Security\OAuth;
use Friendica\Util\DateTimeFormat;
use Psr\Http\Message\ResponseInterface;
/**
* @see https://docs.joinmastodon.org/spec/oauth/
@ -35,6 +36,11 @@ use Friendica\Util\DateTimeFormat;
*/
class Token extends BaseApi
{
public function run(array $request = [], bool $scopecheck = true): ResponseInterface
{
return parent::run($request, false);
}
protected function post(array $request = [])
{
$request = $this->getRequest([