]> code.citadel.org Git - citadel.git/blobdiff - citadel/serv_listsub.c
* Bugfixes
[citadel.git] / citadel / serv_listsub.c
index 7995ed540fda91f6d878519ec1c0a7ae78f9c35b..179014548c9388d26a0a2ac4dd3852505192965c 100644 (file)
@@ -68,10 +68,8 @@ void listsub_generate_token(char *buf) {
         * tinfoil-hat secure, it just needs to be reasonably unguessable
         * and unique.
         */
-       sprintf(sourcebuf, "%d%d%ld",
-               ++seq,
-               getpid(),
-               time(NULL)
+       sprintf(sourcebuf, "%lx",
+               (long) (++seq + getpid() + time(NULL))
        );
 
        /* Convert it to base64 so it looks cool */     
@@ -82,37 +80,226 @@ void listsub_generate_token(char *buf) {
 /*
  * Enter a subscription request
  */
-void do_subscribe(char *room, char *email, char *subtype) {
+void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
        struct quickroom qrbuf;
        FILE *ncfp;
        char filename[SIZ];
        char token[SIZ];
+       char confirmation_request[SIZ];
+       char buf[SIZ];
+       char urlroom[SIZ];
+       char scancmd[SIZ];
+       char scanemail[SIZ];
+       int found_sub = 0;
 
        if (getroom(&qrbuf, room) != 0) {
                cprintf("%d There is no list called '%s'\n", ERROR, room);
                return;
        }
 
+       if ((qrbuf.QRflags2 & QR2_SELFLIST) == 0) {
+               cprintf("%d '%s' "
+                       "does not accept subscribe/unsubscribe requests.\n",
+                       ERROR+HIGHER_ACCESS_REQUIRED, qrbuf.QRname);
+               return;
+       }
+
        listsub_generate_token(token);
 
-       begin_critical_section(S_NETCONFIGS);
        assoc_file_name(filename, sizeof filename, &qrbuf, "netconfigs");
+
+       /* 
+        * Make sure the requested address isn't already subscribed
+        */
+       begin_critical_section(S_NETCONFIGS);
+       ncfp = fopen(filename, "r");
+       if (ncfp != NULL) {
+               while (fgets(buf, sizeof buf, ncfp) != NULL) {
+                       buf[strlen(buf)-1] = 0;
+                       extract(scancmd, buf, 0);
+                       extract(scanemail, buf, 1);
+                       if ((!strcasecmp(scancmd, "listrecp"))
+                          || (!strcasecmp(scancmd, "digestrecp"))) {
+                               if (!strcasecmp(scanemail, email)) {
+                                       ++found_sub;
+                               }
+                       }
+               }
+               fclose(ncfp);
+       }
+       end_critical_section(S_NETCONFIGS);
+
+       if (found_sub != 0) {
+               cprintf("%d '%s' is already subscribed to '%s'.\n",
+                       ERROR,
+                       email, qrbuf.QRname);
+               return;
+       }
+
+       /*
+        * Now add it to the file
+        */     
+       begin_critical_section(S_NETCONFIGS);
        ncfp = fopen(filename, "a");
        if (ncfp != NULL) {
-               fprintf(ncfp, "subpending|%s|%s|%s|%ld\n",
+               fprintf(ncfp, "subpending|%s|%s|%s|%ld|%s\n",
                        email,
                        subtype,
                        token,
-                       time(NULL)
+                       time(NULL),
+                       webpage
                );
                fclose(ncfp);
        }
        end_critical_section(S_NETCONFIGS);
 
-       /* FIXME  --  generate and send the confirmation request */
+       /* Generate and send the confirmation request */
+
+       urlesc(urlroom, qrbuf.QRname);
+
+       snprintf(confirmation_request, sizeof confirmation_request,
+               "Content-type: text/html\n\n"
+               "<HTML><BODY>"
+               "Someone (probably you) has submitted a request to subscribe\n"
+               "&lt;%s&gt; to the <B>%s</B> mailing list.<BR><BR>\n"
+               "Please click here to confirm this request:<BR>\n"
+               "<A HREF=\"http://%s?room=%s&token=%s&cmd=confirm\">"
+               "http://%s?room=%s&token=%s&cmd=confirm</A><BR><BR>\n"
+               "If this request has been submitted in error and you do not\n"
+               "wish to receive the '%s' mailing list, simply do nothing,\n"
+               "and you will not receive any further mailings.\n"
+               "</BODY></HTML>\n",
+
+               email, qrbuf.QRname,
+               webpage, urlroom, token,
+               webpage, urlroom, token,
+               qrbuf.QRname
+       );
+
+       quickie_message(        /* This delivers the message */
+               "Citadel",
+               email,
+               NULL,
+               confirmation_request,
+               FMT_RFC822,
+               "Please confirm your list subscription"
+       );
 
        cprintf("%d Subscription entered; confirmation request sent\n", CIT_OK);
+}
+
 
+/*
+ * Enter an unsubscription request
+ */
+void do_unsubscribe(char *room, char *email, char *webpage) {
+       struct quickroom qrbuf;
+       FILE *ncfp;
+       char filename[SIZ];
+       char token[SIZ];
+       char buf[SIZ];
+       char confirmation_request[SIZ];
+       char urlroom[SIZ];
+       char scancmd[SIZ];
+       char scanemail[SIZ];
+       int found_sub = 0;
+
+       if (getroom(&qrbuf, room) != 0) {
+               cprintf("%d There is no list called '%s'\n",
+                       ERROR+ROOM_NOT_FOUND, room);
+               return;
+       }
+
+       if ((qrbuf.QRflags2 & QR2_SELFLIST) == 0) {
+               cprintf("%d '%s' "
+                       "does not accept subscribe/unsubscribe requests.\n",
+                       ERROR+HIGHER_ACCESS_REQUIRED, qrbuf.QRname);
+               return;
+       }
+
+       listsub_generate_token(token);
+
+       assoc_file_name(filename, sizeof filename, &qrbuf, "netconfigs");
+
+       /* 
+        * Make sure there's actually a subscription there to remove
+        */
+       begin_critical_section(S_NETCONFIGS);
+       ncfp = fopen(filename, "r");
+       if (ncfp != NULL) {
+               while (fgets(buf, sizeof buf, ncfp) != NULL) {
+                       buf[strlen(buf)-1] = 0;
+                       extract(scancmd, buf, 0);
+                       extract(scanemail, buf, 1);
+                       if ((!strcasecmp(scancmd, "listrecp"))
+                          || (!strcasecmp(scancmd, "digestrecp"))) {
+                               if (!strcasecmp(scanemail, email)) {
+                                       ++found_sub;
+                               }
+                       }
+               }
+               fclose(ncfp);
+       }
+       end_critical_section(S_NETCONFIGS);
+
+       if (found_sub == 0) {
+               cprintf("%d '%s' is not subscribed to '%s'.\n",
+                       ERROR+NO_SUCH_USER,
+                       email, qrbuf.QRname);
+               return;
+       }
+       
+       /* 
+        * Ok, now enter the unsubscribe-pending entry.
+        */
+       begin_critical_section(S_NETCONFIGS);
+       ncfp = fopen(filename, "a");
+       if (ncfp != NULL) {
+               fprintf(ncfp, "unsubpending|%s|%s|%ld|%s\n",
+                       email,
+                       token,
+                       time(NULL),
+                       webpage
+               );
+               fclose(ncfp);
+       }
+       end_critical_section(S_NETCONFIGS);
+
+       /* Generate and send the confirmation request */
+
+       urlesc(urlroom, qrbuf.QRname);
+
+       snprintf(confirmation_request, sizeof confirmation_request,
+               "Content-type: text/html\n\n"
+               "<HTML><BODY>"
+               "Someone (probably you) has submitted a request "
+               "to unsubscribe\n"
+               "&lt;%s&gt; from the <B>%s</B> mailing list.<BR><BR>\n"
+               "Please click here to confirm this request:<BR>\n"
+               "<A HREF=\"http://%s?room=%s&token=%s&cmd=confirm\">"
+               "http://%s?room=%s&token=%s&cmd=confirm</A><BR><BR>\n"
+               "If this request has been submitted in error and you do\n"
+               "<i>not</i> wish to unsubscribe from the "
+               "'%s' mailing list, simply do nothing,\n"
+               "and you will remain subscribed to the list.\n"
+               "</BODY></HTML>\n",
+
+               email, qrbuf.QRname,
+               webpage, urlroom, token,
+               webpage, urlroom, token,
+               qrbuf.QRname
+       );
+
+       quickie_message(        /* This delivers the message */
+               "Citadel",
+               email,
+               NULL,
+               confirmation_request,
+               FMT_RFC822,
+               "Please confirm your unsubscribe request"
+       );
+
+       cprintf("%d Unubscription noted; confirmation request sent\n", CIT_OK);
 }
 
 
@@ -131,14 +318,59 @@ void do_confirm(char *room, char *token) {
        char email[SIZ];
        char subtype[SIZ];
        int success = 0;
+       char address_to_unsubscribe[SIZ];
+       char scancmd[SIZ];
+       char scanemail[SIZ];
+       char *holdbuf = NULL;
+       int linelen = 0;
+       int buflen = 0;
+       char success_message[SIZ];
+       char success_message_to[SIZ];
+       char address_of_list[SIZ];
+       int i;
+
+       strcpy(address_to_unsubscribe, "");
+       strcpy(success_message_to, "");
 
        if (getroom(&qrbuf, room) != 0) {
-               cprintf("%d There is no list called '%s'\n", ERROR, room);
+               cprintf("%d There is no list called '%s'\n",
+                       ERROR+ROOM_NOT_FOUND, room);
                return;
        }
 
-       begin_critical_section(S_NETCONFIGS);
+       if ((qrbuf.QRflags2 & QR2_SELFLIST) == 0) {
+               cprintf("%d '%s' "
+                       "does not accept subscribe/unsubscribe requests.\n",
+                       ERROR+HIGHER_ACCESS_REQUIRED, qrbuf.QRname);
+               return;
+       }
+
+       /*
+        * We'll just have this success message ready if we need it
+        */
+       sprintf(address_of_list, "room_%s@%s", qrbuf.QRname, config.c_fqdn);
+       for (i=0; i<strlen(address_of_list); ++i) {
+               if (isspace(address_of_list[i])) {
+                       address_of_list[i] = '_';
+               }
+       }
+       snprintf(success_message, sizeof success_message,
+               "Content-type: text/html\n\n"
+               "<HTML><BODY>"
+               "You have successfully subscribed to the <B>%s</B>\n"
+               "mailing list.<BR><BR>To post to the list, simply send "
+               "an e-mail to <TT>%s</TT>"
+               "</BODY></HTML>\n",
+               qrbuf.QRname,
+               address_of_list
+       );
+
+       /*
+        * Now start scanning this room's netconfig file for the
+        * specified token.
+        */
        assoc_file_name(filename, sizeof filename, &qrbuf, "netconfigs");
+       begin_critical_section(S_NETCONFIGS);
        ncfp = fopen(filename, "r+");
        if (ncfp != NULL) {
                while (line_offset = ftell(ncfp),
@@ -169,6 +401,13 @@ void do_confirm(char *room, char *token) {
                                        fseek(ncfp, line_offset, SEEK_SET);
                                        fprintf(ncfp, "%s\n", buf);
                                        ++success;
+                                       strcpy(success_message_to, email);
+                               }
+                       }
+                       if (!strcasecmp(cmd, "unsubpending")) {
+                               extract(line_token, buf, 2);
+                               if (!strcasecmp(token, line_token)) {
+                                       extract(address_to_unsubscribe, buf, 1);
                                }
                        }
                }
@@ -176,6 +415,77 @@ void do_confirm(char *room, char *token) {
        }
        end_critical_section(S_NETCONFIGS);
 
+       /*
+        * If "address_to_unsubscribe" contains something, then we have to
+        * make another pass at the file, stripping out lines referring to
+        * that address.
+        */
+       if (strlen(address_to_unsubscribe) > 0) {
+               holdbuf = mallok(SIZ);
+               begin_critical_section(S_NETCONFIGS);
+               ncfp = fopen(filename, "r+");
+               if (ncfp != NULL) {
+                       while (line_offset = ftell(ncfp),
+                             (fgets(buf, sizeof buf, ncfp) != NULL) ) {
+                               buf[strlen(buf)-1]=0;
+                               extract(scancmd, buf, 0);
+                               extract(scanemail, buf, 1);
+                               if ( (!strcasecmp(scancmd, "listrecp"))
+                                  && (!strcasecmp(scanemail,
+                                               address_to_unsubscribe)) ) {
+                                       ++success;
+                               }
+                               else if ( (!strcasecmp(scancmd, "digestrecp"))
+                                  && (!strcasecmp(scanemail,
+                                               address_to_unsubscribe)) ) {
+                                       ++success;
+                               }
+                               else if ( (!strcasecmp(scancmd, "subpending"))
+                                  && (!strcasecmp(scanemail,
+                                               address_to_unsubscribe)) ) {
+                                       ++success;
+                               }
+                               else if ( (!strcasecmp(scancmd, "unsubpending"))
+                                  && (!strcasecmp(scanemail,
+                                               address_to_unsubscribe)) ) {
+                                       ++success;
+                               }
+                               else {  /* Not relevant, so *keep* it! */
+                                       linelen = strlen(buf);
+                                       holdbuf = reallok(holdbuf,
+                                               (buflen + linelen + 2) );
+                                       strcpy(&holdbuf[buflen], buf);
+                                       buflen += linelen;
+                                       strcpy(&holdbuf[buflen], "\n");
+                                       buflen += 1;
+                               }
+                       }
+                       fclose(ncfp);
+               }
+               ncfp = fopen(filename, "w");
+               if (ncfp != NULL) {
+                       fwrite(holdbuf, buflen+1, 1, ncfp);
+                       fclose(ncfp);
+               }
+               end_critical_section(S_NETCONFIGS);
+               phree(holdbuf);
+       }
+
+       /* Let 'em know it succeeded, and how to post to the list. */
+       if (strlen(success_message_to) > 0) {
+               quickie_message(
+                       "Citadel",
+                       success_message_to,
+                       NULL,
+                       success_message,
+                       FMT_RFC822,
+                       "Your subscription is complete"
+               );
+       }
+
+       /*
+        * Did we do anything useful today?
+        */
        if (success) {
                cprintf("%d %d operation(s) confirmed.\n", CIT_OK, success);
        }
@@ -197,22 +507,28 @@ void cmd_subs(char *cmdbuf) {
        char email[SIZ];
        char subtype[SIZ];
        char token[SIZ];
+       char webpage[SIZ];
 
        extract(opr, cmdbuf, 0);
        if (!strcasecmp(opr, "subscribe")) {
                extract(subtype, cmdbuf, 3);
                if ( (strcasecmp(subtype, "list"))
                   && (strcasecmp(subtype, "digest")) ) {
-                       cprintf("%d Invalid subscription type.\n", ERROR);
+                       cprintf("%d Invalid subscription type '%s'\n",
+                               ERROR+ILLEGAL_VALUE, subtype);
                }
                else {
                        extract(room, cmdbuf, 1);
                        extract(email, cmdbuf, 2);
-                       do_subscribe(room, email, subtype);
+                       extract(webpage, cmdbuf, 4);
+                       do_subscribe(room, email, subtype, webpage);
                }
        }
        else if (!strcasecmp(opr, "unsubscribe")) {
-               cprintf("%d not yet implemented\n", ERROR);
+               extract(room, cmdbuf, 1);
+               extract(email, cmdbuf, 2);
+               extract(webpage, cmdbuf, 3);
+               do_unsubscribe(room, email, webpage);
        }
        else if (!strcasecmp(opr, "confirm")) {
                extract(room, cmdbuf, 1);