Merge pull request #9771 from annando/store-server-protocol
Store server protocol
This commit is contained in:
commit
251bd30d77
|
@ -1,6 +1,6 @@
|
||||||
-- ------------------------------------------
|
-- ------------------------------------------
|
||||||
-- Friendica 2020.12-rc (Red Hot Poker)
|
-- Friendica 2021.03-dev (Red Hot Poker)
|
||||||
-- DB_UPDATE_VERSION 1384
|
-- DB_UPDATE_VERSION 1385
|
||||||
-- ------------------------------------------
|
-- ------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
@ -20,6 +20,7 @@ CREATE TABLE IF NOT EXISTS `gserver` (
|
||||||
`poco` varchar(255) NOT NULL DEFAULT '' COMMENT '',
|
`poco` varchar(255) NOT NULL DEFAULT '' COMMENT '',
|
||||||
`noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '',
|
`noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '',
|
||||||
`network` char(4) NOT NULL DEFAULT '' COMMENT '',
|
`network` char(4) NOT NULL DEFAULT '' COMMENT '',
|
||||||
|
`protocol` tinyint unsigned COMMENT 'The protocol of the server',
|
||||||
`platform` varchar(255) NOT NULL DEFAULT '' COMMENT '',
|
`platform` varchar(255) NOT NULL DEFAULT '' COMMENT '',
|
||||||
`relay-subscribe` boolean NOT NULL DEFAULT '0' COMMENT 'Has the server subscribed to the relay system',
|
`relay-subscribe` boolean NOT NULL DEFAULT '0' COMMENT 'Has the server subscribed to the relay system',
|
||||||
`relay-scope` varchar(10) NOT NULL DEFAULT '' COMMENT 'The scope of messages that the server wants to get',
|
`relay-scope` varchar(10) NOT NULL DEFAULT '' COMMENT 'The scope of messages that the server wants to get',
|
||||||
|
|
|
@ -23,6 +23,7 @@ namespace Friendica\Model;
|
||||||
|
|
||||||
use DOMDocument;
|
use DOMDocument;
|
||||||
use DOMXPath;
|
use DOMXPath;
|
||||||
|
use Exception;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Protocol;
|
use Friendica\Core\Protocol;
|
||||||
use Friendica\Core\System;
|
use Friendica\Core\System;
|
||||||
|
@ -1734,4 +1735,86 @@ class GServer
|
||||||
|
|
||||||
DI::config()->set('poco', 'last_federation_discovery', time());
|
DI::config()->set('poco', 'last_federation_discovery', time());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the protocol for the given server
|
||||||
|
*
|
||||||
|
* @param int $gsid Server id
|
||||||
|
* @param int $protocol Protocol id
|
||||||
|
* @return void
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
public static function setProtocol(int $gsid, int $protocol)
|
||||||
|
{
|
||||||
|
if (empty($gsid)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$gserver = DBA::selectFirst('gserver', ['protocol', 'url'], ['id' => $gsid]);
|
||||||
|
if (!DBA::isResult($gserver)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$old = $gserver['protocol'];
|
||||||
|
|
||||||
|
if (!is_null($old)) {
|
||||||
|
/*
|
||||||
|
The priority for the protocols is:
|
||||||
|
1. ActivityPub
|
||||||
|
2. DFRN via Diaspora
|
||||||
|
3. Legacy DFRN
|
||||||
|
4. Diaspora
|
||||||
|
5. OStatus
|
||||||
|
*/
|
||||||
|
|
||||||
|
// We don't need to change it when nothing is to be changed
|
||||||
|
if ($old == $protocol) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// We don't want to mark a server as OStatus when it had been marked with any other protocol before
|
||||||
|
if ($protocol == Post\DeliveryData::OSTATUS) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the server is marked as ActivityPub then we won't change it to anything different
|
||||||
|
if ($old == Post\DeliveryData::ACTIVITYPUB) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't change it to anything lower than DFRN if the new one wasn't ActivityPub
|
||||||
|
if (($old == Post\DeliveryData::DFRN) && ($protocol != Post\DeliveryData::ACTIVITYPUB)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't change it to Diaspora when it is a legacy DFRN server
|
||||||
|
if (($old == Post\DeliveryData::LEGACY_DFRN) && ($protocol == Post\DeliveryData::DIASPORA)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger::info('Protocol for server', ['protocol' => $protocol, 'old' => $old, 'id' => $gsid, 'url' => $gserver['url']]);
|
||||||
|
DBA::update('gserver', ['protocol' => $protocol], ['id' => $gsid]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch the protocol of the given server
|
||||||
|
*
|
||||||
|
* @param int $gsid Server id
|
||||||
|
* @return int
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
public static function getProtocol(int $gsid)
|
||||||
|
{
|
||||||
|
if (empty($gsid)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$gserver = DBA::selectFirst('gserver', ['protocol'], ['id' => $gsid]);
|
||||||
|
if (DBA::isResult($gserver)) {
|
||||||
|
return $gserver['protocol'];
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,7 @@ use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Worker;
|
use Friendica\Core\Worker;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
|
use Friendica\Util\Network;
|
||||||
|
|
||||||
class PushSubscriber
|
class PushSubscriber
|
||||||
{
|
{
|
||||||
|
@ -170,5 +171,13 @@ class PushSubscriber
|
||||||
$fields = ['push' => 0, 'next_try' => DBA::NULL_DATETIME, 'last_update' => $last_update];
|
$fields = ['push' => 0, 'next_try' => DBA::NULL_DATETIME, 'last_update' => $last_update];
|
||||||
DBA::update('push_subscriber', $fields, ['id' => $id]);
|
DBA::update('push_subscriber', $fields, ['id' => $id]);
|
||||||
Logger::log('Subscriber ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as vital', Logger::DEBUG);
|
Logger::log('Subscriber ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as vital', Logger::DEBUG);
|
||||||
|
|
||||||
|
$parts = parse_url($subscriber['callback_url']);
|
||||||
|
unset($parts['path']);
|
||||||
|
$server_url = Network::unparseURL($parts);
|
||||||
|
$gsid = GServer::getID($server_url, true);
|
||||||
|
if (!empty($gsid)) {
|
||||||
|
GServer::setProtocol($gsid, Post\DeliveryData::OSTATUS);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,6 +24,7 @@ namespace Friendica\Worker;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Worker;
|
use Friendica\Core\Worker;
|
||||||
use Friendica\Model\Contact;
|
use Friendica\Model\Contact;
|
||||||
|
use Friendica\Model\GServer;
|
||||||
use Friendica\Model\Item;
|
use Friendica\Model\Item;
|
||||||
use Friendica\Model\Post;
|
use Friendica\Model\Post;
|
||||||
use Friendica\Protocol\ActivityPub;
|
use Friendica\Protocol\ActivityPub;
|
||||||
|
@ -82,6 +83,7 @@ class APDelivery
|
||||||
// This should never fail and is temporariy (until the move to the "post" structure)
|
// This should never fail and is temporariy (until the move to the "post" structure)
|
||||||
$item = Item::selectFirst(['uri-id'], ['id' => $item_id]);
|
$item = Item::selectFirst(['uri-id'], ['id' => $item_id]);
|
||||||
$uriid = $item['uri-id'] ?? 0;
|
$uriid = $item['uri-id'] ?? 0;
|
||||||
|
$gsid = null;
|
||||||
|
|
||||||
foreach ($receivers as $receiver) {
|
foreach ($receivers as $receiver) {
|
||||||
$contact = Contact::getById($receiver);
|
$contact = Contact::getById($receiver);
|
||||||
|
@ -89,6 +91,8 @@ class APDelivery
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$gsid = $gsid ?: $contact['gsid'];
|
||||||
|
|
||||||
if ($success) {
|
if ($success) {
|
||||||
Contact::unmarkForArchival($contact);
|
Contact::unmarkForArchival($contact);
|
||||||
} else {
|
} else {
|
||||||
|
@ -96,6 +100,10 @@ class APDelivery
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!empty($gsid)) {
|
||||||
|
GServer::setProtocol($gsid, Post\DeliveryData::ACTIVITYPUB);
|
||||||
|
}
|
||||||
|
|
||||||
if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
|
if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
|
||||||
Post\DeliveryData::incrementQueueFailed($uriid);
|
Post\DeliveryData::incrementQueueFailed($uriid);
|
||||||
} elseif ($success && in_array($cmd, [Delivery::POST])) {
|
} elseif ($success && in_array($cmd, [Delivery::POST])) {
|
||||||
|
|
|
@ -202,6 +202,8 @@ class Delivery
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$protocol = Model\GServer::getProtocol($contact['gsid'] ?? 0);
|
||||||
|
|
||||||
// Transmit via Diaspora if the thread had started as Diaspora post.
|
// Transmit via Diaspora if the thread had started as Diaspora post.
|
||||||
// Also transmit via Diaspora if this is a direct answer to a Diaspora comment.
|
// Also transmit via Diaspora if this is a direct answer to a Diaspora comment.
|
||||||
// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
|
// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
|
||||||
|
@ -219,7 +221,7 @@ class Delivery
|
||||||
|
|
||||||
switch ($contact['network']) {
|
switch ($contact['network']) {
|
||||||
case Protocol::DFRN:
|
case Protocol::DFRN:
|
||||||
self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
|
self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup, $protocol);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Protocol::DIASPORA:
|
case Protocol::DIASPORA:
|
||||||
|
@ -263,10 +265,11 @@ class Delivery
|
||||||
* @param boolean $public_message Is the content public?
|
* @param boolean $public_message Is the content public?
|
||||||
* @param boolean $top_level Is it a thread starter?
|
* @param boolean $top_level Is it a thread starter?
|
||||||
* @param boolean $followup Is it an answer to a remote post?
|
* @param boolean $followup Is it an answer to a remote post?
|
||||||
|
* @param int $server_protocol The protocol of the server
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
* @throws \ImagickException
|
* @throws \ImagickException
|
||||||
*/
|
*/
|
||||||
private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
|
private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup, $server_protocol)
|
||||||
{
|
{
|
||||||
// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
|
// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
|
||||||
if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByURL($contact['addr'], false))) {
|
if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByURL($contact['addr'], false))) {
|
||||||
|
@ -360,6 +363,8 @@ class Delivery
|
||||||
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
|
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
|
||||||
if (($deliver_status >= 200) && ($deliver_status <= 299)) {
|
if (($deliver_status >= 200) && ($deliver_status <= 299)) {
|
||||||
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
|
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
|
||||||
|
|
||||||
|
Model\GServer::setProtocol($contact['gsid'] ?? 0, $protocol);
|
||||||
} else {
|
} else {
|
||||||
Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
|
Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
|
||||||
}
|
}
|
||||||
|
@ -367,7 +372,7 @@ class Delivery
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($deliver_status < 200) || ($deliver_status > 299)) {
|
if ((($deliver_status < 200) || ($deliver_status > 299)) && (empty($server_protocol) || ($server_protocol == Model\Post\DeliveryData::LEGACY_DFRN))) {
|
||||||
// Transmit via Diaspora if not possible via Friendica
|
// Transmit via Diaspora if not possible via Friendica
|
||||||
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
|
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
|
||||||
return;
|
return;
|
||||||
|
@ -375,7 +380,7 @@ class Delivery
|
||||||
} elseif ($cmd != self::RELOCATION) {
|
} elseif ($cmd != self::RELOCATION) {
|
||||||
// DFRN payload over Diaspora transport layer
|
// DFRN payload over Diaspora transport layer
|
||||||
$deliver_status = DFRN::transmit($owner, $contact, $atom);
|
$deliver_status = DFRN::transmit($owner, $contact, $atom);
|
||||||
if ($deliver_status < 200) {
|
if (($deliver_status < 200) && (empty($server_protocol) || ($server_protocol == Model\Post\DeliveryData::LEGACY_DFRN))) {
|
||||||
// Legacy DFRN
|
// Legacy DFRN
|
||||||
$deliver_status = DFRN::deliver($owner, $contact, $atom);
|
$deliver_status = DFRN::deliver($owner, $contact, $atom);
|
||||||
$protocol = Model\Post\DeliveryData::LEGACY_DFRN;
|
$protocol = Model\Post\DeliveryData::LEGACY_DFRN;
|
||||||
|
@ -391,6 +396,8 @@ class Delivery
|
||||||
// We successfully delivered a message, the contact is alive
|
// We successfully delivered a message, the contact is alive
|
||||||
Model\Contact::unmarkForArchival($contact);
|
Model\Contact::unmarkForArchival($contact);
|
||||||
|
|
||||||
|
Model\GServer::setProtocol($contact['gsid'] ?? 0, $protocol);
|
||||||
|
|
||||||
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
|
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
|
||||||
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
|
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
|
||||||
}
|
}
|
||||||
|
@ -476,6 +483,8 @@ class Delivery
|
||||||
// We successfully delivered a message, the contact is alive
|
// We successfully delivered a message, the contact is alive
|
||||||
Model\Contact::unmarkForArchival($contact);
|
Model\Contact::unmarkForArchival($contact);
|
||||||
|
|
||||||
|
Model\GServer::setProtocol($contact['gsid'] ?? 0, Model\Post\DeliveryData::DIASPORA);
|
||||||
|
|
||||||
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
|
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
|
||||||
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DIASPORA);
|
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DIASPORA);
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
|
||||||
if (!defined('DB_UPDATE_VERSION')) {
|
if (!defined('DB_UPDATE_VERSION')) {
|
||||||
define('DB_UPDATE_VERSION', 1384);
|
define('DB_UPDATE_VERSION', 1385);
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
@ -75,6 +75,7 @@ return [
|
||||||
"poco" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
|
"poco" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
|
||||||
"noscrape" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
|
"noscrape" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
|
||||||
"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
|
"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
|
||||||
|
"protocol" => ["type" => "tinyint unsigned", "comment" => "The protocol of the server"],
|
||||||
"platform" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
|
"platform" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
|
||||||
"relay-subscribe" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Has the server subscribed to the relay system"],
|
"relay-subscribe" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Has the server subscribed to the relay system"],
|
||||||
"relay-scope" => ["type" => "varchar(10)", "not null" => "1", "default" => "", "comment" => "The scope of messages that the server wants to get"],
|
"relay-scope" => ["type" => "varchar(10)", "not null" => "1", "default" => "", "comment" => "The scope of messages that the server wants to get"],
|
||||||
|
|
Loading…
Reference in a new issue