* Issue 'cancel' messages for vCard when a user is deleted.

[citadel.git] / citadel / netproc.c

diff --git a/citadel/netproc.c b/citadel/netproc.c
index 9a531dea537a8d82e18fbdbf2bf19d4f70e3129a..5f6fc197b037130aa43f3c7dc44ec052e8f8ae2f 100644 (file)
--- a/citadel/netproc.c
+++ b/citadel/netproc.c
@@ -90,6 +90,7 @@ void get_config(void);
 
 struct filterlist *filter = NULL;
 struct syslist *slist = NULL;
+struct msglist *purgelist = NULL;
 
 struct config config;
 extern char bbs_home_directory[];
@@ -833,6 +834,7 @@ void inprocess(void)
        char buf[256];
        long msglen;
        int bloklen;
+       int valid_msg;
 
        /* temp file names */
        sprintf(tname, tmpnam(NULL));
@@ -887,6 +889,7 @@ NXMSG:      /* Seek to the beginning of the next message */
                                goto ENDSTR;
 
                        /* This crates the temporary file. */
+                       valid_msg = 1;
                        message = fopen(tname, "wb");
                        if (message == NULL) {
                                syslog(LOG_ERR, "error creating %s: %s",
@@ -899,18 +902,33 @@ NXMSG:    /* Seek to the beginning of the next message */
                        a = getc(fp);
                        putc(a, message);       /* mode */
                        do {
-                               FieldID = getc(fp);     /* Header field ID */
-                               putc(FieldID, message);
-                               do {
-                                       a = getc(fp);
-                                       putc(a, message);
-                               } while (a > 0);
+                               FieldID = getc(fp); /* Header field ID */
+                               if (isalpha(FieldID)) {
+                                       putc(FieldID, message);
+                                       do {
+                                               a = getc(fp);
+                                               if (a < 127) putc(a, message);
+                                       } while (a > 0);
+                                       if (a != 0) putc(0, message);
+                               }
+                               else {  /* Invalid field ID; flush it */
+                                       do {
+                                               a = getc(fp);
+                                       } while (a > 0);
+                                       valid_msg = 0;
+                               }
                        } while ((FieldID != 'M') && (a >= 0));
                        /* M is always last */
+                       if (FieldID != 'M') valid_msg = 0;
 
                        msglen = ftell(message);
                        fclose(message);
 
+                       if (!valid_msg) {
+                               unlink(tname);
+                               goto NXMSG;
+                       }
+
                        /* process the individual mesage */
                        msgfind(tname, &minfo);
                        strncpy(recentmsg.RMnodename, minfo.N, 9);
@@ -1160,6 +1178,54 @@ int ismsgok(FILE *mmfp, char *sysname)
 
 
 
+
+/*
+ * Add a message to the list of messages to be deleted off the local server
+ * at the end of this run.
+ */
+void delete_locally(long msgid, char *roomname) {
+       struct msglist *mptr;
+
+       mptr = (struct msglist *) malloc(sizeof(struct msglist));
+       mptr->next = purgelist;
+       mptr->m_num = msgid;
+       strcpy(mptr->m_rmname, roomname);
+       purgelist = mptr;
+}
+
+
+
+/*
+ * Delete all messages on the purge list from the local server.
+ */
+void process_purgelist(void) {
+       char curr_rm[ROOMNAMELEN];
+       char buf[256];
+       struct msglist *mptr;
+
+
+       strcpy(curr_rm, "__nothing__");
+       while (purgelist != NULL) {
+               if (strcasecmp(curr_rm, purgelist->m_rmname)) {
+                       sprintf(buf, "GOTO %s", purgelist->m_rmname);
+                       serv_puts(buf);
+                       serv_gets(buf);
+                       if (buf[0] == '2') extract(curr_rm, &buf[4], 0);
+               }
+               if (strcasecmp(curr_rm, purgelist->m_rmname)) {
+                       sprintf(buf, "DELE %ld", purgelist->m_num);
+                       serv_puts(buf);
+                       serv_gets(buf);
+               }
+               mptr = purgelist->next;
+               free(purgelist);
+               purgelist = mptr;
+       }
+}
+
+
+
+
 /* spool list of messages to a file */
 /* returns # of msgs spooled */
 int spool_out(struct msglist *cmlist, FILE * destfp, char *sysname)
@@ -1225,6 +1291,9 @@ int spool_out(struct msglist *cmlist, FILE * destfp, char *sysname)
                                        fprintf(destfp, "%s!", NODENAME);
                                if (a != 'C')
                                        fwrite(fbuf, strlen(fbuf) + 1, 1, destfp);
+                               if (a == 'S') if (!strcasecmp(fbuf, "CANCEL")) {
+                                       delete_locally(cmptr->m_num, cmptr->m_rmname);
+                               }
                        }
                        if (a == 'M') {
                                fprintf(destfp, "C%s%c",
@@ -1512,6 +1581,9 @@ int main(int argc, char **argv)
        /* Update mail.sysinfo with new information we learned */
        rewrite_syslist();
 
+       /* Delete any messages which need to be purged locally */
+       process_purgelist();
+
        /* Close the use table */
        purge_use_table(use_table);
        gdbm_close(use_table);