Merge remote-tracking branch 'upstream/develop' into relayed-dfrn-dspr

bin/auth_ejabberd.php

@@ -58,7 +58,7 @@ if (php_sapi_name() !== 'cli') {
 
 use Dice\Dice;
 use Friendica\App\Mode;
-use Friendica\Util\ExAuth;
+use Friendica\Security\ExAuth;
 use Psr\Log\LoggerInterface;
 
 if (sizeof($_SERVER["argv"]) == 0) {

composer.json

@@ -77,9 +77,6 @@
 			"Friendica\\": "src/",
 			"Friendica\\Addon\\": "addon/"
 		},
-		"psr-0": {
-			"": "library/"
-		},
 		"files": [
 			"include/conversation.php",
 			"include/dba.php",

include/api.php

@@ -44,7 +44,7 @@ use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Model\UserItem;
 use Friendica\Model\Verb;
-use Friendica\Network\FKOAuth1;
+use Friendica\Security\FKOAuth1;
 use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\ExpectationFailedException;
@@ -58,6 +58,8 @@ use Friendica\Network\HTTPException\UnauthorizedException;
 use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\Diaspora;
+use Friendica\Security\OAuth1\OAuthRequest;
+use Friendica\Security\OAuth1\OAuthUtil;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Network;

include/conversation.php

@@ -585,6 +585,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 					'template' => $tpl,
 					'id' => ($preview ? 'P0' : $item['id']),
 					'guid' => ($preview ? 'Q0' : $item['guid']),
+					'commented' => $item['commented'],
+					'received' => $item['received'],
+					'created_date' => $item['created'],
+					'uriid' => $item['uri-id'],
 					'network' => $item['network'],
 					'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']),
 					'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
@@ -734,7 +738,7 @@ function conversation_fetch_comments($thread_items, $pinned) {
 				$row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')];
 				break;
 			case Item::PT_ANNOUNCEMENT:
-				if (!empty($row['causer-id']) && DI::pConfig()->get(local_user(), 'system', 'display_resharer')  ) {
+				if (!empty($row['causer-id']) && DI::pConfig()->get(local_user(), 'system', 'display_resharer')) {
 					$row['owner-link'] = $row['causer-link'];
 					$row['owner-avatar'] = $row['causer-avatar'];
 					$row['owner-name'] = $row['causer-name'];

index.php

@@ -38,6 +38,6 @@ $a->runFrontend(
 	$dice->create(\Friendica\App\Module::class),
 	$dice->create(\Friendica\App\Router::class),
 	$dice->create(\Friendica\Core\PConfig\IPConfig::class),
-	$dice->create(\Friendica\App\Authentication::class),
+	$dice->create(\Friendica\Security\Authentication::class),
 	$dice->create(\Friendica\App\Page::class)
 );

mod/api.php

@@ -24,6 +24,8 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\Security\Login;
+use Friendica\Security\OAuth1\OAuthRequest;
+use Friendica\Security\OAuth1\OAuthUtil;
 
 require_once __DIR__ . '/../include/api.php';
 

mod/item.php

@@ -54,7 +54,7 @@ use Friendica\Object\EMail\ItemCCEMail;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Security;
+use Friendica\Security\Security;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
 

mod/photos.php

@@ -47,7 +47,7 @@ use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Map;
-use Friendica\Util\Security;
+use Friendica\Security\Security;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;

mod/videos.php

@@ -33,7 +33,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Module\BaseProfile;
-use Friendica\Util\Security;
+use Friendica\Security\Security;
 
 function videos_init(App $a)
 {

src/App.php

@@ -24,7 +24,7 @@ namespace Friendica;
 use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
-use Friendica\App\Authentication;
+use Friendica\Security\Authentication;
 use Friendica\Core\Config\Cache;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\PConfig\IPConfig;

src/DI.php

@@ -63,14 +63,6 @@ abstract class DI
 	// "App" namespace instances
 	//
 
-	/**
-	 * @return App\Authentication
-	 */
-	public static function auth()
-	{
-		return self::$dice->create(App\Authentication::class);
-	}
-
 	/**
 	 * @return App\Arguments
 	 */
@@ -406,6 +398,18 @@ abstract class DI
 		return self::$dice->create(Protocol\Activity::class);
 	}
 
+	//
+	// "Security" namespace instances
+	//
+
+	/**
+	 * @return \Friendica\Security\Authentication
+	 */
+	public static function auth()
+	{
+		return self::$dice->create(Security\Authentication::class);
+	}
+
 	//
 	// "Util" namespace instances
 	//

src/Model/Attach.php

@@ -28,7 +28,7 @@ use Friendica\DI;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Mimetype;
-use Friendica\Util\Security;
+use Friendica\Security\Security;
 
 /**
  * Class to handle attach dabatase table

src/Model/Contact.php

@@ -1286,15 +1286,15 @@ class Contact
 		if ($thread_mode) {
 			$condition = ["(`$contact_field` = ? OR (`causer-id` = ? AND `post-type` = ?)) AND `gravity` = ? AND " . $sql,
 				$cid, $cid, Item::PT_ANNOUNCEMENT, GRAVITY_PARENT, local_user()];
+		} else {
+			$condition = ["`$contact_field` = ? AND `gravity` IN (?, ?) AND " . $sql,
+				$cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
+		}
 
 		$last_received = isset($_GET['last_received']) ? DateTimeFormat::utc($_GET['last_received']) : '';
 		if (!empty($last_received)) {
 			$condition = DBA::mergeConditions($condition, ["`received` < ?", $last_received]);
 		}
-		} else {
-			$condition = ["`$contact_field` = ? AND `gravity` IN (?, ?) AND " . $sql,
-				$cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
-		}
 
 		if (DI::mode()->isMobile()) {
 			$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
@@ -1309,7 +1309,6 @@ class Contact
 		$params = ['order' => ['received' => true], 'group_by' => ['uri-id'],
 			'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 
-		if ($thread_mode) {
 		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
 			$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
 			$o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]);
@@ -1317,6 +1316,7 @@ class Contact
 			$o = '';
 		}
 
+		if ($thread_mode) {		
 			$r = Item::selectForUser(local_user(), ['uri', 'gravity', 'parent-uri'], $condition, $params);
 			$items = [];
 			while ($item = DBA::fetch($r)) {
@@ -1336,11 +1336,11 @@ class Contact
 
 			$items = Item::inArray($r);
 
-			$o = conversation($a, $items, 'contact-posts', false);
+			$o .= conversation($a, $items, 'contact-posts', false);
 		}
 
 		if (!$update) {
-			if ($thread_mode && DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+			if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
 				$o .= HTML::scrollLoader();
 			} else {
 				$o .= $pager->renderMinimal(count($items));
@@ -2578,7 +2578,7 @@ class Contact
 	{
 		$destination = $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
 
-		if (!Session::isAuthenticated() || ($contact['network'] != Protocol::DFRN)) {
+		if (!Session::isAuthenticated()) {
 			return $destination;
 		}
 
@@ -2587,6 +2587,14 @@ class Contact
 			return $url;
 		}
 
+		if (DI::pConfig()->get(local_user(), 'system', 'stay_local') && ($url == '')) {
+			return 'contact/' . $contact['id'] . '/conversations';
+		}
+
+		if ($contact['network'] != Protocol::DFRN) {
+			return $destination;
+		}
+
 		if (!empty($contact['uid'])) {
 			return self::magicLink($contact['url'], $url);
 		}

src/Model/Item.php

@@ -3595,11 +3595,9 @@ class Item
 					DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'));
 				}
 
-				$url_parts = explode('/', $the_url);
-				$id = end($url_parts);
 				$as .= Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
 					'$video' => [
-						'id'     => $id,
+						'id'     => $item['author-id'],
 						'title'  => DI::l10n()->t('View Video'),
 						'src'    => $the_url,
 						'mime'   => $mime,

src/Model/ItemContent.php

@@ -29,10 +29,25 @@ use Friendica\DI;
 
 class ItemContent
 {
-	public static function getURIIdListBySearch(string $search, int $uid = 0, int $start = 0, int $limit = 100)
+	/**
+	 * Search posts for given content
+	 *
+	 * @param string $search
+	 * @param integer $uid
+	 * @param integer $start
+	 * @param integer $limit
+	 * @param integer $last_uriid
+	 * @return array
+	 */
+	public static function getURIIdListBySearch(string $search, int $uid = 0, int $start = 0, int $limit = 100, int $last_uriid = 0)
 	{
 		$condition = ["`uri-id` IN (SELECT `uri-id` FROM `item-content` WHERE MATCH (`title`, `content-warning`, `body`) AGAINST (? IN BOOLEAN MODE))
 			AND (NOT `private` OR (`private` AND `uid` = ?))", $search, $uid];
+
+		if (!empty($last_uriid)) {
+			$condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $last_uriid]);
+		}
+
 		$params = [
 			'order' => ['uri-id' => true],
 			'group_by' => ['uri-id'],

src/Model/Photo.php

@@ -31,7 +31,7 @@ use Friendica\Model\Storage\SystemResource;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
-use Friendica\Util\Security;
+use Friendica\Security\Security;
 use Friendica\Util\Strings;
 
 require_once "include/dba.php";

src/Model/Tag.php

@@ -462,11 +462,17 @@ class Tag
 	 * @param integer $uid
 	 * @param integer $start
 	 * @param integer $limit
+	 * @param integer $last_uriid
 	 * @return array with URI-ID
 	 */
-	public static function getURIIdListByTag(string $search, int $uid = 0, int $start = 0, int $limit = 100)
+	public static function getURIIdListByTag(string $search, int $uid = 0, int $start = 0, int $limit = 100, int $last_uriid = 0)
 	{
 		$condition = ["`name` = ? AND (NOT `private` OR (`private` AND `uid` = ?))", $search, $uid];
+
+		if (!empty($last_uriid)) {
+			$condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $last_uriid]);
+		}
+
 		$params = [
 			'order' => ['uri-id' => true],
 			'group_by' => ['uri-id'],

src/Module/Contact/Hovercard.php

@@ -49,6 +49,13 @@ class Hovercard extends BaseModule
 		// the real url (nurl)
 		if (strpos($contact_url, 'redir/') === 0) {
 			$cid = intval(substr($contact_url, 6));
+		}
+
+		if (strpos($contact_url, 'contact/') === 0) {
+			$cid = intval(substr($contact_url, 8));
+		}
+
+		if (!empty($cid)) {			
 			$remote_contact = Contact::selectFirst(['nurl'], ['id' => $cid]);
 			$contact_url = $remote_contact['nurl'] ?? '';
 		}

src/Module/Profile/Status.php

@@ -36,7 +36,7 @@ use Friendica\Module\BaseProfile;
 use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Security;
+use Friendica\Security\Security;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 

src/Module/Search/Index.php

@@ -155,15 +155,17 @@ class Index extends BaseSearch
 				DI::config()->get('system', 'itemspage_network'));
 		}
 
+		$last_uriid = isset($_GET['last_uriid']) ? intval($_GET['last_uriid']) : 0;
+Logger::info('Blubb', ['uri' => $last_uriid]);
 		$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
 		if ($tag) {
 			Logger::info('Start tag search.', ['q' => $search]);
-			$uriids = Tag::getURIIdListByTag($search, local_user(), $pager->getStart(), $pager->getItemsPerPage());
+			$uriids = Tag::getURIIdListByTag($search, local_user(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid);
 			$count = Tag::countByTag($search, local_user());
 		} else {
 			Logger::info('Start fulltext search.', ['q' => $search]);
-			$uriids = ItemContent::getURIIdListBySearch($search, local_user(), $pager->getStart(), $pager->getItemsPerPage());
+			$uriids = ItemContent::getURIIdListBySearch($search, local_user(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid);
 			$count = ItemContent::countBySearch($search, local_user());
 		}
 
@@ -177,6 +179,11 @@ class Index extends BaseSearch
 			return $o;
 		}
 
+		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+			$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
+			$o .= Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]);
+		}
+
 		if ($tag) {
 			$title = DI::l10n()->t('Items tagged with: %s', $search);
 		} else {
@@ -191,7 +198,12 @@ class Index extends BaseSearch
 
 		$o .= conversation(DI::app(), $items, 'search', false, false, 'commented', local_user());
 
+		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+			$o .= HTML::scrollLoader();
+		} else {
 			$o .= $pager->renderMinimal($count);
+		}
+
 
 		return $o;
 	}

src/Module/Settings/Display.php

@@ -53,6 +53,7 @@ class Display extends BaseSettings
 		$no_smart_threading = !empty($_POST['no_smart_threading']) ? intval($_POST['no_smart_threading']) : 0;
 		$hide_dislike       = !empty($_POST['hide_dislike'])       ? intval($_POST['hide_dislike'])       : 0;
 		$display_resharer   = !empty($_POST['display_resharer'])   ? intval($_POST['display_resharer'])   : 0;
+		$stay_local         = !empty($_POST['stay_local'])         ? intval($_POST['stay_local'])         : 0;
 		$browser_update     = !empty($_POST['browser_update'])     ? intval($_POST['browser_update'])     : 0;
 		if ($browser_update != -1) {
 			$browser_update = $browser_update * 1000;
@@ -87,6 +88,7 @@ class Display extends BaseSettings
 		DI::pConfig()->set(local_user(), 'system', 'no_smart_threading'      , $no_smart_threading);
 		DI::pConfig()->set(local_user(), 'system', 'hide_dislike'            , $hide_dislike);
 		DI::pConfig()->set(local_user(), 'system', 'display_resharer'        , $display_resharer);
+		DI::pConfig()->set(local_user(), 'system', 'stay_local'              , $stay_local);
 		DI::pConfig()->set(local_user(), 'system', 'first_day_of_week'       , $first_day_of_week);
 
 		if (in_array($theme, Theme::getAllowedList())) {
@@ -169,6 +171,8 @@ class Display extends BaseSettings
 		$no_smart_threading = DI::pConfig()->get(local_user(), 'system', 'no_smart_threading', 0);
 		$hide_dislike       = DI::pConfig()->get(local_user(), 'system', 'hide_dislike', 0);
 		$display_resharer   = DI::pConfig()->get(local_user(), 'system', 'display_resharer', 0);
+		$stay_local         = DI::pConfig()->get(local_user(), 'system', 'stay_local', 0);
+
 
 		$first_day_of_week = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0);
 		$weekdays = [0 => DI::l10n()->t("Sunday"), 1 => DI::l10n()->t("Monday")];
@@ -206,6 +210,7 @@ class Display extends BaseSettings
 			'$no_smart_threading'       => ['no_smart_threading'      , DI::l10n()->t('Disable Smart Threading'), $no_smart_threading, DI::l10n()->t('Disable the automatic suppression of extraneous thread indentation.')],
 			'$hide_dislike'             => ['hide_dislike'            , DI::l10n()->t('Hide the Dislike feature'), $hide_dislike, DI::l10n()->t('Hides the Dislike button and dislike reactions on posts and comments.')],
 			'$display_resharer'         => ['display_resharer'        , DI::l10n()->t('Display the resharer'), $display_resharer, DI::l10n()->t('Display the first resharer as icon and text on a reshared item.')],
+			'$stay_local'               => ['stay_local'              , DI::l10n()->t('Stay local'), $stay_local, DI::l10n()->t("Don't go to a remote system when following a contact link.")],
 
 			'$first_day_of_week' => ['first_day_of_week', DI::l10n()->t('Beginning of week:'), $first_day_of_week, '', $weekdays, false],
 		]);

src/Object/Thread.php

@@ -25,7 +25,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\DI;
 use Friendica\Protocol\Activity;
-use Friendica\Util\Security;
+use Friendica\Security\Security;
 
 /**
  * A list of threads

src/Security/Authentication.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\App;
+namespace Friendica\Security;
 
 use Exception;
 use Friendica\App;
@@ -41,7 +41,7 @@ use Friendica\Core\L10n;
 use Psr\Log\LoggerInterface;
 
 /**
- * Handle Authentification, Session and Cookies
+ * Handle Authentication, Session and Cookies
  */
 class Authentication
 {
@@ -374,7 +374,7 @@ class Authentication
 			 * that expires after one week (the default is when the browser is closed).
 			 * The cookie will be renewed automatically.
 			 * The week ensures that sessions will expire after some inactivity.
-			 */;
+			 */
 			if ($this->session->get('remember')) {
 				$this->logger->info('Injecting cookie for remembered user ' . $user_record['nickname']);
 				$this->cookie->set($user_record['uid'], $user_record['password'], $user_record['prvkey']);

src/Security/ExAuth.php

@@ -32,7 +32,7 @@
  *
  */
 
-namespace Friendica\Util;
+namespace Friendica\Security;
 
 use Exception;
 use Friendica\App;
@@ -42,6 +42,7 @@ use Friendica\Database\Database;
 use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
+use Friendica\Util\PidFile;
 
 class ExAuth
 {

src/Security/FKOAuth1.php

@@ -19,14 +19,14 @@
  *
  */
 
-namespace Friendica\Network;
+namespace Friendica\Security;
 
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use OAuthServer;
+use Friendica\Security\OAuth1\OAuthServer;
-use OAuthSignatureMethod_HMAC_SHA1;
+use Friendica\Security\OAuth1\Signature\OAuthSignatureMethod_HMAC_SHA1;
-use OAuthSignatureMethod_PLAINTEXT;
+use Friendica\Security\OAuth1\Signature\OAuthSignatureMethod_PLAINTEXT;
 
 /**
  * OAuth protocol

src/Security/FKOAuthDataStore.php

@@ -19,21 +19,21 @@
  *
  */
 
-namespace Friendica\Network;
+namespace Friendica\Security;
 
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Strings;
-use OAuthConsumer;
+use Friendica\Security\OAuth1\OAuthConsumer;
-use OAuthDataStore;
+use Friendica\Security\OAuth1\OAuthDataStore;
-use OAuthToken;
+use Friendica\Security\OAuth1\OAuthToken;
 
 define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
 
 /**
- * OAuthDataStore class
+ * Friendica\Security\OAuth1\OAuthDataStore class
  */
 class FKOAuthDataStore extends OAuthDataStore
 {

src/Security/OAuth1/OAuthConsumer.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Friendica\Security\OAuth1;
+
+class OAuthConsumer
+{
+	public $key;
+	public $secret;
+	public $callback_url;
+
+	function __construct($key, $secret, $callback_url = null)
+	{
+		$this->key          = $key;
+		$this->secret       = $secret;
+		$this->callback_url = $callback_url;
+	}
+
+	function __toString()
+	{
+		return "OAuthConsumer[key=$this->key,secret=$this->secret]";
+	}
+}

src/Security/OAuth1/OAuthDataStore.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Friendica\Security\OAuth1;
+
+class OAuthDataStore
+{
+	function lookup_consumer($consumer_key)
+	{
+		// implement me
+	}
+
+	function lookup_token(OAuthConsumer $consumer, $token_type, $token_id)
+	{
+		// implement me
+	}
+
+	function lookup_nonce(OAuthConsumer $consumer, OAuthToken $token, $nonce, int $timestamp)
+	{
+		// implement me
+	}
+
+	function new_request_token(OAuthConsumer $consumer, $callback = null)
+	{
+		// return a new token attached to this consumer
+	}
+
+	function new_access_token(OAuthToken $token, OAuthConsumer $consumer, $verifier = null)
+	{
+		// return a new access token attached to this consumer
+		// for the user associated with this token if the request token
+		// is authorized
+		// should also invalidate the request token
+	}
+}

src/Security/OAuth1/OAuthException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Friendica\Security\OAuth1;
+
+use Exception;
+
+class OAuthException extends Exception
+{
+}

src/Security/OAuth1/OAuthRequest.php

@@ -0,0 +1,318 @@
+<?php
+
+namespace Friendica\Security\OAuth1;
+
+use Friendica\Util\Strings;
+
+class OAuthRequest
+{
+	private $parameters;
+	private $http_method;
+	private $http_url;
+	// for debug purposes
+	public $base_string;
+	public static $version = '1.0';
+	public static $POST_INPUT = 'php://input';
+
+	function __construct($http_method, $http_url, $parameters = null)
+	{
+		@$parameters or $parameters = [];
+		$parameters        = array_merge(OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
+		$this->parameters  = $parameters;
+		$this->http_method = $http_method;
+		$this->http_url    = $http_url;
+	}
+
+
+	/**
+	 * attempt to build up a request from what was passed to the server
+	 *
+	 * @param string|null $http_method
+	 * @param string|null $http_url
+	 * @param string|null $parameters
+	 *
+	 * @return OAuthRequest
+	 */
+	public static function from_request($http_method = null, $http_url = null, $parameters = null)
+	{
+		$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
+			? 'http'
+			: 'https';
+		@$http_url or $http_url = $scheme .
+								  '://' . $_SERVER['HTTP_HOST'] .
+								  ':' .
+								  $_SERVER['SERVER_PORT'] .
+								  $_SERVER['REQUEST_URI'];
+		@$http_method or $http_method = $_SERVER['REQUEST_METHOD'];
+
+		// We weren't handed any parameters, so let's find the ones relevant to
+		// this request.
+		// If you run XML-RPC or similar you should use this to provide your own
+		// parsed parameter-list
+		if (!$parameters) {
+			// Find request headers
+			$request_headers = OAuthUtil::get_headers();
+
+			// Parse the query-string to find GET parameters
+			$parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']);
+
+			// It's a POST request of the proper content-type, so parse POST
+			// parameters and add those overriding any duplicates from GET
+			if (
+				$http_method == "POST"
+				&& @strstr(
+					$request_headers["Content-Type"],
+					"application/x-www-form-urlencoded"
+				)
+			) {
+				$post_data  = OAuthUtil::parse_parameters(
+					file_get_contents(self::$POST_INPUT)
+				);
+				$parameters = array_merge($parameters, $post_data);
+			}
+
+			// We have a Authorization-header with OAuth data. Parse the header
+			// and add those overriding any duplicates from GET or POST
+			if (@substr($request_headers['Authorization'], 0, 6) == "OAuth ") {
+				$header_parameters = OAuthUtil::split_header(
+					$request_headers['Authorization']
+				);
+				$parameters        = array_merge($parameters, $header_parameters);
+			}
+		}
+		// fix for friendica redirect system
+
+		$http_url = substr($http_url, 0, strpos($http_url, $parameters['pagename']) + strlen($parameters['pagename']));
+		unset($parameters['pagename']);
+
+		return new OAuthRequest($http_method, $http_url, $parameters);
+	}
+
+	/**
+	 * pretty much a helper function to set up the request
+	 *
+	 * @param OAuthConsumer $consumer
+	 * @param OAuthToken    $token
+	 * @param string        $http_method
+	 * @param string        $http_url
+	 * @param array|null    $parameters
+	 *
+	 * @return OAuthRequest
+	 */
+	public static function from_consumer_and_token(OAuthConsumer $consumer, $http_method, $http_url, array $parameters = null, OAuthToken $token = null)
+	{
+		@$parameters or $parameters = [];
+		$defaults = [
+			"oauth_version"      => OAuthRequest::$version,
+			"oauth_nonce"        => OAuthRequest::generate_nonce(),
+			"oauth_timestamp"    => OAuthRequest::generate_timestamp(),
+			"oauth_consumer_key" => $consumer->key,
+		];
+		if ($token)
+			$defaults['oauth_token'] = $token->key;
+
+		$parameters = array_merge($defaults, $parameters);
+
+		return new OAuthRequest($http_method, $http_url, $parameters);
+	}
+
+	public function set_parameter($name, $value, $allow_duplicates = true)
+	{
+		if ($allow_duplicates && isset($this->parameters[$name])) {
+			// We have already added parameter(s) with this name, so add to the list
+			if (is_scalar($this->parameters[$name])) {
+				// This is the first duplicate, so transform scalar (string)
+				// into an array so we can add the duplicates
+				$this->parameters[$name] = [$this->parameters[$name]];
+			}
+
+			$this->parameters[$name][] = $value;
+		} else {
+			$this->parameters[$name] = $value;
+		}
+	}
+
+	public function get_parameter($name)
+	{
+		return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
+	}
+
+	public function get_parameters()
+	{
+		return $this->parameters;
+	}
+
+	public function unset_parameter($name)
+	{
+		unset($this->parameters[$name]);
+	}
+
+	/**
+	 * The request parameters, sorted and concatenated into a normalized string.
+	 *
+	 * @return string
+	 */
+	public function get_signable_parameters()
+	{
+		// Grab all parameters
+		$params = $this->parameters;
+
+		// Remove oauth_signature if present
+		// Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.")
+		if (isset($params['oauth_signature'])) {
+			unset($params['oauth_signature']);
+		}
+
+		return OAuthUtil::build_http_query($params);
+	}
+
+	/**
+	 * Returns the base string of this request
+	 *
+	 * The base string defined as the method, the url
+	 * and the parameters (normalized), each urlencoded
+	 * and the concated with &.
+	 */
+	public function get_signature_base_string()
+	{
+		$parts = [
+			$this->get_normalized_http_method(),
+			$this->get_normalized_http_url(),
+			$this->get_signable_parameters(),
+		];
+
+		$parts = OAuthUtil::urlencode_rfc3986($parts);
+
+		return implode('&', $parts);
+	}
+
+	/**
+	 * just uppercases the http method
+	 */
+	public function get_normalized_http_method()
+	{
+		return strtoupper($this->http_method);
+	}
+
+	/**
+	 * parses the url and rebuilds it to be
+	 * scheme://host/path
+	 */
+	public function get_normalized_http_url()
+	{
+		$parts = parse_url($this->http_url);
+
+		$port   = @$parts['port'];
+		$scheme = $parts['scheme'];
+		$host   = $parts['host'];
+		$path   = @$parts['path'];
+
+		$port or $port = ($scheme == 'https') ? '443' : '80';
+
+		if (($scheme == 'https' && $port != '443')
+			|| ($scheme == 'http' && $port != '80')
+		) {
+			$host = "$host:$port";
+		}
+		return "$scheme://$host$path";
+	}
+
+	/**
+	 * builds a url usable for a GET request
+	 */
+	public function to_url()
+	{
+		$post_data = $this->to_postdata();
+		$out       = $this->get_normalized_http_url();
+		if ($post_data) {
+			$out .= '?' . $post_data;
+		}
+		return $out;
+	}
+
+	/**
+	 * builds the data one would send in a POST request
+	 *
+	 * @param bool $raw
+	 *
+	 * @return array|string
+	 */
+	public function to_postdata(bool $raw = false)
+	{
+		if ($raw)
+			return $this->parameters;
+		else
+			return OAuthUtil::build_http_query($this->parameters);
+	}
+
+	/**
+	 * builds the Authorization: header
+	 *
+	 * @param string|null $realm
+	 *
+	 * @return string
+	 * @throws OAuthException
+	 */
+	public function to_header($realm = null)
+	{
+		$first = true;
+		if ($realm) {
+			$out   = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
+			$first = false;
+		} else
+			$out = 'Authorization: OAuth';
+
+		foreach ($this->parameters as $k => $v) {
+			if (substr($k, 0, 5) != "oauth") continue;
+			if (is_array($v)) {
+				throw new OAuthException('Arrays not supported in headers');
+			}
+			$out   .= ($first) ? ' ' : ',';
+			$out   .= OAuthUtil::urlencode_rfc3986($k) .
+					  '="' .
+					  OAuthUtil::urlencode_rfc3986($v) .
+					  '"';
+			$first = false;
+		}
+		return $out;
+	}
+
+	public function __toString()
+	{
+		return $this->to_url();
+	}
+
+
+	public function sign_request(Signature\OAuthSignatureMethod $signature_method, $consumer, $token)
+	{
+		$this->set_parameter(
+			"oauth_signature_method",
+			$signature_method->get_name(),
+			false
+		);
+		$signature = $this->build_signature($signature_method, $consumer, $token);
+		$this->set_parameter("oauth_signature", $signature, false);
+	}
+
+	public function build_signature(Signature\OAuthSignatureMethod $signature_method, $consumer, $token)
+	{
+		$signature = $signature_method->build_signature($this, $consumer, $token);
+		return $signature;
+	}
+
+	/**
+	 * util function: current timestamp
+	 */
+	private static function generate_timestamp()
+	{
+		return time();
+	}
+
+	/**
+	 * util function: current nonce
+	 */
+	private static function generate_nonce()
+	{
+		return Strings::getRandomHex(32);
+	}
+}

src/Security/OAuth1/OAuthServer.php

@@ -0,0 +1,290 @@
+<?php
+
+namespace Friendica\Security\OAuth1;
+
+use Friendica\Security\FKOAuthDataStore;
+use Friendica\Security\OAuth1\Signature;
+
+class OAuthServer
+{
+	protected $timestamp_threshold = 300; // in seconds, five minutes
+	protected $version = '1.0';             // hi blaine
+	/** @var Signature\OAuthSignatureMethod[] */
+	protected $signature_methods = [];
+
+	/** @var FKOAuthDataStore */
+	protected $data_store;
+
+	function __construct(FKOAuthDataStore $data_store)
+	{
+		$this->data_store = $data_store;
+	}
+
+	public function add_signature_method(Signature\OAuthSignatureMethod $signature_method)
+	{
+		$this->signature_methods[$signature_method->get_name()] =
+			$signature_method;
+	}
+
+	// high level functions
+
+	/**
+	 * process a request_token request
+	 * returns the request token on success
+	 *
+	 * @param OAuthRequest $request
+	 *
+	 * @return OAuthToken|null
+	 * @throws OAuthException
+	 */
+	public function fetch_request_token(OAuthRequest $request)
+	{
+		$this->get_version($request);
+
+		$consumer = $this->get_consumer($request);
+
+		// no token required for the initial token request
+		$token = null;
+
+		$this->check_signature($request, $consumer, $token);
+
+		// Rev A change
+		$callback  = $request->get_parameter('oauth_callback');
+		$new_token = $this->data_store->new_request_token($consumer, $callback);
+
+		return $new_token;
+	}
+
+	/**
+	 * process an access_token request
+	 * returns the access token on success
+	 *
+	 * @param OAuthRequest $request
+	 *
+	 * @return object
+	 * @throws OAuthException
+	 */
+	public function fetch_access_token(OAuthRequest $request)
+	{
+		$this->get_version($request);
+
+		$consumer = $this->get_consumer($request);
+
+		// requires authorized request token
+		$token = $this->get_token($request, $consumer, "request");
+
+		$this->check_signature($request, $consumer, $token);
+
+		// Rev A change
+		$verifier  = $request->get_parameter('oauth_verifier');
+		$new_token = $this->data_store->new_access_token($token, $consumer, $verifier);
+
+		return $new_token;
+	}
+
+	/**
+	 * verify an api call, checks all the parameters
+	 *
+	 * @param OAuthRequest $request
+	 *
+	 * @return array
+	 * @throws OAuthException
+	 */
+	public function verify_request(OAuthRequest $request)
+	{
+		$this->get_version($request);
+		$consumer = $this->get_consumer($request);
+		$token    = $this->get_token($request, $consumer, "access");
+		$this->check_signature($request, $consumer, $token);
+		return [$consumer, $token];
+	}
+
+	// Internals from here
+
+	/**
+	 * version 1
+	 *
+	 * @param OAuthRequest $request
+	 *
+	 * @return string
+	 * @throws OAuthException
+	 */
+	private function get_version(OAuthRequest $request)
+	{
+		$version = $request->get_parameter("oauth_version");
+		if (!$version) {
+			// Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present.
+			// Chapter 7.0 ("Accessing Protected Ressources")
+			$version = '1.0';
+		}
+		if ($version !== $this->version) {
+			throw new OAuthException("OAuth version '$version' not supported");
+		}
+		return $version;
+	}
+
+	/**
+	 * figure out the signature with some defaults
+	 *
+	 * @param OAuthRequest $request
+	 *
+	 * @return Signature\OAuthSignatureMethod
+	 * @throws OAuthException
+	 */
+	private function get_signature_method(OAuthRequest $request)
+	{
+		$signature_method =
+			@$request->get_parameter("oauth_signature_method");
+
+		if (!$signature_method) {
+			// According to chapter 7 ("Accessing Protected Ressources") the signature-method
+			// parameter is required, and we can't just fallback to PLAINTEXT
+			throw new OAuthException('No signature method parameter. This parameter is required');
+		}
+
+		if (!in_array(
+			$signature_method,
+			array_keys($this->signature_methods)
+		)) {
+			throw new OAuthException(
+				"Signature method '$signature_method' not supported " .
+				"try one of the following: " .
+				implode(", ", array_keys($this->signature_methods))
+			);
+		}
+		return $this->signature_methods[$signature_method];
+	}
+
+	/**
+	 * try to find the consumer for the provided request's consumer key
+	 *
+	 * @param OAuthRequest $request
+	 *
+	 * @return OAuthConsumer
+	 * @throws OAuthException
+	 */
+	private function get_consumer(OAuthRequest $request)
+	{
+		$consumer_key = @$request->get_parameter("oauth_consumer_key");
+		if (!$consumer_key) {
+			throw new OAuthException("Invalid consumer key");
+		}
+
+		$consumer = $this->data_store->lookup_consumer($consumer_key);
+		if (!$consumer) {
+			throw new OAuthException("Invalid consumer");
+		}
+
+		return $consumer;
+	}
+
+	/**
+	 * try to find the token for the provided request's token key
+	 *
+	 * @param OAuthRequest                            $request
+	 * @param                                         $consumer
+	 * @param string                                  $token_type
+	 *
+	 * @return OAuthToken|null
+	 * @throws OAuthException
+	 */
+	private function get_token(OAuthRequest &$request, $consumer, $token_type = "access")
+	{
+		$token_field = @$request->get_parameter('oauth_token');
+		$token       = $this->data_store->lookup_token(
+			$consumer,
+			$token_type,
+			$token_field
+		);
+		if (!$token) {
+			throw new OAuthException("Invalid $token_type token: $token_field");
+		}
+		return $token;
+	}
+
+	/**
+	 * all-in-one function to check the signature on a request
+	 * should guess the signature method appropriately
+	 *
+	 * @param OAuthRequest    $request
+	 * @param OAuthConsumer   $consumer
+	 * @param OAuthToken|null $token
+	 *
+	 * @throws OAuthException
+	 */
+	private function check_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token = null)
+	{
+		// this should probably be in a different method
+		$timestamp = @$request->get_parameter('oauth_timestamp');
+		$nonce     = @$request->get_parameter('oauth_nonce');
+
+		$this->check_timestamp($timestamp);
+		$this->check_nonce($consumer, $token, $nonce, $timestamp);
+
+		$signature_method = $this->get_signature_method($request);
+
+		$signature = $request->get_parameter('oauth_signature');
+		$valid_sig = $signature_method->check_signature(
+			$request,
+			$consumer,
+			$signature,
+			$token
+		);
+
+		if (!$valid_sig) {
+			throw new OAuthException("Invalid signature");
+		}
+	}
+
+	/**
+	 * check that the timestamp is new enough
+	 *
+	 * @param int $timestamp
+	 *
+	 * @throws OAuthException
+	 */
+	private function check_timestamp($timestamp)
+	{
+		if (!$timestamp)
+			throw new OAuthException(
+				'Missing timestamp parameter. The parameter is required'
+			);
+
+		// verify that timestamp is recentish
+		$now = time();
+		if (abs($now - $timestamp) > $this->timestamp_threshold) {
+			throw new OAuthException(
+				"Expired timestamp, yours $timestamp, ours $now"
+			);
+		}
+	}
+
+	/**
+	 * check that the nonce is not repeated
+	 *
+	 * @param OAuthConsumer $consumer
+	 * @param OAuthToken    $token
+	 * @param string        $nonce
+	 * @param int           $timestamp
+	 *
+	 * @throws OAuthException
+	 */
+	private function check_nonce(OAuthConsumer $consumer, OAuthToken $token, $nonce, int $timestamp)
+	{
+		if (!$nonce)
+			throw new OAuthException(
+				'Missing nonce parameter. The parameter is required'
+			);
+
+		// verify that the nonce is uniqueish
+		$found = $this->data_store->lookup_nonce(
+			$consumer,
+			$token,
+			$nonce,
+			$timestamp
+		);
+		if ($found) {
+			throw new OAuthException("Nonce already used: $nonce");
+		}
+	}
+}

src/Security/OAuth1/OAuthToken.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Friendica\Security\OAuth1;
+
+class OAuthToken
+{
+	// access tokens and request tokens
+	public $key;
+	public $secret;
+
+	public $expires;
+	public $scope;
+	public $uid;
+
+	/**
+	 * key = the token
+	 * secret = the token secret
+	 *
+	 * @param $key
+	 * @param $secret
+	 */
+	function __construct($key, $secret)
+	{
+		$this->key    = $key;
+		$this->secret = $secret;
+	}
+
+	/**
+	 * generates the basic string serialization of a token that a server
+	 * would respond to request_token and access_token calls with
+	 */
+	function to_string()
+	{
+		return "oauth_token=" .
+			   OAuthUtil::urlencode_rfc3986($this->key) .
+			   "&oauth_token_secret=" .
+			   OAuthUtil::urlencode_rfc3986($this->secret);
+	}
+
+	function __toString()
+	{
+		return $this->to_string();
+	}
+}

src/Security/OAuth1/OAuthUtil.php

@@ -0,0 +1,166 @@
+<?php
+
+namespace Friendica\Security\OAuth1;
+
+class OAuthUtil
+{
+	public static function urlencode_rfc3986($input)
+	{
+		if (is_array($input)) {
+			return array_map(['Friendica\Security\OAuth1\OAuthUtil', 'urlencode_rfc3986'], $input);
+		} else if (is_scalar($input)) {
+			return str_replace(
+				'+',
+				' ',
+				str_replace('%7E', '~', rawurlencode($input))
+			);
+		} else {
+			return '';
+		}
+	}
+
+
+	// This decode function isn't taking into consideration the above
+	// modifications to the encoding process. However, this method doesn't
+	// seem to be used anywhere so leaving it as is.
+	public static function urldecode_rfc3986($string)
+	{
+		return urldecode($string);
+	}
+
+	// Utility function for turning the Authorization: header into
+	// parameters, has to do some unescaping
+	// Can filter out any non-oauth parameters if needed (default behaviour)
+	public static function split_header($header, $only_allow_oauth_parameters = true)
+	{
+		$pattern = '/(([-_a-z]*)=("([^"]*)"|([^,]*)),?)/';
+		$offset  = 0;
+		$params  = [];
+		while (preg_match($pattern, $header, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
+			$match          = $matches[0];
+			$header_name    = $matches[2][0];
+			$header_content = (isset($matches[5])) ? $matches[5][0] : $matches[4][0];
+			if (preg_match('/^oauth_/', $header_name) || !$only_allow_oauth_parameters) {
+				$params[$header_name] = OAuthUtil::urldecode_rfc3986($header_content);
+			}
+			$offset = $match[1] + strlen($match[0]);
+		}
+
+		if (isset($params['realm'])) {
+			unset($params['realm']);
+		}
+
+		return $params;
+	}
+
+	// helper to try to sort out headers for people who aren't running apache
+	public static function get_headers()
+	{
+		if (function_exists('apache_request_headers')) {
+			// we need this to get the actual Authorization: header
+			// because apache tends to tell us it doesn't exist
+			$headers = apache_request_headers();
+
+			// sanitize the output of apache_request_headers because
+			// we always want the keys to be Cased-Like-This and arh()
+			// returns the headers in the same case as they are in the
+			// request
+			$out = [];
+			foreach ($headers as $key => $value) {
+				$key       = str_replace(
+					" ",
+					"-",
+					ucwords(strtolower(str_replace("-", " ", $key)))
+				);
+				$out[$key] = $value;
+			}
+		} else {
+			// otherwise we don't have apache and are just going to have to hope
+			// that $_SERVER actually contains what we need
+			$out = [];
+			if (isset($_SERVER['CONTENT_TYPE']))
+				$out['Content-Type'] = $_SERVER['CONTENT_TYPE'];
+			if (isset($_ENV['CONTENT_TYPE']))
+				$out['Content-Type'] = $_ENV['CONTENT_TYPE'];
+
+			foreach ($_SERVER as $key => $value) {
+				if (substr($key, 0, 5) == "HTTP_") {
+					// this is chaos, basically it is just there to capitalize the first
+					// letter of every word that is not an initial HTTP and strip HTTP
+					// code from przemek
+					$key       = str_replace(
+						" ",
+						"-",
+						ucwords(strtolower(str_replace("_", " ", substr($key, 5))))
+					);
+					$out[$key] = $value;
+				}
+			}
+		}
+		return $out;
+	}
+
+	// This function takes a input like a=b&a=c&d=e and returns the parsed
+	// parameters like this
+	// array('a' => array('b','c'), 'd' => 'e')
+	public static function parse_parameters($input)
+	{
+		if (!isset($input) || !$input) return [];
+
+		$pairs = explode('&', $input);
+
+		$parsed_parameters = [];
+		foreach ($pairs as $pair) {
+			$split     = explode('=', $pair, 2);
+			$parameter = OAuthUtil::urldecode_rfc3986($split[0]);
+			$value     = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : '';
+
+			if (isset($parsed_parameters[$parameter])) {
+				// We have already recieved parameter(s) with this name, so add to the list
+				// of parameters with this name
+
+				if (is_scalar($parsed_parameters[$parameter])) {
+					// This is the first duplicate, so transform scalar (string) into an array
+					// so we can add the duplicates
+					$parsed_parameters[$parameter] = [$parsed_parameters[$parameter]];
+				}
+
+				$parsed_parameters[$parameter][] = $value;
+			} else {
+				$parsed_parameters[$parameter] = $value;
+			}
+		}
+		return $parsed_parameters;
+	}
+
+	public static function build_http_query($params)
+	{
+		if (!$params) return '';
+
+		// Urlencode both keys and values
+		$keys   = OAuthUtil::urlencode_rfc3986(array_keys($params));
+		$values = OAuthUtil::urlencode_rfc3986(array_values($params));
+		$params = array_combine($keys, $values);
+
+		// Parameters are sorted by name, using lexicographical byte value ordering.
+		// Ref: Spec: 9.1.1 (1)
+		uksort($params, 'strcmp');
+
+		$pairs = [];
+		foreach ($params as $parameter => $value) {
+			if (is_array($value)) {
+				// If two or more parameters share the same name, they are sorted by their value
+				// Ref: Spec: 9.1.1 (1)
+				natsort($value);
+				foreach ($value as $duplicate_value) {
+					$pairs[] = $parameter . '=' . $duplicate_value;
+				}
+			} else {
+				$pairs[] = $parameter . '=' . $value;
+			}
+		}
+		// For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61)
+		// Each name-value pair is separated by an '&' character (ASCII code 38)
+		return implode('&', $pairs);
+	}
+}

src/Security/OAuth1/README.md

@@ -0,0 +1 @@
+This namespace contains the OAuth1 library for server and client usages  

src/Security/OAuth1/Signature/OAuthSignatureMethod.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Friendica\Security\OAuth1\Signature;
+
+use Friendica\Security\OAuth1\OAuthRequest;
+
+/**
+ * A class for implementing a Signature Method
+ * See section 9 ("Signing Requests") in the spec
+ */
+abstract class OAuthSignatureMethod
+{
+	/**
+	 * Needs to return the name of the Signature Method (ie HMAC-SHA1)
+	 *
+	 * @return string
+	 */
+	abstract public function get_name();
+
+	/**
+	 * Build up the signature
+	 * NOTE: The output of this function MUST NOT be urlencoded.
+	 * the encoding is handled in OAuthRequest when the final
+	 * request is serialized
+	 *
+	 * @param OAuthRequest                             $request
+	 * @param \Friendica\Security\OAuth1\OAuthConsumer $consumer
+	 * @param \Friendica\Security\OAuth1\OAuthToken    $token
+	 *
+	 * @return string
+	 */
+	abstract public function build_signature(OAuthRequest $request, \Friendica\Security\OAuth1\OAuthConsumer $consumer, \Friendica\Security\OAuth1\OAuthToken $token = null);
+
+	/**
+	 * Verifies that a given signature is correct
+	 *
+	 * @param OAuthRequest                             $request
+	 * @param \Friendica\Security\OAuth1\OAuthConsumer $consumer
+	 * @param \Friendica\Security\OAuth1\OAuthToken    $token
+	 * @param string                                   $signature
+	 *
+	 * @return bool
+	 */
+	public function check_signature(OAuthRequest $request, \Friendica\Security\OAuth1\OAuthConsumer $consumer, $signature, \Friendica\Security\OAuth1\OAuthToken $token = null)
+	{
+		$built = $this->build_signature($request, $consumer, $token);
+		return ($built == $signature);
+	}
+}

src/Security/OAuth1/Signature/OAuthSignatureMethod_HMAC_SHA1.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Friendica\Security\OAuth1\Signature;
+
+use Friendica\Security\OAuth1\OAuthRequest;
+use Friendica\Security\OAuth1\OAuthUtil;
+
+/**
+ * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104]
+ * where the Signature Base String is the text and the key is the concatenated values (each first
+ * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&'
+ * character (ASCII code 38) even if empty.
+ *   - Chapter 9.2 ("HMAC-SHA1")
+ */
+class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod
+{
+	function get_name()
+	{
+		return "HMAC-SHA1";
+	}
+
+	/**
+	 * @param OAuthRequest                             $request
+	 * @param \Friendica\Security\OAuth1\OAuthConsumer $consumer
+	 * @param \Friendica\Security\OAuth1\OAuthToken    $token
+	 *
+	 * @return string
+	 */
+	public function build_signature(OAuthRequest $request, \Friendica\Security\OAuth1\OAuthConsumer $consumer, \Friendica\Security\OAuth1\OAuthToken $token = null)
+	{
+		$base_string          = $request->get_signature_base_string();
+		$request->base_string = $base_string;
+
+		$key_parts = [
+			$consumer->secret,
+			($token) ? $token->secret : "",
+		];
+
+		$key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
+		$key       = implode('&', $key_parts);
+
+
+		$r = base64_encode(hash_hmac('sha1', $base_string, $key, true));
+		return $r;
+	}
+}

src/Security/OAuth1/Signature/OAuthSignatureMethod_PLAINTEXT.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Friendica\Security\OAuth1\Signature;
+
+use Friendica\Security\OAuth1\OAuthRequest;
+use Friendica\Security\OAuth1\OAuthUtil;
+
+/**
+ * The PLAINTEXT method does not provide any security protection and SHOULD only be used
+ * over a secure channel such as HTTPS. It does not use the Signature Base String.
+ *   - Chapter 9.4 ("PLAINTEXT")
+ */
+class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod
+{
+	public function get_name()
+	{
+		return "PLAINTEXT";
+	}
+
+	/**
+	 * oauth_signature is set to the concatenated encoded values of the Consumer Secret and
+	 * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is
+	 * empty. The result MUST be encoded again.
+	 *   - Chapter 9.4.1 ("Generating Signatures")
+	 *
+	 * Please note that the second encoding MUST NOT happen in the SignatureMethod, as
+	 * OAuthRequest handles this!
+	 *
+	 * @param $request
+	 * @param $consumer
+	 * @param $token
+	 *
+	 * @return string
+	 */
+	public function build_signature(OAuthRequest $request, \Friendica\Security\OAuth1\OAuthConsumer $consumer, \Friendica\Security\OAuth1\OAuthToken $token = null)
+	{
+		$key_parts = [
+			$consumer->secret,
+			($token) ? $token->secret : "",
+		];
+
+		$key_parts            = OAuthUtil::urlencode_rfc3986($key_parts);
+		$key                  = implode('&', $key_parts);
+		$request->base_string = $key;
+
+		return $key;
+	}
+}

src/Security/OAuth1/Signature/OAuthSignatureMethod_RSA_SHA1.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Friendica\Security\OAuth1\Signature;
+
+use Friendica\Security\OAuth1\OAuthRequest;
+
+/**
+ * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in
+ * [RFC3447] section 8.2 (more simply known as PKCS#1), using SHA-1 as the hash function for
+ * EMSA-PKCS1-v1_5. It is assumed that the Consumer has provided its RSA public key in a
+ * verified way to the Service Provider, in a manner which is beyond the scope of this
+ * specification.
+ *   - Chapter 9.3 ("RSA-SHA1")
+ */
+abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod
+{
+	public function get_name()
+	{
+		return "RSA-SHA1";
+	}
+
+	// Up to the SP to implement this lookup of keys. Possible ideas are:
+	// (1) do a lookup in a table of trusted certs keyed off of consumer
+	// (2) fetch via http using a url provided by the requester
+	// (3) some sort of specific discovery code based on request
+	//
+	// Either way should return a string representation of the certificate
+	protected abstract function fetch_public_cert(&$request);
+
+	// Up to the SP to implement this lookup of keys. Possible ideas are:
+	// (1) do a lookup in a table of trusted certs keyed off of consumer
+	//
+	// Either way should return a string representation of the certificate
+	protected abstract function fetch_private_cert(&$request);
+
+	public function build_signature(OAuthRequest $request, \Friendica\Security\OAuth1\OAuthConsumer $consumer, \Friendica\Security\OAuth1\OAuthToken $token = null)
+	{
+		$base_string          = $request->get_signature_base_string();
+		$request->base_string = $base_string;
+
+		// Fetch the private key cert based on the request
+		$cert = $this->fetch_private_cert($request);
+
+		// Pull the private key ID from the certificate
+		$privatekeyid = openssl_get_privatekey($cert);
+
+		// Sign using the key
+		openssl_sign($base_string, $signature, $privatekeyid);
+
+		// Release the key resource
+		openssl_free_key($privatekeyid);
+
+		return base64_encode($signature);
+	}
+
+	public function check_signature(OAuthRequest $request, \Friendica\Security\OAuth1\OAuthConsumer $consumer, $signature, \Friendica\Security\OAuth1\OAuthToken $token = null)
+	{
+		$decoded_sig = base64_decode($signature);
+
+		$base_string = $request->get_signature_base_string();
+
+		// Fetch the public key cert based on the request
+		$cert = $this->fetch_public_cert($request);
+
+		// Pull the public key ID from the certificate
+		$publickeyid = openssl_get_publickey($cert);
+
+		// Check the computed signature against the one passed in the query
+		$ok = openssl_verify($base_string, $decoded_sig, $publickeyid);
+
+		// Release the key resource
+		openssl_free_key($publickeyid);
+
+		return $ok == 1;
+	}
+}

src/Security/Security.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Util;
+namespace Friendica\Security;
 
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;

view/templates/search_item.tpl

@@ -1,5 +1,9 @@
 
 <a name="{{$item.id}}" ></a>
+<span class="commented" style="display: none;">{{$item.commented}}</span>
+<span class="received" style="display: none;">{{$item.received}}</span>
+<span class="created" style="display: none;">{{$item.created_date}}</span>
+<span class="uriid" style="display: none;">{{$item.uriid}}</span>
 <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">

view/templates/settings/display.tpl

@@ -19,6 +19,7 @@
 	{{include file="field_checkbox.tpl" field=$no_smart_threading}}
 	{{include file="field_checkbox.tpl" field=$hide_dislike}}
 	{{include file="field_checkbox.tpl" field=$display_resharer}}
+	{{include file="field_checkbox.tpl" field=$stay_local}}
 
 	<h2>{{$calendar_title}}</h2>
 	{{include file="field_select.tpl" field=$first_day_of_week}}

view/theme/frio/templates/search_item.tpl

@@ -7,6 +7,10 @@
 
 
 <div class="panel item-{{$item.id}}" id="item-{{$item.guid}}">
+	<span class="commented" style="display: none;">{{$item.commented}}</span>
+	<span class="received" style="display: none;">{{$item.received}}</span>
+	<span class="created" style="display: none;">{{$item.created_date}}</span>
+	<span class="uriid" style="display: none;">{{$item.uriid}}</span>
 	<div class="wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}" >
 		<div class="media">
 			{{* Put additional actions in a top-right dropdown menu *}}

view/theme/frio/templates/settings/display.tpl

@@ -66,6 +66,7 @@
 						{{include file="field_checkbox.tpl" field=$no_smart_threading}}
 						{{include file="field_checkbox.tpl" field=$hide_dislike}}
 						{{include file="field_checkbox.tpl" field=$display_resharer}}
+						{{include file="field_checkbox.tpl" field=$stay_local}}
 					</div>
 					<div class="panel-footer">
 						<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>

view/theme/quattro/templates/search_item.tpl

@@ -1,3 +1,7 @@
+<span class="commented" style="display: none;">{{$item.commented}}</span>
+<span class="received" style="display: none;">{{$item.received}}</span>
+<span class="created" style="display: none;">{{$item.created_date}}</span>
+<span class="uriid" style="display: none;">{{$item.uriid}}</span>
 <div class="wall-item-decor">
 	{{if $item.star}}<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>{{/if}}
 	{{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}

view/theme/smoothly/templates/search_item.tpl

@@ -1,5 +1,8 @@
-
 <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<span class="commented" style="display: none;">{{$item.commented}}</span>
+	<span class="received" style="display: none;">{{$item.received}}</span>
+	<span class="created" style="display: none;">{{$item.created_date}}</span>
+	<span class="uriid" style="display: none;">{{$item.uriid}}</span>
 	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
 			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-{{$item.id}}" 

view/theme/vier/templates/search_item.tpl

@@ -1,5 +1,7 @@
-
+<span class="commented" style="display: none;">{{$item.commented}}</span>
-
+<span class="received" style="display: none;">{{$item.received}}</span>
+<span class="created" style="display: none;">{{$item.created_date}}</span>
+<span class="uriid" style="display: none;">{{$item.uriid}}</span>
 <div class="wall-item-decor">
 	{{if $item.star}}<span class="icon star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>{{/if}}
 	{{if $item.lock}}<span class="icon lock fakelink" onclick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}