X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=00fb4e3bd77534c9ee48bbea95bf814def457fee;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hp=49836f388b38a674b597b83baf5d8945d72ec542;hpb=630aa1e9a38b94abe225fa52909ba8f3bb57d908;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c index 49836f388..00fb4e3bd 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. @@ -30,18 +28,8 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include +#include #include #include #include @@ -54,49 +42,58 @@ #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_jid, - XMPP->client_jid - ); +void xmpp_indicate_presence(char *presence_jid) { + char xmlbuf[256]; + + syslog(LOG_DEBUG, "xmpp: indicating presence of <%s> to <%s>", presence_jid, XMPP->client_jid); + cprintf("", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf)); +} + + +/* + * 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, 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 != to_whom->user.usernum) /* don't show myself */ + && (cptr->can_receive_im) /* IM-capable session */ + ) { + return(1); + } + else { + return(0); + } } /* * Initial dump of the entire wholist */ -void xmpp_wholist_presence_dump(void) -{ +void xmpp_wholist_presence_dump(void) { struct CitContext *cptr = NULL; int nContexts, i; - int aide = (CC->user.axlevel >= AxAideU); - cptr = CtdlGetContextArray(&nContexts); if (!cptr) { return; } for (i=0; iuser.usernum) /* don't show myself */ - && (cptr[i].can_receive_im) /* IM-capable session */ - ) { - 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); @@ -107,27 +104,45 @@ 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; + if (!XMPP->client_jid) return; /* Transmit non-presence information */ cprintf("", - presence_jid, XMPP->client_jid - ); - cprintf("", - 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("", + 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("", - 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(""); - cprintf("", presence_jid); - cprintf("%s", config.c_humannode); + cprintf("", xmlesc(xmlbuf1, presence_jid, sizeof xmlbuf1)); + cprintf("%s", xmlesc(xmlbuf1, CtdlGetConfigStr("c_humannode"), sizeof xmlbuf1)); cprintf(""); cprintf("" "" @@ -137,13 +152,14 @@ void xmpp_destroy_buddy(char *presence_jid) { /* * 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 aide = (CC->user.axlevel >= AxAideU); + int which_cptr_is_relevant = (-1); if (IsEmptyStr(presence_jid)) return; if (CC->kill_me) return; @@ -152,55 +168,43 @@ void xmpp_presence_notify(char *presence_jid, int event_type) { if (!cptr) { return; } - + /* Count the visible sessions for this user */ for (i=0; i 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", - ++unsolicited_id); - cprintf(""); - xmpp_roster_item(&cptr[i]); - cprintf("" - ""); - } - } - } + assert(which_cptr_is_relevant >= 0); + cprintf("", ++unsolicited_id); + cprintf(""); + xmpp_roster_item(&cptr[which_cptr_is_relevant]); + cprintf(""); /* 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; @@ -215,12 +219,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; } @@ -236,13 +240,10 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) { } } - TRACE; - CtdlFreeMessage(msg); - TRACE; + 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 @@ -250,7 +251,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); } @@ -265,7 +266,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 @@ -284,8 +284,7 @@ void xmpp_store_mortuary(HashList *mortuary) { ); HashPos = GetNewHashPos(mortuary, 0); - while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0) - { + while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0) { StrBufAppendPrintf(themsg, "%s\n", (char *)Value); } DeleteHashPos(&HashPos); @@ -294,12 +293,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. @@ -307,25 +305,18 @@ void xmpp_store_mortuary(HashList *mortuary) { * Since the client is probably not still alive, also remember the current * roster for next time so we can delete dead buddies then. */ -void xmpp_massacre_roster(void) -{ +void xmpp_massacre_roster(void) { struct CitContext *cptr; int nContexts, i; - int aide = (CC->user.axlevel >= AxAideU); HashList *mortuary = xmpp_fetch_mortuary(); cptr = CtdlGetContextArray(&nContexts); if (cptr) { for (i=0; iuser.usernum) - ) { - if (mortuary) { - char *buddy = strdup(cptr[i].cs_inet_email); - Put(mortuary, buddy, strlen(buddy), buddy, NULL); - } + if (xmpp_is_visible(&cptr[i], CC)) { + if (mortuary) { + char *buddy = strdup(cptr[i].cs_principal_id); + Put(mortuary, buddy, strlen(buddy), buddy, NULL); } } } @@ -339,27 +330,48 @@ 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 * client about, and push delete operations out at the beginning of a session. + * + * We omit any users who happen to be online right now, but we still keep them in the mortuary, + * which needs to be maintained as a list of every buddy the user has ever seen. We don't know + * when they're connecting from the same client and when they're connecting from a different client, + * so we have no guarantee of what is in the client side roster at connect time. */ -void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void) -{ +void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void) { long len; void *Value; const char *Key; + struct CitContext *cptr; + int nContexts, i; + int online_now = 0; HashList *mortuary = xmpp_fetch_mortuary(); HashPos *HashPos = GetNewHashPos(mortuary, 0); - /* FIXME delete from the list anyone who is currently online */ + /* we need to omit anyone who is currently online */ + cptr = CtdlGetContextArray(&nContexts); + /* go through the list of users in the mortuary... */ while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0) { - CtdlLogPrintf(CTDL_DEBUG, "\033[31mDELETE: %s\033[0m\n", (char *)Value); - // FIXME xmpp_destroy_buddy((char *)Value); + + online_now = 0; + if (cptr) for (i=0; i