X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=ac02f885656b09c08d8b0ca58883640630eb783c;hb=a4951de6e6b4115c2af3d8780182e363ab1a9adb;hp=5dadfe38ed60837b926fcfca6e54f2b177edbb95;hpb=37d26a3d25048a08463d6230b6f8149f417ac150;p=citadel.git

diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index 5dadfe38e..ac02f8856 100644
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -1,11 +1,9 @@
 /*
- * $Id$ 
- *
  * Handle XMPP presence exchanges
  *
- * Copyright (c) 2007-2010 by Art Cancro
+ * Copyright (c) 2007-2021 by Art Cancro and citadel.org
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
@@ -55,24 +53,22 @@
 #include "support.h"
 #include "config.h"
 #include "internet_addressing.h"
-#include "md5.h"
 #include "ctdl_module.h"
 #include "serv_xmpp.h"
 
 
-
 /* 
  * Indicate the presence of another user to the client
  * (used in several places)
  */
 void xmpp_indicate_presence(char *presence_jid)
 {
-	cprintf("<presence from=\"%s\" to=\"%s\"></presence>",
-		presence_jid,
-		XMPP->client_jid
-	);
-}
+	char xmlbuf[256];
 
+	syslog(LOG_DEBUG, "xmpp: indicating presence of <%s> to <%s>", presence_jid, XMPP->client_jid);
+	cprintf("<presence from=\"%s\" ", xmlesc(xmlbuf, presence_jid, sizeof xmlbuf));
+	cprintf("to=\"%s\"></presence>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
+}
 
 
 /*
@@ -110,7 +106,7 @@ void xmpp_wholist_presence_dump(void)
 
 	for (i=0; i<nContexts; i++) {
 		if (xmpp_is_visible(&cptr[i], CC)) {
-			xmpp_indicate_presence(cptr[i].cs_inet_email);
+			xmpp_indicate_presence(cptr[i].cs_principal_id);
 		}
 	}
 	free(cptr);
@@ -121,8 +117,10 @@ void xmpp_wholist_presence_dump(void)
  * Function to remove a buddy subscription and delete from the roster
  * (used in several places)
  */
-void xmpp_destroy_buddy(char *presence_jid) {
+void xmpp_destroy_buddy(char *presence_jid, int aggressively) {
 	static int unsolicited_id = 1;
+	char xmlbuf1[256];
+	char xmlbuf2[256];
 
 	if (!presence_jid) return;
 	if (!XMPP) return;
@@ -130,22 +128,34 @@ void xmpp_destroy_buddy(char *presence_jid) {
 
 	/* Transmit non-presence information */
 	cprintf("<presence type=\"unavailable\" from=\"%s\" to=\"%s\"></presence>",
-		presence_jid, XMPP->client_jid
-	);
-	cprintf("<presence type=\"unsubscribed\" from=\"%s\" to=\"%s\"></presence>",
-		presence_jid, XMPP->client_jid
+		xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
+		xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
 	);
-	// FIXME ... we should implement xmpp_indicate_nonpresence so we can use it elsewhere
+
+	/*
+	 * Setting the "aggressively" flag also sends an "unsubscribed" presence update.
+	 * We only ask for this when flushing the client side roster, because if we do it
+	 * in the middle of a session when another user logs off, some clients (Jitsi) interpret
+	 * it as a rejection of a subscription request.
+	 */
+	if (aggressively) {
+		cprintf("<presence type=\"unsubscribed\" from=\"%s\" to=\"%s\"></presence>",
+			xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1),
+			xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2)
+		);
+	}
+
+	// note: we should implement xmpp_indicate_nonpresence so we can use it elsewhere
 
 	/* Do an unsolicited roster update that deletes the contact. */
 	cprintf("<iq from=\"%s\" to=\"%s\" id=\"unbuddy_%x\" type=\"result\">",
-		CC->cs_inet_email,
-		XMPP->client_jid,
+		xmlesc(xmlbuf1, CC->cs_principal_id, sizeof xmlbuf1),
+		xmlesc(xmlbuf2, XMPP->client_jid, sizeof xmlbuf2),
 		++unsolicited_id
 	);
 	cprintf("<query xmlns=\"jabber:iq:roster\">");
-	cprintf("<item jid=\"%s\" subscription=\"remove\">", presence_jid);
-	cprintf("<group>%s</group>", config.c_humannode);
+	cprintf("<item jid=\"%s\" subscription=\"remove\">", xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1));
+	cprintf("<group>%s</group>", xmlesc(xmlbuf1, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1));
 	cprintf("</item>");
 	cprintf("</query>"
 		"</iq>"
@@ -159,7 +169,7 @@ void xmpp_destroy_buddy(char *presence_jid) {
  */
 void xmpp_presence_notify(char *presence_jid, int event_type) {
 	struct CitContext *cptr;
-	static int unsolicited_id;
+	static int unsolicited_id = 12345;
 	int visible_sessions = 0;
 	int nContexts, i;
 	int which_cptr_is_relevant = (-1);
@@ -174,7 +184,7 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 
 	/* Count the visible sessions for this user */
 	for (i=0; i<nContexts; i++) {
-		if ( (!strcasecmp(cptr[i].cs_inet_email, presence_jid))
+		if ( (!strcasecmp(cptr[i].cs_principal_id, presence_jid))
 		   && (xmpp_is_visible(&cptr[i], CC))
 		)  {
 			++visible_sessions;
@@ -182,13 +192,11 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 		}
 	}
 
-	CtdlLogPrintf(CTDL_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
-		visible_sessions, presence_jid, CC->cs_pid);
+	syslog(LOG_DEBUG, "xmpp: %d sessions for <%s> are now visible to session %d", visible_sessions, presence_jid, CC->cs_pid);
 
 	if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) {
 
-		CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged in\n",
-			CC->cs_pid, presence_jid);
+		syslog(LOG_DEBUG, "xmpp: telling session %d that <%s> logged in", CC->cs_pid, presence_jid);
 
 		/* Do an unsolicited roster update that adds a new contact. */
 		assert(which_cptr_is_relevant >= 0);
@@ -202,16 +210,14 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
 	}
 
 	if (visible_sessions == 0) {
-		CtdlLogPrintf(CTDL_DEBUG, "Telling session %d that <%s> logged out\n",
-			CC->cs_pid, presence_jid);
-		xmpp_destroy_buddy(presence_jid);
+		syslog(LOG_DEBUG, "xmpp: telling session %d that <%s> logged out", CC->cs_pid, presence_jid);
+		xmpp_destroy_buddy(presence_jid, 0);	/* non aggressive presence update */
 	}
 
 	free(cptr);
 }
 
 
-
 void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
 	HashList *mortuary = (HashList *) userdata;
 	struct CtdlMessage *msg;
@@ -226,12 +232,12 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
 	/* now add anyone we find into the hashlist */
 
 	/* skip past the headers */
-	ptr = strstr(msg->cm_fields['M'], "\n\n");
+	ptr = strstr(msg->cm_fields[eMesageText], "\n\n");
 	if (ptr != NULL) {
 		ptr += 2;
 	}
 	else {
-		ptr = strstr(msg->cm_fields['M'], "\n\r\n");
+		ptr = strstr(msg->cm_fields[eMesageText], "\n\r\n");
 		if (ptr != NULL) {
 			ptr += 3;
 		}
@@ -247,11 +253,10 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
 		}
 	}
 
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 
-
 /*
  * Fetch the "mortuary" - a list of dead buddies which we keep around forever
  * so we can remove them from any client's roster that still has them listed
@@ -259,7 +264,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
 HashList *xmpp_fetch_mortuary(void) {
 	HashList *mortuary = NewHash(1, NULL);
 	if (!mortuary) {
-		CtdlLogPrintf(CTDL_ALERT, "NewHash() failed!\n");
+		syslog(LOG_ALERT, "xmpp: NewHash() failed!");
 		return(NULL);
 	}
 
@@ -274,7 +279,6 @@ HashList *xmpp_fetch_mortuary(void) {
 }
 
 
-
 /*
  * Fetch the "mortuary" - a list of dead buddies which we keep around forever
  * so we can remove them from any client's roster that still has them listed
@@ -303,12 +307,11 @@ void xmpp_store_mortuary(HashList *mortuary) {
 	CtdlDeleteMessages(USERCONFIGROOM, NULL, 0, XMPPMORTUARY);
 
 	/* And save the new one to disk */
-	quickie_message("Citadel", NULL, NULL, USERCONFIGROOM, ChrPtr(themsg), 4, "XMPP Mortuary");
+	quickie_message(CC->user.fullname, NULL, NULL, USERCONFIGROOM, ChrPtr(themsg), 4, "XMPP Mortuary");
 	FreeStrBuf(&themsg);
 }
 
 
-
 /*
  * Upon logout we make an attempt to delete the whole roster, in order to
  * try to keep "ghost" buddies from remaining in the client-side roster.
@@ -327,7 +330,7 @@ void xmpp_massacre_roster(void)
 		for (i=0; i<nContexts; i++) {
 			if (xmpp_is_visible(&cptr[i], CC)) {
 				if (mortuary) {
-					char *buddy = strdup(cptr[i].cs_inet_email);
+					char *buddy = strdup(cptr[i].cs_principal_id);
 					Put(mortuary, buddy, strlen(buddy), buddy, NULL);
 				}
 			}
@@ -342,7 +345,6 @@ void xmpp_massacre_roster(void)
 }
 
 
-
 /*
  * Stupidly, XMPP does not specify a way to tell the client to flush its client-side roster
  * and prepare to receive a new one.  So instead we remember every buddy we've ever told the
@@ -374,14 +376,14 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
 		online_now = 0;
 		if (cptr) for (i=0; i<nContexts; i++) {
 			if (xmpp_is_visible(&cptr[i], CC)) {
-				if (!strcasecmp(cptr[i].cs_inet_email, (char *)Value)) {
+				if (!strcasecmp(cptr[i].cs_principal_id, (char *)Value)) {
 					online_now = 1;
 				}
 			}
 		}
 
 		if (!online_now) {
-			xmpp_destroy_buddy((char *)Value);
+			xmpp_destroy_buddy((char *)Value, 1);	/* aggressive presence update */
 		}
 
 	}
@@ -389,4 +391,3 @@ void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void)
 	DeleteHash(&mortuary);
 	free(cptr);
 }
-