friendica/friendica-addons
7
2
Fork 13
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Changes:

Browse source 
- rewrote `header('Location: foo');` to `System::externalRedirect()`
- no executable permission on these files
This commit is contained in:
Roland Häder 2022-09-12 19:04:40 +02:00
parent 94a774a7d2
commit 5f154c18a8
Signed by: roland
GPG key ID: C82EDE5DDFA0BA77
3 changed files with 46 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
saml/README.md Executable file → Normal file
View file

18
saml/saml.php Executable file → Normal file
View file

@ -12,6 +12,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Session; use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\User; use Friendica\Model\User;
@ -96,7 +97,7 @@ if (target.length) { target.append("<p>$fragment</p>"); }
EOL; EOL;
} }
function saml_is_configured() function saml_is_configured(): bool
{ {
return return
DI::config()->get('saml', 'idp_id') && DI::config()->get('saml', 'idp_id') &&
@ -119,10 +120,7 @@ function saml_sso_initiate(App $a, array &$b)
$auth = new \OneLogin\Saml2\Auth(saml_settings()); $auth = new \OneLogin\Saml2\Auth(saml_settings());
$ssoBuiltUrl = $auth->login(null, [], false, false, true); $ssoBuiltUrl = $auth->login(null, [], false, false, true);
$_SESSION['AuthNRequestID'] = $auth->getLastRequestID(); $_SESSION['AuthNRequestID'] = $auth->getLastRequestID();
header('Pragma: no-cache'); System::externalRedirect($ssoBuiltUrl);
header('Cache-Control: no-cache, must-revalidate');
header('Location: ' . $ssoBuiltUrl);
exit();
} }
function saml_sso_reply(App $a) function saml_sso_reply(App $a)
@ -182,13 +180,9 @@ function saml_slo_initiate(App $a, array &$b)
} }
$auth = new \OneLogin\Saml2\Auth(saml_settings()); $auth = new \OneLogin\Saml2\Auth(saml_settings());
$sloBuiltUrl = $auth->logout(); $sloBuiltUrl = $auth->logout();
$_SESSION['LogoutRequestID'] = $auth->getLastRequestID(); $_SESSION['LogoutRequestID'] = $auth->getLastRequestID();
header('Pragma: no-cache'); System::externalRedirect($sloBuiltUrl);
header('Cache-Control: no-cache, must-revalidate');
header('Location: ' . $sloBuiltUrl);
exit();
} }
function saml_slo_reply() function saml_slo_reply()
@ -212,7 +206,7 @@ function saml_slo_reply()
} }
} }
function saml_input($key, $label, $description) function saml_input($key, $label, $description): array
{ {
return [ return [
'$' . $key => [ '$' . $key => [
@ -338,7 +332,7 @@ function saml_create_user($username, $email, $name)
} }
} }
function saml_settings() function saml_settings(): array
{ {
return [ return [

79
tumblr/tumblr.php
View file

@ -14,6 +14,7 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Post; use Friendica\Model\Post;
@ -45,11 +46,11 @@ function tumblr_content(App $a)
if (isset(DI::args()->getArgv()[1])) { if (isset(DI::args()->getArgv()[1])) {
switch (DI::args()->getArgv()[1]) { switch (DI::args()->getArgv()[1]) {
case "connect": case 'connect':
$o = tumblr_connect($a); $o = tumblr_connect($a);
break; break;
case "callback": case 'callback':
$o = tumblr_callback($a); $o = tumblr_callback($a);
break; break;
@ -66,7 +67,7 @@ function tumblr_content(App $a)
function tumblr_addon_admin(App $a, string &$o) function tumblr_addon_admin(App $a, string &$o)
{ {
$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/tumblr/" ); $t = Renderer::getMarkupTemplate( 'admin.tpl', 'addon/tumblr/' );
$o = Renderer::replaceMacros($t, [ $o = Renderer::replaceMacros($t, [
'$submit' => DI::l10n()->t('Save Settings'), '$submit' => DI::l10n()->t('Save Settings'),
@ -119,7 +120,7 @@ function tumblr_connect(App $a)
$url = $tum_oauth->getAuthorizeURL($token); $url = $tum_oauth->getAuthorizeURL($token);
// Redirect the user to the login URL given to us by Tumblr // Redirect the user to the login URL given to us by Tumblr
header('Location: ' . $url); System::externalRedirect($url);
/* /*
* That's it for our side. The user is sent to a Tumblr Login page and * That's it for our side. The user is sent to a Tumblr Login page and
@ -174,8 +175,8 @@ function tumblr_callback(App $a)
DI::pConfig()->set(local_user(), 'tumblr', 'oauth_token', $access_token['oauth_token']); DI::pConfig()->set(local_user(), 'tumblr', 'oauth_token', $access_token['oauth_token']);
DI::pConfig()->set(local_user(), 'tumblr', 'oauth_token_secret', $access_token['oauth_token_secret']); DI::pConfig()->set(local_user(), 'tumblr', 'oauth_token_secret', $access_token['oauth_token_secret']);
$o = DI::l10n()->t("You are now authenticated to tumblr."); $o = DI::l10n()->t('You are now authenticated to tumblr.');
$o .= '<br /><a href="' . DI::baseUrl()->get() . '/settings/connectors">' . DI::l10n()->t("return to the connector page") . '</a>'; $o .= '<br /><a href="' . DI::baseUrl()->get() . '/settings/connectors">' . DI::l10n()->t('return to the connector page') . '</a>';
return $o; return $o;
} }
@ -219,7 +220,7 @@ function tumblr_settings(App $a, array &$data)
$userinfo = $tum_oauth->get('user/info'); $userinfo = $tum_oauth->get('user/info');
$blogs = array_map(function ($blog) { $blogs = array_map(function ($blog) {
return substr(str_replace(["http://", "https://"], ["", ""], $blog->url), 0, -1); return substr(str_replace(['http://', 'https://'], ['', ''], $blog->url), 0, -1);
}, $userinfo->response->user->blogs); }, $userinfo->response->user->blogs);
$page_select = ['tumblr-page', DI::l10n()->t('Post to page:'), $page, '', $blogs]; $page_select = ['tumblr-page', DI::l10n()->t('Post to page:'), $page, '', $blogs];
@ -333,9 +334,9 @@ function tumblr_send(App $a, array &$b) {
$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], $b['body']); $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], $b['body']);
$oauth_token = DI::pConfig()->get($b['uid'], "tumblr", "oauth_token"); $oauth_token = DI::pConfig()->get($b['uid'], 'tumblr', 'oauth_token');
$oauth_token_secret = DI::pConfig()->get($b['uid'], "tumblr", "oauth_token_secret"); $oauth_token_secret = DI::pConfig()->get($b['uid'], 'tumblr', 'oauth_token_secret');
$page = DI::pConfig()->get($b['uid'], "tumblr", "page"); $page = DI::pConfig()->get($b['uid'], 'tumblr', 'page');
$tmbl_blog = 'blog/' . $page . '/post'; $tmbl_blog = 'blog/' . $page . '/post';
if ($oauth_token && $oauth_token_secret && $tmbl_blog) { if ($oauth_token && $oauth_token_secret && $tmbl_blog) {
@ -353,7 +354,7 @@ function tumblr_send(App $a, array &$b) {
$title = trim($b['title']); $title = trim($b['title']);
$siteinfo = BBCode::getAttachedData($b["body"]); $siteinfo = BBCode::getAttachedData($b['body']);
$params = [ $params = [
'state' => 'published', 'state' => 'published',
@ -362,65 +363,65 @@ function tumblr_send(App $a, array &$b) {
'format' => 'html', 'format' => 'html',
]; ];
if (!isset($siteinfo["type"])) { if (!isset($siteinfo['type'])) {
$siteinfo["type"] = ""; $siteinfo['type'] = '';
} }
if (($title == "") && isset($siteinfo["title"])) { if (($title == '') && isset($siteinfo['title'])) {
$title = $siteinfo["title"]; $title = $siteinfo['title'];
} }
if (isset($siteinfo["text"])) { if (isset($siteinfo['text'])) {
$body = $siteinfo["text"]; $body = $siteinfo['text'];
} else { } else {
$body = BBCode::removeShareInformation($b["body"]); $body = BBCode::removeShareInformation($b['body']);
} }
switch ($siteinfo["type"]) { switch ($siteinfo['type']) {
case "photo": case 'photo':
$params['type'] = "photo"; $params['type'] = 'photo';
$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);; $params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);;
if (isset($siteinfo["url"])) { if (isset($siteinfo['url'])) {
$params['link'] = $siteinfo["url"]; $params['link'] = $siteinfo['url'];
} }
$params['source'] = $siteinfo["image"]; $params['source'] = $siteinfo['image'];
break; break;
case "link": case 'link':
$params['type'] = "link"; $params['type'] = 'link';
$params['title'] = $title; $params['title'] = $title;
$params['url'] = $siteinfo["url"]; $params['url'] = $siteinfo['url'];
$params['description'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS); $params['description'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
break; break;
case "audio": case 'audio':
$params['type'] = "audio"; $params['type'] = 'audio';
$params['external_url'] = $siteinfo["url"]; $params['external_url'] = $siteinfo['url'];
$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS); $params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
break; break;
case "video": case 'video':
$params['type'] = "video"; $params['type'] = 'video';
$params['embed'] = $siteinfo["url"]; $params['embed'] = $siteinfo['url'];
$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS); $params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
break; break;
default: default:
$params['type'] = "text"; $params['type'] = 'text';
$params['title'] = $title; $params['title'] = $title;
$params['body'] = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS); $params['body'] = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
break; break;
} }
if (isset($params['caption']) && (trim($title) != "")) { if (isset($params['caption']) && (trim($title) != '')) {
$params['caption'] = '<h1>'.$title."</h1>". $params['caption'] = '<h1>' . $title . '</h1>' .
"<p>".$params['caption']."</p>"; '<p>' . $params['caption'] . '</p>';
} }
if (empty($params['caption']) && !empty($siteinfo["description"])) { if (empty($params['caption']) && !empty($siteinfo['description'])) {
$params['caption'] = BBCode::convertForUriId($b['uri-id'], "[quote]" . $siteinfo["description"] . "[/quote]", BBCode::CONNECTORS); $params['caption'] = BBCode::convertForUriId($b['uri-id'], '[quote]' . $siteinfo['description'] . '[/quote]', BBCode::CONNECTORS);
} }
$consumer_key = DI::config()->get('tumblr','consumer_key'); $consumer_key = DI::config()->get('tumblr','consumer_key');