X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Froom_ops.c;h=25d335220fd1eb5d4de9b82155873e84dbd58cd3;hb=63262a64633e72e4096aaeedda6950c02fb4d990;hp=058b3ac4503fbc94c074fc95a774551e65b5d679;hpb=75d8e596bc3472cf72051040d2586180c1a45faa;p=citadel.git diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 058b3ac45..25d335220 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -5,10 +5,6 @@ * */ -#ifdef DLL_EXPORT -#define IN_LIBCIT -#endif - #include "sysdep.h" #include #include @@ -16,6 +12,7 @@ #include #include #include +#include /* for cmd_rdir to read contents of the directory */ #if TIME_WITH_SYS_TIME # include @@ -31,32 +28,38 @@ #include #include #include "citadel.h" +#include #include "server.h" -#include "serv_extensions.h" #include "database.h" #include "config.h" #include "room_ops.h" #include "sysdep_decls.h" #include "support.h" -#include "user_ops.h" #include "msgbase.h" #include "citserver.h" #include "control.h" -#include "tools.h" +#include "citadel_dirs.h" +#include "threads.h" + +#include "ctdl_module.h" +#include "user_ops.h" struct floor *floorcache[MAXFLOORS]; /* - * Generic routine for determining user access to rooms + * Retrieve access control information for any user/room pair */ -int CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf) +void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf, + int *result, int *view) { int retval = 0; - struct visit vbuf; + visit vbuf; /* for internal programs, always do everything */ if (((CC->internal_pgm)) && (roombuf->QRflags & QR_INUSE)) { - return (UA_KNOWN | UA_GOTOALLOWED); + retval = (UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED); + vbuf.v_view = 0; + goto SKIP_EVERYTHING; } /* Locate any applicable user/room relationships */ @@ -64,8 +67,8 @@ int CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf) /* Force the properties of the Aide room */ if (!strcasecmp(roombuf->QRname, config.c_aideroom)) { - if (userbuf->axlevel >= 6) { - retval = UA_KNOWN | UA_GOTOALLOWED; + if (userbuf->axlevel >= AxAideU) { + retval = UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED; } else { retval = 0; } @@ -80,7 +83,7 @@ int CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf) /* If this is a preferred users only room, check access level */ if (roombuf->QRflags & QR_PREFONLY) { - if (userbuf->axlevel < 5) { + if (userbuf->axlevel < AxPrefU) { retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED; } } @@ -103,17 +106,45 @@ int CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf) } } - /* For mailbox rooms, also check the generation number matchups */ + /* For mailbox rooms, also check the namespace */ + /* Also, mailbox owners can delete their messages */ if (roombuf->QRflags & QR_MAILBOX) { if (userbuf->usernum == atol(roombuf->QRname)) { - retval = retval | UA_KNOWN | UA_GOTOALLOWED; + retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED; } /* An explicit match means the user belongs in this room */ if (vbuf.v_flags & V_ACCESS) { - retval = retval | UA_KNOWN | UA_GOTOALLOWED; + retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED; } } + /* For non-mailbox rooms... */ + else { + + /* User is allowed to post in the room unless: + * - User is not validated + * - User has no net privileges and it is a shared network room + * - It is a read-only room + */ + int post_allowed = 1; + if (CC->user.axlevel < AxProbU) post_allowed = 0; + if ((CC->user.axlevel < AxNetU) && (CC->room.QRflags & QR_NETWORK)) post_allowed = 0; + if (roombuf->QRflags & QR_READONLY) post_allowed = 0; + if (post_allowed) { + retval = retval | UA_POSTALLOWED; + } + + /* If "collaborative deletion" is active for this room, any user who can post + * is also allowed to delete + */ + if (CC->room.QRflags2 & QR2_COLLABDEL) { + if (retval & UA_POSTALLOWED) { + retval = retval | UA_DELETEALLOWED; + } + } + + } + /* Check to see if the user has forgotten this room */ if (vbuf.v_flags & V_FORGET) { retval = retval & ~UA_KNOWN; @@ -126,29 +157,37 @@ int CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf) } /* If user is explicitly locked out of this room, deny everything */ if (vbuf.v_flags & V_LOCKOUT) { - retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED; + retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED & ~UA_POSTALLOWED; } /* Aides get access to all private rooms */ - if ( (userbuf->axlevel >= 6) + if ( (userbuf->axlevel >= AxAideU) && ((roombuf->QRflags & QR_MAILBOX) == 0) ) { if (vbuf.v_flags & V_FORGET) { - retval = retval | UA_GOTOALLOWED; + retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED; } else { - retval = retval | UA_KNOWN | UA_GOTOALLOWED; + retval = retval | UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED; } } - /* On some systems, Aides can gain access to mailboxes as well */ - if ( (config.c_aide_mailboxes) - && (userbuf->axlevel >= 6) + /* Aides can gain access to mailboxes as well, but they don't show + * by default. + */ + if ( (userbuf->axlevel >= AxAideU) && (roombuf->QRflags & QR_MAILBOX) ) { - retval = retval | UA_GOTOALLOWED; + retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED; + } + + /* Aides and Room Aides have admin privileges */ + if ( (userbuf->axlevel >= AxAideU) + || (userbuf->usernum == roombuf->QRroomaide) + ) { + retval = retval | UA_ADMINALLOWED | UA_DELETEALLOWED | UA_POSTALLOWED; } NEWMSG: /* By the way, we also check for the presence of new messages */ - if (is_msg_in_mset(vbuf.v_seen, roombuf->QRhighest) == 0) { + if (is_msg_in_sequence_set(vbuf.v_seen, roombuf->QRhighest) == 0) { retval = retval | UA_HASNEWMSGS; } @@ -156,7 +195,11 @@ NEWMSG: /* By the way, we also check for the presence of new messages */ if (roombuf->QRflags2 & QR2_SYSTEM) { retval = retval & ~UA_KNOWN; } - return (retval); + +SKIP_EVERYTHING: + /* Now give the caller the information it wants. */ + if (result != NULL) *result = retval; + if (view != NULL) *view = vbuf.v_view; } /* @@ -179,19 +222,23 @@ void room_sanity_check(struct ctdlroom *qrbuf) /* - * getroom() - retrieve room data from disk + * CtdlGetRoom() - retrieve room data from disk */ -int getroom(struct ctdlroom *qrbuf, char *room_name) +int CtdlGetRoom(struct ctdlroom *qrbuf, char *room_name) { struct cdbdata *cdbqr; char lowercase_name[ROOMNAMELEN]; char personal_lowercase_name[ROOMNAMELEN]; - int a; + char *dptr, *sptr, *eptr; - for (a = 0; room_name[a] && a < sizeof lowercase_name - 1; ++a) { - lowercase_name[a] = tolower(room_name[a]); + dptr = lowercase_name; + sptr = room_name; + eptr = (dptr + (sizeof lowercase_name - 1)); + while (!IsEmptyStr(sptr) && (dptr < eptr)){ + *dptr = tolower(*sptr); + sptr++; dptr++; } - lowercase_name[a] = 0; + *dptr = '\0'; memset(qrbuf, 0, sizeof(struct ctdlroom)); @@ -223,12 +270,12 @@ int getroom(struct ctdlroom *qrbuf, char *room_name) } /* - * lgetroom() - same as getroom() but locks the record (if supported) + * CtdlGetRoomLock() - same as getroom() but locks the record (if supported) */ -int lgetroom(struct ctdlroom *qrbuf, char *room_name) +int CtdlGetRoomLock(struct ctdlroom *qrbuf, char *room_name) { register int retval; - retval = getroom(qrbuf, room_name); + retval = CtdlGetRoom(qrbuf, room_name); if (retval == 0) begin_critical_section(S_ROOMS); return(retval); } @@ -241,28 +288,36 @@ int lgetroom(struct ctdlroom *qrbuf, char *room_name) void b_putroom(struct ctdlroom *qrbuf, char *room_name) { char lowercase_name[ROOMNAMELEN]; - int a; + char *aptr, *bptr; + long len; - for (a = 0; a <= strlen(room_name); ++a) { - lowercase_name[a] = tolower(room_name[a]); + aptr = room_name; + bptr = lowercase_name; + while (!IsEmptyStr(aptr)) + { + *bptr = tolower(*aptr); + aptr++; + bptr++; } + *bptr='\0'; + len = bptr - lowercase_name; if (qrbuf == NULL) { cdb_delete(CDB_ROOMS, - lowercase_name, strlen(lowercase_name)); + lowercase_name, len); } else { time(&qrbuf->QRmtime); cdb_store(CDB_ROOMS, - lowercase_name, strlen(lowercase_name), + lowercase_name, len, qrbuf, sizeof(struct ctdlroom)); } } /* - * putroom() - store room data to disk + * CtdlPutRoom() - store room data to disk */ -void putroom(struct ctdlroom *qrbuf) { +void CtdlPutRoom(struct ctdlroom *qrbuf) { b_putroom(qrbuf, qrbuf->QRname); } @@ -277,22 +332,78 @@ void b_deleteroom(char *room_name) { /* - * lputroom() - same as putroom() but unlocks the record (if supported) + * CtdlPutRoomLock() - same as CtdlPutRoom() but unlocks the record (if supported) */ -void lputroom(struct ctdlroom *qrbuf) +void CtdlPutRoomLock(struct ctdlroom *qrbuf) { - putroom(qrbuf); + CtdlPutRoom(qrbuf); end_critical_section(S_ROOMS); } /****************************************************************************/ + /* - * getfloor() - retrieve floor data from disk + * CtdlGetFloorByName() - retrieve the number of the named floor + * return < 0 if not found else return floor number */ -void getfloor(struct floor *flbuf, int floor_num) +int CtdlGetFloorByName(const char *floor_name) +{ + int a; + struct floor *flbuf = NULL; + + for (a = 0; a < MAXFLOORS; ++a) { + flbuf = CtdlGetCachedFloor(a); + + /* check to see if it already exists */ + if ((!strcasecmp(flbuf->f_name, floor_name)) + && (flbuf->f_flags & F_INUSE)) { + return a; + } + } + return -1; +} + + + +/* + * CtdlGetFloorByNameLock() - retrieve floor number for given floor and lock the floor list. + */ +int CtdlGetFloorByNameLock(const char *floor_name) +{ + begin_critical_section(S_FLOORTAB); + return CtdlGetFloorByName(floor_name); +} + + + +/* + * CtdlGetAvailableFloor() - Return number of first unused floor + * return < 0 if none available + */ +int CtdlGetAvailableFloor(void) +{ + int a; + struct floor *flbuf = NULL; + + for (a = 0; a < MAXFLOORS; a++) { + flbuf = CtdlGetCachedFloor(a); + + /* check to see if it already exists */ + if ((flbuf->f_flags & F_INUSE) == 0) { + return a; + } + } + return -1; +} + + +/* + * CtdlGetFloor() - retrieve floor data from disk + */ +void CtdlGetFloor(struct floor *flbuf, int floor_num) { struct cdbdata *cdbfl; @@ -315,35 +426,48 @@ void getfloor(struct floor *flbuf, int floor_num) } /* - * lgetfloor() - same as getfloor() but locks the record (if supported) + * lgetfloor() - same as CtdlGetFloor() but locks the record (if supported) */ void lgetfloor(struct floor *flbuf, int floor_num) { begin_critical_section(S_FLOORTAB); - getfloor(flbuf, floor_num); + CtdlGetFloor(flbuf, floor_num); } /* - * cgetfloor() - Get floor record from *cache* (loads from disk if needed) + * CtdlGetCachedFloor() - Get floor record from *cache* (loads from disk if needed) * * This is strictly a performance hack. */ -struct floor *cgetfloor(int floor_num) { +struct floor *CtdlGetCachedFloor(int floor_num) { static int initialized = 0; int i; + int fetch_new = 0; + struct floor *fl = NULL; + begin_critical_section(S_FLOORCACHE); if (initialized == 0) { for (i=0; i (*(const long *)m2)) return(1); + if ((*(const long *)m1) < (*(const long *)m2)) return(-1); + return(0); +} + /* * sort message pointers @@ -431,29 +578,19 @@ void delete_msglist(struct ctdlroom *whichroom) */ int sort_msglist(long listptrs[], int oldcount) { - int a, b; - long hold1, hold2; int numitems; numitems = oldcount; - if (numitems < 2) + if (numitems < 2) { return (oldcount); + } /* do the sort */ - for (a = numitems - 2; a >= 0; --a) { - for (b = 0; b <= a; ++b) { - if (listptrs[b] > (listptrs[b + 1])) { - hold1 = listptrs[b]; - hold2 = listptrs[b + 1]; - listptrs[b] = hold2; - listptrs[b + 1] = hold1; - } - } - } + qsort(listptrs, numitems, sizeof(long), sort_msglist_cmp); /* and yank any nulls */ while ((numitems > 0) && (listptrs[0] == 0L)) { - memcpy(&listptrs[0], &listptrs[1], + memmove(&listptrs[0], &listptrs[1], (sizeof(long) * (numitems - 1))); --numitems; } @@ -465,7 +602,7 @@ int sort_msglist(long listptrs[], int oldcount) /* * Determine whether a given room is non-editable. */ -int is_noneditable(struct ctdlroom *qrbuf) +int CtdlIsNonEditable(struct ctdlroom *qrbuf) { /* Mail> rooms are non-editable */ @@ -482,15 +619,15 @@ int is_noneditable(struct ctdlroom *qrbuf) /* * Back-back-end for all room listing commands */ -void list_roomname(struct ctdlroom *qrbuf, int ra) +void list_roomname(struct ctdlroom *qrbuf, int ra, int current_view, int default_view) { char truncated_roomname[ROOMNAMELEN]; /* For my own mailbox rooms, chop off the owner prefix */ if ( (qrbuf->QRflags & QR_MAILBOX) && (atol(qrbuf->QRname) == CC->user.usernum) ) { - strcpy(truncated_roomname, qrbuf->QRname); - strcpy(truncated_roomname, &truncated_roomname[11]); + safestrncpy(truncated_roomname, qrbuf->QRname, sizeof truncated_roomname); + safestrncpy(truncated_roomname, &truncated_roomname[11], sizeof truncated_roomname); cprintf("%s", truncated_roomname); } /* For all other rooms, just display the name in its entirety */ @@ -499,12 +636,15 @@ void list_roomname(struct ctdlroom *qrbuf, int ra) } /* ...and now the other parameters */ - cprintf("|%u|%d|%d|%d|%d|\n", + cprintf("|%u|%d|%d|%d|%d|%d|%d|%ld|\n", qrbuf->QRflags, (int) qrbuf->QRfloor, (int) qrbuf->QRorder, (int) qrbuf->QRflags2, - ra + ra, + current_view, + default_view, + qrbuf->QRmtime ); } @@ -516,31 +656,32 @@ void cmd_lrms_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); int ra; + int view; FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->user); + CtdlRoomAccess(qrbuf, &CC->user, &ra, &view); if ((( ra & (UA_KNOWN | UA_ZAPPED))) && ((qrbuf->QRfloor == (FloorBeingSearched)) || ((FloorBeingSearched) < 0))) - list_roomname(qrbuf, ra); + list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview); } void cmd_lrms(char *argbuf) { int FloorBeingSearched = (-1); - if (strlen(argbuf) > 0) + if (!IsEmptyStr(argbuf)) FloorBeingSearched = extract_int(argbuf, 0); if (CtdlAccessCheck(ac_logged_in)) return; - if (getuser(&CC->user, CC->curr_user)) { + if (CtdlGetUser(&CC->user, CC->curr_user)) { cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); return; } cprintf("%d Accessible rooms:\n", LISTING_FOLLOWS); - ForEachRoom(cmd_lrms_backend, &FloorBeingSearched); + CtdlForEachRoom(cmd_lrms_backend, &FloorBeingSearched); cprintf("000\n"); } @@ -553,31 +694,32 @@ void cmd_lkra_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); int ra; + int view; FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->user); + CtdlRoomAccess(qrbuf, &CC->user, &ra, &view); if ((( ra & (UA_KNOWN))) && ((qrbuf->QRfloor == (FloorBeingSearched)) || ((FloorBeingSearched) < 0))) - list_roomname(qrbuf, ra); + list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview); } void cmd_lkra(char *argbuf) { int FloorBeingSearched = (-1); - if (strlen(argbuf) > 0) + if (!IsEmptyStr(argbuf)) FloorBeingSearched = extract_int(argbuf, 0); if (CtdlAccessCheck(ac_logged_in)) return; - if (getuser(&CC->user, CC->curr_user)) { + if (CtdlGetUser(&CC->user, CC->curr_user)) { cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); return; } cprintf("%d Known rooms:\n", LISTING_FOLLOWS); - ForEachRoom(cmd_lkra_backend, &FloorBeingSearched); + CtdlForEachRoom(cmd_lkra_backend, &FloorBeingSearched); cprintf("000\n"); } @@ -587,26 +729,27 @@ void cmd_lprm_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); int ra; + int view; FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->user); + CtdlRoomAccess(qrbuf, &CC->user, &ra, &view); if ( ((qrbuf->QRflags & QR_PRIVATE) == 0) && ((qrbuf->QRflags & QR_MAILBOX) == 0) && ((qrbuf->QRfloor == (FloorBeingSearched)) || ((FloorBeingSearched) < 0))) - list_roomname(qrbuf, ra); + list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview); } void cmd_lprm(char *argbuf) { int FloorBeingSearched = (-1); - if (strlen(argbuf) > 0) + if (!IsEmptyStr(argbuf)) FloorBeingSearched = extract_int(argbuf, 0); cprintf("%d Publiic rooms:\n", LISTING_FOLLOWS); - ForEachRoom(cmd_lprm_backend, &FloorBeingSearched); + CtdlForEachRoom(cmd_lprm_backend, &FloorBeingSearched); cprintf("000\n"); } @@ -619,32 +762,33 @@ void cmd_lkrn_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); int ra; + int view; FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->user); + CtdlRoomAccess(qrbuf, &CC->user, &ra, &view); if ((ra & UA_KNOWN) && (ra & UA_HASNEWMSGS) && ((qrbuf->QRfloor == (FloorBeingSearched)) || ((FloorBeingSearched) < 0))) - list_roomname(qrbuf, ra); + list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview); } void cmd_lkrn(char *argbuf) { int FloorBeingSearched = (-1); - if (strlen(argbuf) > 0) + if (!IsEmptyStr(argbuf)) FloorBeingSearched = extract_int(argbuf, 0); if (CtdlAccessCheck(ac_logged_in)) return; - if (getuser(&CC->user, CC->curr_user)) { + if (CtdlGetUser(&CC->user, CC->curr_user)) { cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); return; } cprintf("%d Rooms w/ new msgs:\n", LISTING_FOLLOWS); - ForEachRoom(cmd_lkrn_backend, &FloorBeingSearched); + CtdlForEachRoom(cmd_lkrn_backend, &FloorBeingSearched); cprintf("000\n"); } @@ -657,32 +801,33 @@ void cmd_lkro_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); int ra; + int view; FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->user); + CtdlRoomAccess(qrbuf, &CC->user, &ra, &view); if ((ra & UA_KNOWN) && ((ra & UA_HASNEWMSGS) == 0) && ((qrbuf->QRfloor == (FloorBeingSearched)) || ((FloorBeingSearched) < 0))) - list_roomname(qrbuf, ra); + list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview); } void cmd_lkro(char *argbuf) { int FloorBeingSearched = (-1); - if (strlen(argbuf) > 0) + if (!IsEmptyStr(argbuf)) FloorBeingSearched = extract_int(argbuf, 0); if (CtdlAccessCheck(ac_logged_in)) return; - if (getuser(&CC->user, CC->curr_user)) { + if (CtdlGetUser(&CC->user, CC->curr_user)) { cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); return; } cprintf("%d Rooms w/o new msgs:\n", LISTING_FOLLOWS); - ForEachRoom(cmd_lkro_backend, &FloorBeingSearched); + CtdlForEachRoom(cmd_lkro_backend, &FloorBeingSearched); cprintf("000\n"); } @@ -694,33 +839,34 @@ void cmd_lkro(char *argbuf) void cmd_lzrm_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); - int ra; + int view; + FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->user); + CtdlRoomAccess(qrbuf, &CC->user, &ra, &view); if ((ra & UA_GOTOALLOWED) && (ra & UA_ZAPPED) && ((qrbuf->QRfloor == (FloorBeingSearched)) || ((FloorBeingSearched) < 0))) - list_roomname(qrbuf, ra); + list_roomname(qrbuf, ra, view, qrbuf->QRdefaultview); } void cmd_lzrm(char *argbuf) { int FloorBeingSearched = (-1); - if (strlen(argbuf) > 0) + if (!IsEmptyStr(argbuf)) FloorBeingSearched = extract_int(argbuf, 0); if (CtdlAccessCheck(ac_logged_in)) return; - if (getuser(&CC->user, CC->curr_user)) { + if (CtdlGetUser(&CC->user, CC->curr_user)) { cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); return; } cprintf("%d Zapped rooms:\n", LISTING_FOLLOWS); - ForEachRoom(cmd_lzrm_backend, &FloorBeingSearched); + CtdlForEachRoom(cmd_lzrm_backend, &FloorBeingSearched); cprintf("000\n"); } @@ -730,21 +876,28 @@ void cmd_lzrm(char *argbuf) * or access control is done here -- the caller should make sure that the * specified room exists and is ok to access. */ -void usergoto(char *where, int display_result, int transiently, +void CtdlUserGoto(char *where, int display_result, int transiently, int *retmsgs, int *retnew) { int a; int new_messages = 0; + int old_messages = 0; int total_messages = 0; int info = 0; int rmailflag; int raideflag; int newmailcount = 0; - struct visit vbuf; + visit vbuf; char truncated_roomname[ROOMNAMELEN]; struct cdbdata *cdbfr; long *msglist = NULL; int num_msgs = 0; + unsigned int original_v_flags; + int num_sets; + int s; + char setstr[128], lostr[64], histr[64]; + long lo, hi; + int is_trash = 0; /* If the supplied room name is NULL, the caller wants us to know that * it has already copied the room record into CC->room, so @@ -752,13 +905,14 @@ void usergoto(char *where, int display_result, int transiently, */ if (where != NULL) { safestrncpy(CC->room.QRname, where, sizeof CC->room.QRname); - getroom(&CC->room, where); + CtdlGetRoom(&CC->room, where); } /* Take care of all the formalities. */ begin_critical_section(S_USERS); CtdlGetRelationship(&vbuf, &CC->user, &CC->room); + original_v_flags = vbuf.v_flags; /* Know the room ... but not if it's the page log room, or if the * caller specified that we're only entering this room transiently. @@ -768,7 +922,11 @@ void usergoto(char *where, int display_result, int transiently, vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT; vbuf.v_flags = vbuf.v_flags | V_ACCESS; } - CtdlSetRelationship(&vbuf, &CC->user, &CC->room); + + /* Only rewrite the database record if we changed something */ + if (vbuf.v_flags != original_v_flags) { + CtdlSetRelationship(&vbuf, &CC->user, &CC->room); + } end_critical_section(S_USERS); /* Check for new mail */ @@ -779,25 +937,46 @@ void usergoto(char *where, int display_result, int transiently, info = 1; } - get_mm(); cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long)); if (cdbfr != NULL) { - msglist = mallok(cdbfr->len); - memcpy(msglist, cdbfr->ptr, cdbfr->len); + msglist = (long *) cdbfr->ptr; + cdbfr->ptr = NULL; /* CtdlUserGoto() now owns this memory */ num_msgs = cdbfr->len / sizeof(long); cdb_free(cdbfr); } - if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) { - if (msglist[a] > 0L) { - ++total_messages; - if (is_msg_in_mset(vbuf.v_seen, msglist[a]) == 0) { - ++new_messages; + total_messages = 0; + for (a=0; a 0L) ++total_messages; + } + new_messages = num_msgs; + num_sets = num_tokens(vbuf.v_seen, ','); + for (s=0; s= 2) { + extract_token(histr, setstr, 1, ':', sizeof histr); + if (!strcmp(histr, "*")) { + snprintf(histr, sizeof histr, "%ld", LONG_MAX); + } + } + else { + strcpy(histr, lostr); + } + lo = atol(lostr); + hi = atol(histr); + + for (a=0; a 0L) { + if ((msglist[a] >= lo) && (msglist[a] <= hi)) { + ++old_messages; + msglist[a] = 0L; } } } + new_messages = total_messages - old_messages; - if (msglist != NULL) phree(msglist); + if (msglist != NULL) free(msglist); if (CC->room.QRflags & QR_MAILBOX) rmailflag = 1; @@ -805,26 +984,32 @@ void usergoto(char *where, int display_result, int transiently, rmailflag = 0; if ((CC->room.QRroomaide == CC->user.usernum) - || (CC->user.axlevel >= 6)) + || (CC->user.axlevel >= AxAideU)) raideflag = 1; else raideflag = 0; - strcpy(truncated_roomname, CC->room.QRname); + safestrncpy(truncated_roomname, CC->room.QRname, sizeof truncated_roomname); if ( (CC->room.QRflags & QR_MAILBOX) && (atol(CC->room.QRname) == CC->user.usernum) ) { - strcpy(truncated_roomname, &truncated_roomname[11]); + safestrncpy(truncated_roomname, &truncated_roomname[11], sizeof truncated_roomname); + } + + if (!strcasecmp(truncated_roomname, USERTRASHROOM)) { + is_trash = 1; } if (retmsgs != NULL) *retmsgs = total_messages; if (retnew != NULL) *retnew = new_messages; - lprintf(9, "<%s> %d new of %d total messages\n", + CtdlLogPrintf(CTDL_DEBUG, "<%s> %d new of %d total messages\n", CC->room.QRname, new_messages, total_messages ); + CC->curr_view = (int)vbuf.v_view; + if (display_result) { - cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|\n", + cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|%d|%d|\n", CIT_OK, CtdlCheckExpress(), truncated_roomname, (int)new_messages, @@ -838,12 +1023,48 @@ void usergoto(char *where, int display_result, int transiently, (int)newmailcount, (int)CC->room.QRfloor, (int)vbuf.v_view, - (int)CC->room.QRdefaultview + (int)CC->room.QRdefaultview, + (int)is_trash, + (int)CC->room.QRflags2 ); } } +/* + * Handle some of the macro named rooms + */ +void convert_room_name_macros(char *towhere, size_t maxlen) { + if (!strcasecmp(towhere, "_BASEROOM_")) { + safestrncpy(towhere, config.c_baseroom, maxlen); + } + else if (!strcasecmp(towhere, "_MAIL_")) { + safestrncpy(towhere, MAILROOM, maxlen); + } + else if (!strcasecmp(towhere, "_TRASH_")) { + safestrncpy(towhere, USERTRASHROOM, maxlen); + } + else if (!strcasecmp(towhere, "_DRAFTS_")) { + safestrncpy(towhere, USERDRAFTROOM, maxlen); + } + else if (!strcasecmp(towhere, "_BITBUCKET_")) { + safestrncpy(towhere, config.c_twitroom, maxlen); + } + else if (!strcasecmp(towhere, "_CALENDAR_")) { + safestrncpy(towhere, USERCALENDARROOM, maxlen); + } + else if (!strcasecmp(towhere, "_TASKS_")) { + safestrncpy(towhere, USERTASKSROOM, maxlen); + } + else if (!strcasecmp(towhere, "_CONTACTS_")) { + safestrncpy(towhere, USERCONTACTSROOM, maxlen); + } + else if (!strcasecmp(towhere, "_NOTES_")) { + safestrncpy(towhere, USERNOTESROOM, maxlen); + } +} + + /* * cmd_goto() - goto a new room */ @@ -853,39 +1074,34 @@ void cmd_goto(char *gargs) int c; int ok = 0; int ra; - char augmented_roomname[SIZ]; - char towhere[SIZ]; - char password[SIZ]; + char augmented_roomname[ROOMNAMELEN]; + char towhere[ROOMNAMELEN]; + char password[32]; int transiently = 0; if (CtdlAccessCheck(ac_logged_in)) return; - extract(towhere, gargs, 0); - extract(password, gargs, 1); + extract_token(towhere, gargs, 0, '|', sizeof towhere); + extract_token(password, gargs, 1, '|', sizeof password); transiently = extract_int(gargs, 2); - getuser(&CC->user, CC->curr_user); - - if (!strcasecmp(towhere, "_BASEROOM_")) - strcpy(towhere, config.c_baseroom); - - if (!strcasecmp(towhere, "_MAIL_")) - strcpy(towhere, MAILROOM); - - if (!strcasecmp(towhere, "_BITBUCKET_")) - strcpy(towhere, config.c_twitroom); + CtdlGetUser(&CC->user, CC->curr_user); + /* + * Handle some of the macro named rooms + */ + convert_room_name_macros(towhere, sizeof towhere); /* First try a regular match */ - c = getroom(&QRscratch, towhere); + c = CtdlGetRoom(&QRscratch, towhere); /* Then try a mailbox name match */ if (c != 0) { - MailboxName(augmented_roomname, sizeof augmented_roomname, + CtdlMailboxName(augmented_roomname, sizeof augmented_roomname, &CC->user, towhere); - c = getroom(&QRscratch, augmented_roomname); + c = CtdlGetRoom(&QRscratch, augmented_roomname); if (c == 0) - strcpy(towhere, augmented_roomname); + safestrncpy(towhere, augmented_roomname, sizeof towhere); } /* And if the room was found... */ @@ -895,12 +1111,12 @@ void cmd_goto(char *gargs) if (CC->internal_pgm) { memcpy(&CC->room, &QRscratch, sizeof(struct ctdlroom)); - usergoto(NULL, 1, transiently, NULL, NULL); + CtdlUserGoto(NULL, 1, transiently, NULL, NULL); return; } /* See if there is an existing user/room relationship */ - ra = CtdlRoomAccess(&QRscratch, &CC->user); + CtdlRoomAccess(&QRscratch, &CC->user, &ra, NULL); /* normal clients have to pass through security */ if (ra & UA_GOTOALLOWED) { @@ -912,12 +1128,12 @@ void cmd_goto(char *gargs) ((ra & UA_GOTOALLOWED))) { memcpy(&CC->room, &QRscratch, sizeof(struct ctdlroom)); - usergoto(NULL, 1, transiently, NULL, NULL); + CtdlUserGoto(NULL, 1, transiently, NULL, NULL); return; } else if ((QRscratch.QRflags & QR_PASSWORDED) && ((ra & UA_KNOWN) == 0) && (strcasecmp(QRscratch.QRpasswd, password)) && - (CC->user.axlevel < 6) + (CC->user.axlevel < AxAideU) ) { cprintf("%d wrong or missing passwd\n", ERROR + PASSWORD_REQUIRED); @@ -926,44 +1142,27 @@ void cmd_goto(char *gargs) ((QRscratch.QRflags & QR_PASSWORDED) == 0) && ((QRscratch.QRflags & QR_GUESSNAME) == 0) && ((ra & UA_KNOWN) == 0) && - (CC->user.axlevel < 6) + (CC->user.axlevel < AxAideU) ) { - lprintf(9, "Failed to acquire private room\n"); - goto NOPE; + CtdlLogPrintf(CTDL_DEBUG, "Failed to acquire private room\n"); } else { memcpy(&CC->room, &QRscratch, sizeof(struct ctdlroom)); - usergoto(NULL, 1, transiently, NULL, NULL); + CtdlUserGoto(NULL, 1, transiently, NULL, NULL); return; } } } -NOPE: cprintf("%d room '%s' not found\n", ERROR + ROOM_NOT_FOUND, towhere); + cprintf("%d room '%s' not found\n", ERROR + ROOM_NOT_FOUND, towhere); } -void cmd_whok(void) +void cmd_whok(char *cmdbuf) { struct ctdluser temp; struct cdbdata *cdbus; - - getuser(&CC->user, CC->curr_user); - - /* - * This command is only allowed by aides, room aides, - * and room namespace owners - */ - if (is_room_aide() - || (atol(CC->room.QRname) == CC->user.usernum) ) { - /* access granted */ - } - else { - /* access denied */ - cprintf("%d Higher access or room ownership required.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return; - } + int ra; cprintf("%d Who knows room:\n", LISTING_FOLLOWS); cdb_rewind(CDB_USERS); @@ -972,8 +1171,9 @@ void cmd_whok(void) memcpy(&temp, cdbus->ptr, sizeof temp); cdb_free(cdbus); + CtdlRoomAccess(&CC->room, &temp, &ra, NULL); if ((CC->room.QRflags & QR_INUSE) - && (CtdlRoomAccess(&CC->room, &temp) & UA_KNOWN) + && (ra & UA_KNOWN) ) cprintf("%s\n", temp.fullname); } @@ -984,77 +1184,104 @@ void cmd_whok(void) /* * RDIR command for room directory */ -void cmd_rdir(void) +void cmd_rdir(char *cmdbuf) { - char buf[SIZ]; - char flnm[SIZ]; - char comment[SIZ]; - FILE *ls, *fd; + char buf[256]; + char comment[256]; + FILE *fd; struct stat statbuf; - + DIR *filedir = NULL; + struct dirent *filedir_entry; + int d_namelen; + char buf2[SIZ]; + char mimebuf[64]; + long len; + if (CtdlAccessCheck(ac_logged_in)) return; - getroom(&CC->room, CC->room.QRname); - getuser(&CC->user, CC->curr_user); + CtdlGetRoom(&CC->room, CC->room.QRname); + CtdlGetUser(&CC->user, CC->curr_user); if ((CC->room.QRflags & QR_DIRECTORY) == 0) { cprintf("%d not here.\n", ERROR + NOT_HERE); return; } if (((CC->room.QRflags & QR_VISDIR) == 0) - && (CC->user.axlevel < 6) + && (CC->user.axlevel < AxAideU) && (CC->user.usernum != CC->room.QRroomaide)) { cprintf("%d not here.\n", ERROR + HIGHER_ACCESS_REQUIRED); return; } - cprintf("%d %s|%s/files/%s\n", - LISTING_FOLLOWS, config.c_fqdn, BBSDIR, CC->room.QRdirname); - snprintf(buf, sizeof buf, "ls %s/files/%s >%s 2> /dev/null", - BBSDIR, CC->room.QRdirname, CC->temp); - system(buf); - - snprintf(buf, sizeof buf, "%s/files/%s/filedir", BBSDIR, CC->room.QRdirname); + snprintf(buf, sizeof buf, "%s/%s", ctdl_file_dir, CC->room.QRdirname); + filedir = opendir (buf); + + if (filedir == NULL) { + cprintf("%d not here.\n", ERROR + HIGHER_ACCESS_REQUIRED); + return; + } + cprintf("%d %s|%s/%s\n", LISTING_FOLLOWS, config.c_fqdn, ctdl_file_dir, CC->room.QRdirname); + + snprintf(buf, sizeof buf, "%s/%s/filedir", ctdl_file_dir, CC->room.QRdirname); fd = fopen(buf, "r"); if (fd == NULL) fd = fopen("/dev/null", "r"); - - ls = fopen(CC->temp, "r"); - while (fgets(flnm, sizeof flnm, ls) != NULL) { - flnm[strlen(flnm) - 1] = 0; - if (strcasecmp(flnm, "filedir")) { - snprintf(buf, sizeof buf, "%s/files/%s/%s", - BBSDIR, CC->room.QRdirname, flnm); - stat(buf, &statbuf); - strcpy(comment, ""); - fseek(fd, 0L, 0); - while ((fgets(buf, sizeof buf, fd) != NULL) - && (strlen(comment) == 0)) { + while ((filedir_entry = readdir(filedir))) + { + if (strcasecmp(filedir_entry->d_name, "filedir") && filedir_entry->d_name[0] != '.') + { +#ifdef _DIRENT_HAVE_D_NAMELEN + d_namelen = filedir_entry->d_namelen; +#else + d_namelen = strlen(filedir_entry->d_name); +#endif + snprintf(buf, sizeof buf, "%s/%s/%s", ctdl_file_dir, CC->room.QRdirname, filedir_entry->d_name); + stat(buf, &statbuf); /* stat the file */ + if (!(statbuf.st_mode & S_IFREG)) + { + snprintf(buf2, sizeof buf2, + "\"%s\" appears in the file directory for room \"%s\" but is not a regular file. Directories, named pipes, sockets, etc. are not usable in Citadel room directories.\n", + buf, CC->room.QRname + ); + CtdlAideMessage(buf2, "Unusable data found in room directory"); + continue; /* not a useable file type so don't show it */ + } + safestrncpy(comment, "", sizeof comment); + fseek(fd, 0L, 0); /* rewind descriptions file */ + /* Get the description from the descriptions file */ + while ((fgets(buf, sizeof buf, fd) != NULL) && (IsEmptyStr(comment))) + { buf[strlen(buf) - 1] = 0; - if ((!strncasecmp(buf, flnm, strlen(flnm))) - && (buf[strlen(flnm)] == ' ')) - safestrncpy(comment, - &buf[strlen(flnm) + 1], - sizeof comment); + if ((!strncasecmp(buf, filedir_entry->d_name, d_namelen)) && (buf[d_namelen] == ' ')) + safestrncpy(comment, &buf[d_namelen + 1], sizeof comment); + } + len = extract_token (mimebuf, comment, 0,' ', 64); + if ((len <0) || strchr(mimebuf, '/') == NULL) + { + snprintf (mimebuf, 64, "application/octetstream"); + len = 0; } - cprintf("%s|%ld|%s\n", flnm, (long)statbuf.st_size, comment); + cprintf("%s|%ld|%s|%s\n", + filedir_entry->d_name, + (long)statbuf.st_size, + mimebuf, + &comment[len]); } } - fclose(ls); fclose(fd); - unlink(CC->temp); - + closedir(filedir); + cprintf("000\n"); } /* * get room parameters (aide or room aide command) */ -void cmd_getr(void) +void cmd_getr(char *cmdbuf) { if (CtdlAccessCheck(ac_room_aide)) return; - getroom(&CC->room, CC->room.QRname); + CtdlGetRoom(&CC->room, CC->room.QRname); cprintf("%d%c%s|%s|%s|%d|%d|%d|%d|%d|\n", CIT_OK, CtdlCheckExpress(), @@ -1094,13 +1321,13 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { struct floor *fl; struct floor flbuf; long owner = 0L; - char actual_old_name[SIZ]; + char actual_old_name[ROOMNAMELEN]; - lprintf(9, "CtdlRenameRoom(%s, %s, %d)\n", + CtdlLogPrintf(CTDL_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n", old_name, new_name, new_floor); if (new_floor >= 0) { - fl = cgetfloor(new_floor); + fl = CtdlGetCachedFloor(new_floor); if ((fl->f_flags & F_INUSE) == 0) { return(crr_invalid_floor); } @@ -1108,28 +1335,28 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { begin_critical_section(S_ROOMS); - if ( (getroom(&qrtmp, new_name) == 0) + if ( (CtdlGetRoom(&qrtmp, new_name) == 0) && (strcasecmp(new_name, old_name)) ) { ret = crr_already_exists; } - else if (getroom(&qrbuf, old_name) != 0) { + else if (CtdlGetRoom(&qrbuf, old_name) != 0) { ret = crr_room_not_found; } - else if ( (CC->user.axlevel < 6) + else if ( (CC->user.axlevel < AxAideU) && (!CC->internal_pgm) && (CC->user.usernum != qrbuf.QRroomaide) && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CC->user.usernum))) ) { ret = crr_access_denied; } - else if (is_noneditable(&qrbuf)) { + else if (CtdlIsNonEditable(&qrbuf)) { ret = crr_noneditable; } else { /* Rename it */ - strcpy(actual_old_name, qrbuf.QRname); + safestrncpy(actual_old_name, qrbuf.QRname, sizeof actual_old_name); if (qrbuf.QRflags & QR_MAILBOX) { owner = atol(qrbuf.QRname); } @@ -1154,7 +1381,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { new_floor = old_floor; } qrbuf.QRfloor = new_floor; - putroom(&qrbuf); + CtdlPutRoom(&qrbuf); begin_critical_section(S_CONFIG); @@ -1187,9 +1414,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { lgetfloor(&flbuf, old_floor); --flbuf.f_ref_count; lputfloor(&flbuf, old_floor); - lgetfloor(&flbuf, CC->room.QRfloor); + CtdlLogPrintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", old_floor, flbuf.f_ref_count); + lgetfloor(&flbuf, new_floor); ++flbuf.f_ref_count; - lputfloor(&flbuf, CC->room.QRfloor); + lputfloor(&flbuf, new_floor); + CtdlLogPrintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count); } /* ...and everybody say "YATTA!" */ @@ -1202,7 +1431,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { */ void cmd_setr(char *args) { - char buf[SIZ]; + char buf[256]; int new_order = 0; int r; int new_floor; @@ -1222,19 +1451,19 @@ void cmd_setr(char *args) if (CC->room.QRflags & QR_MAILBOX) { sprintf(new_name, "%010ld.", atol(CC->room.QRname) ); } else { - strcpy(new_name, ""); + safestrncpy(new_name, "", sizeof new_name); } - extract(&new_name[strlen(new_name)], args, 0); + extract_token(&new_name[strlen(new_name)], args, 0, '|', (sizeof new_name - strlen(new_name))); r = CtdlRenameRoom(CC->room.QRname, new_name, new_floor); if (r == crr_room_not_found) { - cprintf("%d Internal error - room not found?\n", ERROR); + cprintf("%d Internal error - room not found?\n", ERROR + INTERNAL_ERROR); } else if (r == crr_already_exists) { cprintf("%d '%s' already exists.\n", ERROR + ALREADY_EXISTS, new_name); } else if (r == crr_noneditable) { - cprintf("%d Cannot edit this room.\n", ERROR); + cprintf("%d Cannot edit this room.\n", ERROR + NOT_HERE); } else if (r == crr_invalid_floor) { cprintf("%d Target floor does not exist.\n", ERROR + INVALID_FLOOR_OPERATION); @@ -1244,14 +1473,14 @@ void cmd_setr(char *args) CC->room.QRname); } else if (r != crr_ok) { cprintf("%d Error: CtdlRenameRoom() returned %d\n", - ERROR, r); + ERROR + INTERNAL_ERROR, r); } if (r != crr_ok) { return; } - getroom(&CC->room, new_name); + CtdlGetRoom(&CC->room, new_name); /* Now we have to do a bunch of other stuff */ @@ -1263,10 +1492,10 @@ void cmd_setr(char *args) new_order = 127; } - lgetroom(&CC->room, CC->room.QRname); + CtdlGetRoomLock(&CC->room, CC->room.QRname); /* Directory room */ - extract(buf, args, 2); + extract_token(buf, args, 2, '|', sizeof buf); buf[15] = 0; safestrncpy(CC->room.QRdirname, buf, sizeof CC->room.QRdirname); @@ -1304,7 +1533,7 @@ void cmd_setr(char *args) if (num_parms(args) >= 7) CC->room.QRorder = (char) new_order; /* Room password */ - extract(buf, args, 1); + extract_token(buf, args, 1, '|', sizeof buf); buf[10] = 0; safestrncpy(CC->room.QRpasswd, buf, sizeof CC->room.QRpasswd); @@ -1324,16 +1553,18 @@ void cmd_setr(char *args) } /* Write the room record back to disk */ - lputroom(&CC->room); + CtdlPutRoomLock(&CC->room); /* Create a room directory if necessary */ if (CC->room.QRflags & QR_DIRECTORY) { - snprintf(buf, sizeof buf, "./files/%s", - CC->room.QRdirname); + snprintf(buf, sizeof buf,"%s/%s", + ctdl_file_dir, + CC->room.QRdirname); mkdir(buf, 0755); } - snprintf(buf, sizeof buf, "%s> edited by %s\n", CC->room.QRname, CC->curr_user); - aide_message(buf); + snprintf(buf, sizeof buf, "The room \"%s\" has been edited by %s.\n", + CC->room.QRname, CC->curr_user); + CtdlAideMessage(buf, "Room modification Message"); cprintf("%d Ok\n", CIT_OK); } @@ -1342,13 +1573,13 @@ void cmd_setr(char *args) /* * get the name of the room aide for this room */ -void cmd_geta(void) +void cmd_geta(char *cmdbuf) { struct ctdluser usbuf; if (CtdlAccessCheck(ac_logged_in)) return; - if (getuserbynumber(&usbuf, CC->room.QRroomaide) == 0) { + if (CtdlGetUserByNumber(&usbuf, CC->room.QRroomaide) == 0) { cprintf("%d %s\n", CIT_OK, usbuf.fullname); } else { cprintf("%d \n", CIT_OK); @@ -1368,66 +1599,57 @@ void cmd_seta(char *new_ra) if (CtdlAccessCheck(ac_room_aide)) return; - if (getuser(&usbuf, new_ra) != 0) { + if (CtdlGetUser(&usbuf, new_ra) != 0) { newu = (-1L); } else { newu = usbuf.usernum; } - lgetroom(&CC->room, CC->room.QRname); + CtdlGetRoomLock(&CC->room, CC->room.QRname); post_notice = 0; if (CC->room.QRroomaide != newu) { post_notice = 1; } CC->room.QRroomaide = newu; - lputroom(&CC->room); + CtdlPutRoomLock(&CC->room); /* * We have to post the change notice _after_ writing changes to * the room table, otherwise it would deadlock! */ if (post_notice == 1) { - if (strlen(usbuf.fullname) > 0) + if (!IsEmptyStr(usbuf.fullname)) snprintf(buf, sizeof buf, - "%s is now room aide for %s>\n", + "%s is now the room aide for \"%s\".\n", usbuf.fullname, CC->room.QRname); else snprintf(buf, sizeof buf, - "There is now no room aide for %s>\n", + "There is now no room aide for \"%s\".\n", CC->room.QRname); - aide_message(buf); + CtdlAideMessage(buf, "Aide Room Modification"); } cprintf("%d Ok\n", CIT_OK); } -/* - * Generate an associated file name for a room - */ -void assoc_file_name(char *buf, size_t n, - struct ctdlroom *qrbuf, const char *prefix) -{ - snprintf(buf, n, "./%s/%ld", prefix, qrbuf->QRnumber); -} - /* * retrieve info file for this room */ -void cmd_rinf(void) +void cmd_rinf(char *gargs) { char filename[128]; char buf[SIZ]; FILE *info_fp; - assoc_file_name(filename, sizeof filename, &CC->room, "info"); + assoc_file_name(filename, sizeof filename, &CC->room, ctdl_info_dir); info_fp = fopen(filename, "r"); if (info_fp == NULL) { - cprintf("%d No info file.\n", ERROR); + cprintf("%d No info file.\n", ERROR + FILE_NOT_FOUND); return; } cprintf("%d Info:\n", LISTING_FOLLOWS); while (fgets(buf, sizeof buf, info_fp) != NULL) { - if (strlen(buf) > 0) + if (!IsEmptyStr(buf)) buf[strlen(buf) - 1] = 0; cprintf("%s\n", buf); } @@ -1435,37 +1657,77 @@ void cmd_rinf(void) fclose(info_fp); } +/* + * Asynchronously schedule a room for deletion. The room will appear + * deleted to the user(s), but it won't actually get purged from the + * database until THE DREADED AUTO-PURGER makes its next run. + */ +void CtdlScheduleRoomForDeletion(struct ctdlroom *qrbuf) +{ + char old_name[ROOMNAMELEN]; + static int seq = 0; + + CtdlLogPrintf(CTDL_NOTICE, "Scheduling room <%s> for deletion\n", + qrbuf->QRname); + + safestrncpy(old_name, qrbuf->QRname, sizeof old_name); + + CtdlGetRoom(qrbuf, qrbuf->QRname); + + /* Turn the room into a private mailbox owned by a user who doesn't + * exist. This will immediately make the room invisible to everyone, + * and qualify the room for purging. + */ + snprintf(qrbuf->QRname, sizeof qrbuf->QRname, "9999999999.%08lx.%04d.%s", + time(NULL), + ++seq, + old_name + ); + qrbuf->QRflags |= QR_MAILBOX; + time(&qrbuf->QRgen); /* Use a timestamp as the new generation number */ + + CtdlPutRoom(qrbuf); + + b_deleteroom(old_name); +} + + + /* * Back end processing to delete a room and everything associated with it + * (This one is synchronous and should only get called by THE DREADED + * AUTO-PURGER in serv_expire.c. All user-facing code should call + * the asynchronous schedule_room_for_deletion() instead.) */ -void delete_room(struct ctdlroom *qrbuf) +void CtdlDeleteRoom(struct ctdlroom *qrbuf) { struct floor flbuf; char filename[100]; + /* TODO: filename magic? does this realy work? */ - lprintf(9, "Deleting room <%s>\n", qrbuf->QRname); + CtdlLogPrintf(CTDL_NOTICE, "Deleting room <%s>\n", qrbuf->QRname); /* Delete the info file */ - assoc_file_name(filename, sizeof filename, qrbuf, "info"); + assoc_file_name(filename, sizeof filename, qrbuf, ctdl_info_dir); unlink(filename); /* Delete the image file */ - assoc_file_name(filename, sizeof filename, qrbuf, "images"); + assoc_file_name(filename, sizeof filename, qrbuf, ctdl_image_dir); unlink(filename); /* Delete the room's network config file */ - assoc_file_name(filename, sizeof filename, qrbuf, "netconfigs"); + assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir); unlink(filename); /* Delete the messages in the room * (Careful: this opens an S_ROOMS critical section!) */ - CtdlDeleteMessages(qrbuf->QRname, 0L, ""); + CtdlDeleteMessages(qrbuf->QRname, NULL, 0, ""); /* Flag the room record as not in use */ - lgetroom(qrbuf, qrbuf->QRname); + CtdlGetRoomLock(qrbuf, qrbuf->QRname); qrbuf->QRflags = 0; - lputroom(qrbuf); + CtdlPutRoomLock(qrbuf); /* then decrement the reference count for the floor */ lgetfloor(&flbuf, (int) (qrbuf->QRfloor)); @@ -1487,7 +1749,7 @@ int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) { return(0); } - if (is_noneditable(qr)) { + if (CtdlIsNonEditable(qr)) { return(0); } @@ -1503,7 +1765,7 @@ int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) { } /* Can't delete your Mail> room */ - if (!strcasecmp(&qr->QRname[12], MAILROOM)) return(0); + if (!strcasecmp(&qr->QRname[11], MAILROOM)) return(0); /* Otherwise it's ok */ return(1); @@ -1532,22 +1794,22 @@ void cmd_kill(char *argbuf) } if (kill_ok) { if (CC->room.QRflags & QR_MAILBOX) { - strcpy(deleted_room_name, &CC->room.QRname[11]); + safestrncpy(deleted_room_name, &CC->room.QRname[11], sizeof deleted_room_name); } else { - strcpy(deleted_room_name, CC->room.QRname); + safestrncpy(deleted_room_name, CC->room.QRname, sizeof deleted_room_name); } /* Do the dirty work */ - delete_room(&CC->room); + CtdlScheduleRoomForDeletion(&CC->room); /* Return to the Lobby */ - usergoto(config.c_baseroom, 0, 0, NULL, NULL); + CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL); /* tell the world what we did */ - snprintf(msg, sizeof msg, "%s> killed by %s\n", + snprintf(msg, sizeof msg, "The room \"%s\" has been deleted by %s.\n", deleted_room_name, CC->curr_user); - aide_message(msg); + CtdlAideMessage(msg, "Room Purger Message"); cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name); } else { cprintf("%d ok to delete.\n", CIT_OK); @@ -1558,27 +1820,29 @@ void cmd_kill(char *argbuf) /* * Internal code to create a new room (returns room flags) * - * Room types: 0=public, 1=guessname, 2=passworded, 3=inv-only, + * Room types: 0=public, 1=hidden, 2=passworded, 3=invitation-only, * 4=mailbox, 5=mailbox, but caller supplies namespace */ -unsigned create_room(char *new_room_name, +unsigned CtdlCreateRoom(char *new_room_name, int new_room_type, char *new_room_pass, int new_room_floor, int really_create, - int avoid_access) + int avoid_access, + int new_room_view) { struct ctdlroom qrbuf; struct floor flbuf; - struct visit vbuf; + visit vbuf; - lprintf(9, "create_room(%s)\n", new_room_name); - if (getroom(&qrbuf, new_room_name) == 0) { - lprintf(9, "%s already exists.\n", new_room_name); - return (0); /* already exists */ - } + CtdlLogPrintf(CTDL_DEBUG, "CtdlCreateRoom(name=%s, type=%d, view=%d)\n", + new_room_name, new_room_type, new_room_view); + if (CtdlGetRoom(&qrbuf, new_room_name) == 0) { + CtdlLogPrintf(CTDL_DEBUG, "%s already exists.\n", new_room_name); + return(0); + } memset(&qrbuf, 0, sizeof(struct ctdlroom)); safestrncpy(qrbuf.QRpasswd, new_room_pass, sizeof qrbuf.QRpasswd); @@ -1589,14 +1853,16 @@ unsigned create_room(char *new_room_name, qrbuf.QRflags = (qrbuf.QRflags | QR_GUESSNAME); if (new_room_type == 2) qrbuf.QRflags = (qrbuf.QRflags | QR_PASSWORDED); - if ( (new_room_type == 4) || (new_room_type == 5) ) + if ( (new_room_type == 4) || (new_room_type == 5) ) { qrbuf.QRflags = (qrbuf.QRflags | QR_MAILBOX); + /* qrbuf.QRflags2 |= QR2_SUBJECTREQ; */ + } /* If the user is requesting a personal room, set up the room * name accordingly (prepend the user number) */ if (new_room_type == 4) { - MailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name); + CtdlMailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name); } else { safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname); @@ -1622,9 +1888,10 @@ unsigned create_room(char *new_room_name, qrbuf.QRhighest = 0L; /* No messages in this room yet */ time(&qrbuf.QRgen); /* Use a timestamp as the generation number */ qrbuf.QRfloor = new_room_floor; + qrbuf.QRdefaultview = new_room_view; /* save what we just did... */ - putroom(&qrbuf); + CtdlPutRoom(&qrbuf); /* bump the reference count on whatever floor the room is on */ lgetfloor(&flbuf, (int) qrbuf.QRfloor); @@ -1634,13 +1901,11 @@ unsigned create_room(char *new_room_name, /* Grant the creator access to the room unless the avoid_access * parameter was specified. */ - if (avoid_access == 0) { - lgetuser(&CC->user, CC->curr_user); + if ( (CC->logged_in) && (avoid_access == 0) ) { CtdlGetRelationship(&vbuf, &CC->user, &qrbuf); vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT; vbuf.v_flags = vbuf.v_flags | V_ACCESS; CtdlSetRelationship(&vbuf, &CC->user, &qrbuf); - lputuser(&CC->user); } /* resume our happy day */ @@ -1654,26 +1919,28 @@ unsigned create_room(char *new_room_name, void cmd_cre8(char *args) { int cre8_ok; - char new_room_name[SIZ]; + char new_room_name[ROOMNAMELEN]; int new_room_type; - char new_room_pass[SIZ]; + char new_room_pass[32]; int new_room_floor; - char aaa[SIZ]; + int new_room_view; + char *notification_message = NULL; unsigned newflags; struct floor *fl; int avoid_access = 0; cre8_ok = extract_int(args, 0); - extract(new_room_name, args, 1); + extract_token(new_room_name, args, 1, '|', sizeof new_room_name); new_room_name[ROOMNAMELEN - 1] = 0; new_room_type = extract_int(args, 2); - extract(new_room_pass, args, 3); + extract_token(new_room_pass, args, 3, '|', sizeof new_room_pass); avoid_access = extract_int(args, 5); + new_room_view = extract_int(args, 6); new_room_pass[9] = 0; new_room_floor = 0; - if ((strlen(new_room_name) == 0) && (cre8_ok == 1)) { - cprintf("%d Invalid room name.\n", ERROR); + if ((IsEmptyStr(new_room_name)) && (cre8_ok == 1)) { + cprintf("%d Invalid room name.\n", ERROR + ILLEGAL_VALUE); return; } @@ -1684,8 +1951,13 @@ void cmd_cre8(char *args) } if (num_parms(args) >= 5) { - fl = cgetfloor(extract_int(args, 4)); - if ((fl->f_flags & F_INUSE) == 0) { + fl = CtdlGetCachedFloor(extract_int(args, 4)); + if (fl == NULL) { + cprintf("%d Invalid floor number.\n", + ERROR + INVALID_FLOOR_OPERATION); + return; + } + else if ((fl->f_flags & F_INUSE) == 0) { cprintf("%d Invalid floor number.\n", ERROR + INVALID_FLOOR_OPERATION); return; @@ -1696,35 +1968,34 @@ void cmd_cre8(char *args) if (CtdlAccessCheck(ac_logged_in)) return; - if (CC->user.axlevel < config.c_createax) { + if (CC->user.axlevel < config.c_createax && !CC->internal_pgm) { cprintf("%d You need higher access to create rooms.\n", ERROR + HIGHER_ACCESS_REQUIRED); return; } - if ((strlen(new_room_name) == 0) && (cre8_ok == 0)) { + if ((IsEmptyStr(new_room_name)) && (cre8_ok == 0)) { cprintf("%d Ok to create rooms.\n", CIT_OK); return; } if ((new_room_type < 0) || (new_room_type > 5)) { - cprintf("%d Invalid room type.\n", ERROR); + cprintf("%d Invalid room type.\n", ERROR + ILLEGAL_VALUE); return; } if (new_room_type == 5) { - if ((config.c_aide_mailboxes == 0) - || (CC->user.axlevel < 6)) { + if (CC->user.axlevel < AxAideU) { cprintf("%d Higher access required\n", - ERROR+HIGHER_ACCESS_REQUIRED); + ERROR + HIGHER_ACCESS_REQUIRED); return; } } /* Check to make sure the requested room name doesn't already exist */ - newflags = create_room(new_room_name, + newflags = CtdlCreateRoom(new_room_name, new_room_type, new_room_pass, new_room_floor, - 0, avoid_access); + 0, avoid_access, new_room_view); if (newflags == 0) { cprintf("%d '%s' already exists.\n", ERROR + ALREADY_EXISTS, new_room_name); @@ -1738,25 +2009,24 @@ void cmd_cre8(char *args) /* If we reach this point, the room needs to be created. */ - newflags = create_room(new_room_name, - new_room_type, new_room_pass, new_room_floor, 1, 0); + newflags = CtdlCreateRoom(new_room_name, + new_room_type, new_room_pass, new_room_floor, 1, 0, + new_room_view); /* post a message in Aide> describing the new room */ - safestrncpy(aaa, new_room_name, sizeof aaa); - strcat(aaa, "> created by "); - strcat(aaa, CC->user.fullname); - if (newflags & QR_MAILBOX) - strcat(aaa, " [personal]"); - else if (newflags & QR_PRIVATE) - strcat(aaa, " [private]"); - if (newflags & QR_GUESSNAME) - strcat(aaa, "[guessname] "); - if (newflags & QR_PASSWORDED) { - strcat(aaa, "\n Password: "); - strcat(aaa, new_room_pass); - } - strcat(aaa, "\n"); - aide_message(aaa); + notification_message = malloc(1024); + snprintf(notification_message, 1024, + "A new room called \"%s\" has been created by %s%s%s%s%s%s\n", + new_room_name, + CC->user.fullname, + ((newflags & QR_MAILBOX) ? " [personal]" : ""), + ((newflags & QR_PRIVATE) ? " [private]" : ""), + ((newflags & QR_GUESSNAME) ? " [hidden]" : ""), + ((newflags & QR_PASSWORDED) ? " Password: " : ""), + ((newflags & QR_PASSWORDED) ? new_room_pass : "") + ); + CtdlAideMessage(notification_message, "Room Creation Message"); + free(notification_message); cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name); } @@ -1769,16 +2039,18 @@ void cmd_einf(char *ok) char infofilename[SIZ]; char buf[SIZ]; + unbuffer_output(); + if (CtdlAccessCheck(ac_room_aide)) return; if (atoi(ok) == 0) { cprintf("%d Ok.\n", CIT_OK); return; } - assoc_file_name(infofilename, sizeof infofilename, &CC->room, "info"); - lprintf(9, "opening\n"); + assoc_file_name(infofilename, sizeof infofilename, &CC->room, ctdl_info_dir); + CtdlLogPrintf(CTDL_DEBUG, "opening\n"); fp = fopen(infofilename, "w"); - lprintf(9, "checking\n"); + CtdlLogPrintf(CTDL_DEBUG, "checking\n"); if (fp == NULL) { cprintf("%d Cannot open %s: %s\n", ERROR + INTERNAL_ERROR, infofilename, strerror(errno)); @@ -1787,23 +2059,23 @@ void cmd_einf(char *ok) cprintf("%d Send info...\n", SEND_LISTING); do { - client_gets(buf); + client_getln(buf, sizeof buf); if (strcmp(buf, "000")) fprintf(fp, "%s\n", buf); } while (strcmp(buf, "000")); fclose(fp); /* now update the room index so people will see our new info */ - lgetroom(&CC->room, CC->room.QRname); /* lock so no one steps on us */ + CtdlGetRoomLock(&CC->room, CC->room.QRname); /* lock so no one steps on us */ CC->room.QRinfo = CC->room.QRhighest + 1L; - lputroom(&CC->room); + CtdlPutRoomLock(&CC->room); } /* * cmd_lflr() - List all known floors */ -void cmd_lflr(void) +void cmd_lflr(char *gargs) { int a; struct floor flbuf; @@ -1813,7 +2085,7 @@ void cmd_lflr(void) cprintf("%d Known floors:\n", LISTING_FOLLOWS); for (a = 0; a < MAXFLOORS; ++a) { - getfloor(&flbuf, a); + CtdlGetFloor(&flbuf, a); if (flbuf.f_flags & F_INUSE) { cprintf("%d|%s|%d\n", a, @@ -1831,25 +2103,25 @@ void cmd_lflr(void) */ void cmd_cflr(char *argbuf) { - char new_floor_name[SIZ]; + char new_floor_name[256]; struct floor flbuf; int cflr_ok; int free_slot = (-1); int a; - extract(new_floor_name, argbuf, 0); + extract_token(new_floor_name, argbuf, 0, '|', sizeof new_floor_name); cflr_ok = extract_int(argbuf, 1); if (CtdlAccessCheck(ac_aide)) return; - if (strlen(new_floor_name) == 0) { + if (IsEmptyStr(new_floor_name)) { cprintf("%d Blank floor name not allowed.\n", - ERROR+ILLEGAL_VALUE); + ERROR + ILLEGAL_VALUE); return; } for (a = 0; a < MAXFLOORS; ++a) { - getfloor(&flbuf, a); + CtdlGetFloor(&flbuf, a); /* note any free slots while we're scanning... */ if (((flbuf.f_flags & F_INUSE) == 0) @@ -1940,7 +2212,7 @@ void cmd_eflr(char *argbuf) np = num_parms(argbuf); if (np < 1) { - cprintf("%d Usage error.\n", ERROR); + cprintf("%d Usage error.\n", ERROR + ILLEGAL_VALUE); return; } @@ -1955,8 +2227,42 @@ void cmd_eflr(char *argbuf) return; } if (np >= 2) - extract(flbuf.f_name, argbuf, 1); + extract_token(flbuf.f_name, argbuf, 1, '|', sizeof flbuf.f_name); lputfloor(&flbuf, floor_num); cprintf("%d Ok\n", CIT_OK); } + + +/*****************************************************************************/ +/* MODULE INITIALIZATION STUFF */ +/*****************************************************************************/ + +CTDL_MODULE_INIT(room_ops) +{ + if (!threading) { + CtdlRegisterProtoHook(cmd_lrms, "LRMS", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_lkra, "LKRA", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_lkrn, "LKRN", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_lkro, "LKRO", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_lzrm, "LZRM", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_lprm, "LPRM", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_goto, "GOTO", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_whok, "WHOK", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_rdir, "RDIR", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_getr, "GETR", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_setr, "SETR", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_geta, "GETA", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_seta, "SETA", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_rinf, "RINF", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_kill, "KILL", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_cre8, "CRE8", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_einf, "EINF", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_lflr, "LFLR", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_cflr, "CFLR", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_kflr, "KFLR", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_eflr, "EFLR", "Autoconverted. TODO: document me."); + } + /* return our Subversion id for the Log */ + return "$Id$"; +}