]> code.citadel.org Git - citadel.git/blobdiff - citadel/user_ops.c
* citserver.c, msgbase.c, user_ops.c: hide the owner-prefix of mail
[citadel.git] / citadel / user_ops.c
index 65de3d3299759932f5598041abf134db8226cc8c..212ac5d63fcd3f04357730056187e6b441800792 100644 (file)
@@ -1,7 +1,11 @@
+/* $Id$ */
+
 /* needed to properly enable crypt() stuff on some systems */
 #define _XOPEN_SOURCE
 /* needed for str[n]casecmp() on some systems if the above is defined */
 #define _XOPEN_SOURCE_EXTENDED
+/* needed to enable threads on some systems if the above are defined */
+#define _POSIX_C_SOURCE 199506L
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -13,6 +17,7 @@
 #include <sys/time.h>
 #include <string.h>
 #include <syslog.h>
+#include <limits.h>
 #include <pthread.h>
 #include "citadel.h"
 #include "server.h"
@@ -27,6 +32,7 @@
 #include "msgbase.h"
 #include "config.h"
 #include "dynloader.h"
+#include "sysdep.h"
 
 
 /*
@@ -192,7 +198,69 @@ void CtdlGetRelationship(struct visit *vbuf,
        
        free(visits);
        }
+
+
+void PurgeStaleRelationships(void) {
+
+       struct cdbdata *cdbvisit;
+       struct visit *visits;
+       struct quickroom qrbuf;
+       int num_visits;
+       int a, purge;
+
+       cdbvisit = cdb_fetch(CDB_VISIT, &CC->usersupp.usernum, sizeof(long));
+       if (cdbvisit != NULL) {
+               if ((num_visits = cdbvisit->len / sizeof(struct visit)) == 0) {
+                       cdb_free(cdbvisit);
+                       return;
+                       }
+               visits = (struct visit *)
+                       malloc(num_visits * sizeof(struct visit));
+               memcpy(visits, cdbvisit->ptr,
+                       (num_visits * sizeof(struct visit)));
+               cdb_free(cdbvisit);
+               }
+       else return;
+
+       for (a=0; a<num_visits; ++a) {
+               if (getroom(&qrbuf, visits[a].v_roomname)!=0) {
+                       purge = 1;
+                       }
+               else if (qrbuf.QRgen != visits[a].v_generation) {
+                       purge = 1;
+                       }
+               else {
+                       purge = 0;
+                       }
+
+               /*
+               lprintf(9, "U/R REL: <%s> <%ld> <%ld> <%d> %s\n",
+                       visits[a].v_roomname,
+                       visits[a].v_generation,
+                       visits[a].v_lastseen,
+                       visits[a].v_flags,
+                       (purge ? "**purging**" : "") );
+               */
+
+               if (purge) {
+                       memcpy(&visits[a], &visits[a+1],
+                               (((num_visits-a)-1) * sizeof(struct visit)) );
+                       --num_visits;
+                       }
+
+               }
        
+       cdb_store(CDB_VISIT, &CC->usersupp.usernum, sizeof(long),
+                       visits, (num_visits * sizeof(struct visit)));
+       free(visits);
+       }
+
+
+
+void MailboxName(char *buf, struct usersupp *who, char *prefix) {
+       sprintf(buf, "%010ld.%s", who->usernum, prefix);
+       }
+
        
 /*
  * Is the user currently logged in an Aide?
@@ -293,9 +361,6 @@ void cmd_user(char *cmdbuf)
  * session startup code which is common to both cmd_pass() and cmd_newu()
  */
 void session_startup(void) {
-       int a;
-       struct quickroom qr;
-
        syslog(LOG_NOTICE,"user <%s> logged in",CC->curr_user);
 
        lgetuser(&CC->usersupp,CC->curr_user);
@@ -314,17 +379,6 @@ void session_startup(void) {
                CC->usersupp.axlevel = 6;
                }
 
- /******************************************************************************/
- /* FIX  It is safe to remove this segment during the cutover                  */
-       for (a=0; a<MAXROOMS; ++a) {
-               getroom(&qr,a);
-               if (CC->usersupp.generation[a] != qr.QRgen)
-                                       CC->usersupp.generation[a]=(-1);
-               if (CC->usersupp.forget[a] != qr.QRgen)
-                                       CC->usersupp.forget[a]=(-1);
-               }
- /******************************************************************************/
-
        lputuser(&CC->usersupp,CC->curr_user);
 
         /* Run any cleanup routines registered by loadable modules */
@@ -333,7 +387,7 @@ void session_startup(void) {
        cprintf("%d %s|%d|%d|%d|%u|%ld\n",OK,CC->usersupp.fullname,CC->usersupp.axlevel,
                CC->usersupp.timescalled,CC->usersupp.posted,CC->usersupp.flags,
                CC->usersupp.usernum);
-       usergoto(0,0);          /* Enter the lobby */   
+       usergoto(BASEROOM,0);           /* Enter the lobby */   
        rec_log(CL_LOGIN,CC->curr_user);
        }
 
@@ -413,42 +467,41 @@ void cmd_pass(char *buf)
 /*
  * Delete a user record *and* all of its related resources.
  */
-int purge_user(char *pname) {
+int purge_user(char pname[]) {
        char filename[64];
+       char mailboxname[ROOMNAMELEN];
        struct usersupp usbuf;
+       struct quickroom qrbuf;
+       char lowercase_name[32];
        int a;
-       struct cdbdata *cdbmb;
-       long *mailbox;
-       int num_mails;
+
+       for (a=0; a<=strlen(pname); ++a) {
+               lowercase_name[a] = tolower(pname[a]);
+               }
 
        if (getuser(&usbuf, pname) != 0) {
                lprintf(5, "Cannot purge user <%s> - not found\n", pname);
                return(ERROR+NO_SUCH_USER);
                }
 
+       lprintf(5, "Deleting user <%s>\n", pname);
+
        /* FIX   Don't delete a user who is currently logged in. */
 
        /* Perform any purge functions registered by server extensions */
        PerformUserHooks(usbuf.fullname, usbuf.usernum, EVT_PURGEUSER);
 
-       /* delete any messages in the user's mailbox */
-       cdbmb = cdb_fetch(CDB_MAILBOXES, &usbuf.usernum, sizeof(long));
-       if (cdbmb != NULL) {
-               num_mails = cdbmb->len / sizeof(long);
-               mailbox = (long *) cdbmb->ptr;
-               if (num_mails > 0) for (a=0; a<num_mails; ++a) {
-                       cdb_delete(CDB_MSGMAIN, &mailbox[a], sizeof(long));
-                       }
-               cdb_free(cdbmb);
-               /* now delete the mailbox itself */
-               cdb_delete(CDB_MAILBOXES, &usbuf.usernum, sizeof(long));
-               }
-
        /* delete any existing user/room relationships */
        cdb_delete(CDB_VISIT, &usbuf.usernum, sizeof(long));
 
+       /* Delete the user's mailbox and its contents */
+       MailboxName(mailboxname, &usbuf, MAILROOM);
+       if (getroom(&qrbuf, mailboxname)==0) {
+               delete_room(&qrbuf);
+               }
+
        /* delete the userlog entry */
-       cdb_delete(CDB_USERSUPP, pname, strlen(pname));
+       cdb_delete(CDB_USERSUPP, lowercase_name, strlen(lowercase_name));
 
        /* remove the user's bio file */        
        sprintf(filename, "./bio/%ld", usbuf.usernum);
@@ -471,6 +524,7 @@ int create_user(char *newusername)
        int a;
        struct passwd *p = NULL;
        char username[64];
+       char mailboxname[ROOMNAMELEN];
 
        strcpy(username, newusername);
        strproc(username);
@@ -498,15 +552,6 @@ int create_user(char *newusername)
        strcpy(CC->usersupp.password,"");
        (CC->logged_in) = 1;
 
-       /********************************************************/
-       /* FIX this can safely be removed during the cutover... */
-       for (a=0; a<MAXROOMS; ++a) {
-               CC->usersupp.lastseen[a]=0L;
-               CC->usersupp.generation[a]=(-1);
-               CC->usersupp.forget[a]=(-1);
-               }
-       /********************************************************/
-
        /* These are the default flags on new accounts */
        CC->usersupp.flags =
                US_NEEDVALID|US_LASTOLD|US_DISAPPEAR|US_PAGINATOR|US_FLOORS;
@@ -536,6 +581,11 @@ int create_user(char *newusername)
        if (getuser(&CC->usersupp,CC->curr_user)) {
                return(ERROR+INTERNAL_ERROR);
                }
+
+       /* give the user a private mailbox */
+       MailboxName(mailboxname, &CC->usersupp, MAILROOM);
+       create_room(mailboxname, 4, "", 0);
+
        rec_log(CL_NEWUSER,CC->curr_user);
        return(0);
        }
@@ -680,16 +730,8 @@ void cmd_slrp(char *new_ptr)
                return;
                }
 
-       if (CC->curr_rm < 0) {
-               cprintf("%d No current room.\n",ERROR);
-               return;
-               }
-
        if (!strncasecmp(new_ptr,"highest",7)) {
                newlr = CC->quickroom.QRhighest;
-/* FIX ... if the current room is 1 (Mail), newlr needs to be set to the
- * number of the highest mail message
- */
                }
        else {
                newlr = atol(new_ptr);
@@ -697,10 +739,6 @@ void cmd_slrp(char *new_ptr)
 
        lgetuser(&CC->usersupp, CC->curr_user);
 
-       /* old method - remove */
-       CC->usersupp.lastseen[CC->curr_rm] = newlr;
-
-       /* new method */
        CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
        vbuf.v_lastseen = newlr;
        CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
@@ -725,24 +763,12 @@ void cmd_invt_kick(char *iuser, int op)
                return;
                }
 
-       if (CC->curr_rm < 0) {
-               cprintf("%d No current room.\n",ERROR);
-               return;
-               }
-
        if (is_room_aide()==0) {
                cprintf("%d Higher access required.\n",
                        ERROR+HIGHER_ACCESS_REQUIRED);
                return;
                }
 
-       /* FIX - with the new relationships scheme we can lock users out,
-          so it'll make sense to remove this routine */
-       if ( (op==1) && ((CC->quickroom.QRflags&QR_PRIVATE)==0) ) {
-               cprintf("%d Not a private room.\n",ERROR+NOT_HERE);
-               return;
-               }
-
        if (lgetuser(&USscratch,iuser)!=0) {
                cprintf("%d No such user.\n",ERROR);
                return;
@@ -751,21 +777,11 @@ void cmd_invt_kick(char *iuser, int op)
        CtdlGetRelationship(&vbuf, &USscratch, &CC->quickroom);
 
        if (op==1) {
-               /* old method -- FIX remove this when we're ready */
-               USscratch.generation[CC->curr_rm]=CC->quickroom.QRgen;
-               USscratch.forget[CC->curr_rm]=(-1);
-
-               /* new method */
                vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
                vbuf.v_flags = vbuf.v_flags | V_ACCESS;
                }
 
        if (op==0) {
-               /* old method -- FIX remove this when we're ready */
-               USscratch.generation[CC->curr_rm]=(-1);
-               USscratch.forget[CC->curr_rm]=CC->quickroom.QRgen;
-
-               /* new method */
                vbuf.v_flags = vbuf.v_flags & ~V_ACCESS;
                vbuf.v_flags = vbuf.v_flags | V_FORGET | V_LOCKOUT;
                }
@@ -782,12 +798,10 @@ void cmd_invt_kick(char *iuser, int op)
                CC->usersupp.fullname);
        aide_message(bbb);
 
-       if ((op==0)&&((CC->quickroom.QRflags&QR_PRIVATE)==0)) {
-               cprintf("%d Ok. (Not a private room, <Z>ap effect only)\n",OK);
-               }
-       else {
-               cprintf("%d Ok.\n",OK);
-               }
+       cprintf("%d %s %s %s.\n",
+               OK, iuser,
+               ((op == 1) ? "invited to" : "kicked out of"),
+               CC->quickroom.QRname);
        return;
        }
 
@@ -803,16 +817,6 @@ void cmd_forg(void) {
                return;
                }
 
-       if (CC->curr_rm < 0) {
-               cprintf("%d No current room.\n",ERROR);
-               return;
-               }
-
-       if (CC->curr_rm < 3) {
-               cprintf("%d You cannot forget this room.\n",ERROR+NOT_HERE);
-               return;
-               }
-
        if (is_aide()) {
                cprintf("%d Aides cannot forget rooms.\n",ERROR);
                return;
@@ -821,17 +825,12 @@ void cmd_forg(void) {
        lgetuser(&CC->usersupp,CC->curr_user);
        CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
 
-       /* old method -- FIX remove this when we're ready */
-       CC->usersupp.forget[CC->curr_rm] = CC->quickroom.QRgen;
-       CC->usersupp.generation[CC->curr_rm] = (-1);
-
-       /* new method */
        vbuf.v_flags = vbuf.v_flags | V_FORGET;
 
        CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
        lputuser(&CC->usersupp,CC->curr_user);
        cprintf("%d Ok\n",OK);
-       CC->curr_rm = (-1);
+       usergoto(BASEROOM, 0);
        }
 
 /*
@@ -1275,7 +1274,7 @@ void cmd_agup(char *cmdbuf) {
                return;
                }
 
-       cprintf("%d %s|%s|%u|%d|%d|%d|%ld\n", 
+       cprintf("%d %s|%s|%u|%d|%d|%d|%ld|%d\n", 
                OK,
                usbuf.fullname,
                usbuf.password,
@@ -1283,8 +1282,8 @@ void cmd_agup(char *cmdbuf) {
                usbuf.timescalled,
                usbuf.posted,
                (int)usbuf.axlevel,
-               usbuf.usernum);
-
+               usbuf.usernum,
+               usbuf.USuserpurge);
        }
 
 
@@ -1322,6 +1321,9 @@ void cmd_asup(char *cmdbuf) {
                        usbuf.axlevel = extract_int(cmdbuf, 5);
                        }
                }
+       if (np > 7) {
+               usbuf.USuserpurge = extract_int(cmdbuf, 7);
+               }
 
        lputuser(&usbuf, requested_user);
        if (usbuf.axlevel == 0) {
@@ -1338,20 +1340,23 @@ void cmd_asup(char *cmdbuf) {
  */
 int NewMailCount() {
        int num_newmsgs = 0;
-       struct cdbdata *cdbmb;
-       int num_mails;
-       long *mailbox;
        int a;
+       char mailboxname[32];
+       struct quickroom mailbox;
+       struct visit vbuf;
+
+       MailboxName(mailboxname, &CC->usersupp, MAILROOM);
+       if (getroom(&mailbox, mailboxname)!=0) return(0);
+       CtdlGetRelationship(&vbuf, &CC->usersupp, &mailbox);
 
-       cdbmb = cdb_fetch(CDB_MAILBOXES, &CC->usersupp.usernum, sizeof(long));
-       if (cdbmb != NULL) {
-               num_mails = cdbmb->len / sizeof(long);
-               mailbox = (long *) cdbmb->ptr;
-               if (num_mails > 0) for (a=0; a<num_mails; ++a) {
-                       if (mailbox[a] > (CC->usersupp.lastseen[1]))
+       get_msglist(&mailbox);
+       for (a=0; a<CC->num_msgs; ++a) {
+               if (MessageFromList(a)>0L) {
+                       if (MessageFromList(a) > vbuf.v_lastseen) {
                                ++num_newmsgs;
+                               }
                        }
-               cdb_free(cdbmb);
                }
+
        return(num_newmsgs);
        }