matty/peertube-plugin-livechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: direct s2s connection not always possible

Browse Source 
Trying to connect to a remote instance using direct s2s won't work if local instance has not the feature enabled, and if the remote instance does not know the local one.
So using Websocket S2S in such case (that embed a discovery mecanism).
This commit is contained in:
John Livingston
2023-06-01 13:06:59 +02:00
parent 6434ff024d
commit 472caf9f5b
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/lib/federation/connection-infos.ts
View File

@ -52,14 +52,9 @@ function compatibleRemoteAuthenticatedConnectionEnabled (
if (!('xmppserver' in livechatInfos)) { return false }
if (!livechatInfos.xmppserver) { return false }
// FIXME: these tests does not really represent what Prosody will do.
// Prosody can use Websocket in one way and Direct S2S in the other.
// I don't really know what to test here.
// In real case scenario, we should always have Websocket S2S on both side...
// They are rare cases where Websocket is disabled on an entire server.
// In such case, we indeed need direct S2S on both side.
// So these tests should work.
if (canWebsocketS2S && livechatInfos.xmppserver.websockets2s) { return true }
// Note: see comments neer option s2s_peertubelivechat_no_outgoing_directs2s_to_peertube
// to understand why we need both to be true.
if (canDirectS2S && livechatInfos.xmppserver.directs2s) { return true }
return false

6
server/lib/prosody/config/content.ts
View File

@ -302,6 +302,12 @@ class ProsodyConfigContent {
// FIXME: seems to be necessary to add the module on the muc host, so that dialback can trigger route/remote.
this.muc.add('modules_enabled', 'websocket_s2s_peertubelivechat')
// Using direct S2S for outgoing connection can be an issue, if the local instance dont allow incomming S2S.
// Indeed, the remote instance will not necessarely be able to discover the Websocket Endpoint.
// To be sure the remote instance knows the websocket endpoint, we must use Websocket for the firt outgoing connect.
// So, we will add a parameter for mod_s2s_peertubelivechat, to tell him not to use outgoint s2s connection.
this.global.set('s2s_peertubelivechat_no_outgoing_directs2s_to_peertube', s2sPort === null)
this.muc.add('modules_enabled', 'dialback') // This allows s2s connections without certicicates!
this.authenticated?.add('modules_enabled', 'dialback') // This allows s2s connections without certicicates!
}