/*
- * $Id$
- *
* Handle XMPP presence exchanges
*
- * Copyright (c) 2007-2010 by Art Cancro
+ * Copyright (c) 2007-2017 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.
#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
+#include <assert.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
#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));
+}
/*
- * Convenience function to determine whether a particular session is visible to this user
+ * Convenience function to determine whether any given session is 'visible' to any other given session,
+ * and is capable of receiving instant messages from that session.
*/
-int xmpp_is_visible(struct CitContext *cptr) {
- int aide = (CC->user.axlevel >= AxAideU);
+int xmpp_is_visible(struct CitContext *cptr, struct CitContext *to_whom) {
+ int aide = (to_whom->user.axlevel >= AxAideU);
if ( (cptr->logged_in)
&& (((cptr->cs_flags&CS_STEALTH)==0) || (aide)) /* aides see everyone */
- && (cptr->user.usernum != CC->user.usernum) /* don't show myself */
+ && (cptr->user.usernum != to_whom->user.usernum) /* don't show myself */
&& (cptr->can_receive_im) /* IM-capable session */
) {
return(1);
}
for (i=0; i<nContexts; i++) {
- if (xmpp_is_visible(&cptr[i])) {
- xmpp_indicate_presence(cptr[i].cs_inet_email);
+ if (xmpp_is_visible(&cptr[i], CC)) {
+ xmpp_indicate_presence(cptr[i].cs_principal_id);
}
}
free(cptr);
* 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;
/* 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>"
/*
* When a user logs in or out of the local Citadel system, notify all XMPP sessions about it.
+ * THIS FUNCTION HAS A BUG IN IT THAT ENUMERATES THE SESSIONS WRONG.
*/
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);
if (IsEmptyStr(presence_jid)) return;
if (CC->kill_me) return;
if (!cptr) {
return;
}
-
+
/* Count the visible sessions for this user */
for (i=0; i<nContexts; i++) {
- if (xmpp_is_visible(&cptr[i])) {
+ if ( (!strcasecmp(cptr[i].cs_principal_id, presence_jid))
+ && (xmpp_is_visible(&cptr[i], CC))
+ ) {
++visible_sessions;
+ which_cptr_is_relevant = i;
}
}
- 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. */
- for (i=0; i<nContexts; i++) {
- if (xmpp_is_visible(&cptr[i])) {
- if (!strcasecmp(cptr[i].cs_inet_email, presence_jid)) {
- cprintf("<iq id=\"unsolicited_%x\" type=\"result\">",
- ++unsolicited_id);
- cprintf("<query xmlns=\"jabber:iq:roster\">");
- xmpp_roster_item(&cptr[i]);
- cprintf("</query>"
- "</iq>");
- }
- }
- }
+ assert(which_cptr_is_relevant >= 0);
+ cprintf("<iq id=\"unsolicited_%x\" type=\"result\">", ++unsolicited_id);
+ cprintf("<query xmlns=\"jabber:iq:roster\">");
+ xmpp_roster_item(&cptr[which_cptr_is_relevant]);
+ cprintf("</query></iq>");
/* Transmit presence information */
xmpp_indicate_presence(presence_jid);
}
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;
char *ptr = NULL;
char *lasts = NULL;
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, 1, 1);
if (msg == NULL) {
return;
}
/* 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;
}
}
}
- 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
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);
}
}
-
/*
* 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
}
-
/*
* 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.
cptr = CtdlGetContextArray(&nContexts);
if (cptr) {
for (i=0; i<nContexts; i++) {
- if (xmpp_is_visible(&cptr[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);
}
}
}
-
/*
* 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
online_now = 0;
if (cptr) for (i=0; i<nContexts; i++) {
- if (xmpp_is_visible(&cptr[i])) {
- if (!strcasecmp(cptr[i].cs_inet_email, (char *)Value)) {
+ if (xmpp_is_visible(&cptr[i], CC)) {
+ 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 */
}
}
DeleteHash(&mortuary);
free(cptr);
}
-
projects / citadel.git / blobdiff