X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_presence.c;h=521d257c4cb386d1e1c8a027f5b4a5331794cf16;hb=62e5cd8b5bcf983f843a7e27d0ecddc4b11b13c3;hp=fd1a737ed550203273a1d41b7c730941d2c530c2;hpb=d875298e1441233ab036cfb1514e52d7e4456755;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c index fd1a737ed..521d257c4 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 * - * 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,6 +28,7 @@ #include #include #include +#include #if TIME_WITH_SYS_TIME # include @@ -66,37 +65,53 @@ */ void xmpp_indicate_presence(char *presence_jid) { - cprintf("", - presence_jid, - XMPP->client_jid - ); + XPUT("client_jid, strlen(XMPP->client_jid)); + XPUT("\">"); +} + + + +/* + * 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 + * Respond to a update by firing back with presence information + * on the entire wholist. Check this assumption, it's probably wrong. */ -void xmpp_wholist_presence_dump(void) +void xmpp_wholist_presence_dump(void *data, const char *supplied_el, const char **attr) { 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_inet_email); } } free(cptr); @@ -107,43 +122,70 @@ 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; + struct CitContext *CCC = CC; + + 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 - ); + XPUT("client_jid, strlen(XMPP->client_jid)); + XPUT("\">"); + + /* + * 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) { + XPUT("client_jid, strlen(XMPP->client_jid)); + XPUT("\">"); + } + // FIXME ... 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, - ++unsolicited_id - ); - cprintf(""); - cprintf("", presence_jid); - cprintf("%s", config.c_humannode); - cprintf(""); - cprintf("" - "" + XPUT("cs_inet_email, strlen(CCC->cs_inet_email)); + XPUT("\" to=\""); + XPutProp(XMPP->client_jid, strlen(XMPP->client_jid)); + XPUT("\" id=\"unbuddy_"); + XPrintf("%x", ++unsolicited_id); + XPUT("\">"); + + XPUT("" + "" + ""); + XPutBody(CFG_KEY(c_humannode)); + XPUT("" + "" + "" + "" ); } /* * 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; 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,50 +194,44 @@ 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); + XMPP_syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n", + 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); + XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n", + 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); + XPUT("" + ""); + xmpp_roster_item(&cptr[which_cptr_is_relevant]); + XPUT(""); /* 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); + XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged out\n", + CC->cs_pid, presence_jid); + xmpp_destroy_buddy(presence_jid, 0); /* non aggressive presence update */ } + free(cptr); } @@ -204,12 +240,9 @@ void xmpp_presence_notify(char *presence_jid, int event_type) { void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) { HashList *mortuary = (HashList *) userdata; struct CtdlMessage *msg; - const char *ptr = NULL; - const char *endptr = NULL; - int in_body = 0; - char buf[256]; + char *ptr = NULL; + char *lasts = NULL; - CtdlLogPrintf(CTDL_DEBUG, "\033[32m%d\033[0m\n", msgnum); msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) { return; @@ -217,17 +250,29 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) { /* now add anyone we find into the hashlist */ - ptr = msg->cm_fields['M']; - endptr = ptr + strlen(ptr); // only do strlen once :) - while (ptr = memreadline(ptr, buf, (sizeof buf - 2)), ((ptr < endptr) && (*ptr != 0)) ) { - CtdlLogPrintf(CTDL_DEBUG, "%3d \033[31m%s\033[0m\n", in_body, buf); - if (in_body) { - Put(mortuary, buf, strlen(buf), buf, generic_free_handler); + /* skip past the headers */ + ptr = strstr(msg->cm_fields[eMesageText], "\n\n"); + if (ptr != NULL) { + ptr += 2; + } + else { + ptr = strstr(msg->cm_fields[eMesageText], "\n\r\n"); + if (ptr != NULL) { + ptr += 3; + } + } + + /* the remaining lines are addresses */ + if (ptr != NULL) { + ptr = strtok_r(ptr, "\n", &lasts); + while (ptr != NULL) { + char *pch = strdup(ptr); + Put(mortuary, pch, strlen(pch), pch, NULL); + ptr = strtok_r(NULL, "\n", &lasts); } - if (IsEmptyStr(buf)) in_body = 1; } - CtdlFreeMessage(msg); + CM_Free(msg); } @@ -239,7 +284,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"); + XMPPM_syslog(LOG_ALERT, "NewHash() failed!\n"); return(NULL); } @@ -276,15 +321,21 @@ void xmpp_store_mortuary(HashList *mortuary) { while (GetNextHashPos(mortuary, HashPos, &len, &Key, &Value) != 0) { StrBufAppendPrintf(themsg, "%s\n", (char *)Value); - /* note: don't free(Value) -- deleting the hash list will handle this for us */ } DeleteHashPos(&HashPos); + /* FIXME temp crap + StrBufAppendPrintf(themsg, "foo@bar.com\n"); + StrBufAppendPrintf(themsg, "baz@quux.com\n"); + StrBufAppendPrintf(themsg, "haha%c\n", 1); + StrBufAppendPrintf(themsg, "baaaz@quux.com\n"); + StrBufAppendPrintf(themsg, "baaaz@quuuuuux.com\n"); + */ + /* Delete the old mortuary */ CtdlDeleteMessages(USERCONFIGROOM, NULL, 0, XMPPMORTUARY); /* And save the new one to disk */ - CtdlLogPrintf(CTDL_DEBUG, "Save this:\n\033[34m%s\033[0m\n", ChrPtr(themsg)); quickie_message("Citadel", NULL, NULL, USERCONFIGROOM, ChrPtr(themsg), 4, "XMPP Mortuary"); FreeStrBuf(&themsg); } @@ -302,24 +353,15 @@ 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) - ) { - xmpp_destroy_buddy(cptr[i].cs_inet_email); - if (mortuary) { - char *buddy = strdup(cptr[i].cs_inet_email); - CtdlLogPrintf(CTDL_DEBUG, "Put \033[33m%s\033[0m\n", buddy); - Put(mortuary, buddy, strlen(buddy), - buddy, generic_free_handler); - } + if (xmpp_is_visible(&cptr[i], CC)) { + if (mortuary) { + char *buddy = strdup(cptr[i].cs_inet_email); + Put(mortuary, buddy, strlen(buddy), buddy, NULL); } } } @@ -334,3 +376,58 @@ 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) +{ + 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); + + /* 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) + { + + online_now = 0; + if (cptr) for (i=0; i