X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Froom_ops.c;h=340b99a38dd2b786383766152f32383c8b1fc4d4;hb=a2a06e5d6767d0e45eeccf4032153764e8a5520f;hp=28c6f497152934760f916ea1d08a62301e7f4121;hpb=506cb4954d2a800871db7ba55c779f4eaebcc665;p=citadel.git diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 28c6f4971..340b99a38 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -5,15 +5,12 @@ * */ -#ifdef DLL_EXPORT -#define IN_LIBCIT -#endif - #include "sysdep.h" #include #include #include #include +#include #include #if TIME_WITH_SYS_TIME @@ -31,7 +28,6 @@ #include #include "citadel.h" #include "server.h" -#include "serv_extensions.h" #include "database.h" #include "config.h" #include "room_ops.h" @@ -42,20 +38,24 @@ #include "citserver.h" #include "control.h" #include "tools.h" +#include "citadel_dirs.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 quickroom *roombuf, struct usersupp *userbuf) +void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf, + int *result, int *view) { int retval = 0; struct 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); + vbuf.v_view = 0; + goto SKIP_EVERYTHING; } /* Locate any applicable user/room relationships */ @@ -64,7 +64,7 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf) /* Force the properties of the Aide room */ if (!strcasecmp(roombuf->QRname, config.c_aideroom)) { if (userbuf->axlevel >= 6) { - retval = UA_KNOWN | UA_GOTOALLOWED; + retval = UA_KNOWN | UA_GOTOALLOWED | UA_POSTALLOWED | UA_DELETEALLOWED; } else { retval = 0; } @@ -102,52 +102,88 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *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 < 2) post_allowed = 0; + if ((CC->user.axlevel < 4) && (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; if ( ( ((roombuf->QRflags & QR_PRIVATE) == 0) && ((roombuf->QRflags & QR_MAILBOX) == 0) ) || ( (roombuf->QRflags & QR_MAILBOX) - && (atol(roombuf->QRname) == CC->usersupp.usernum))) { + && (atol(roombuf->QRname) == CC->user.usernum))) { retval = retval | UA_ZAPPED; } } /* 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) && ((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 >= 6) && (roombuf->QRflags & QR_MAILBOX) ) { - retval = retval | UA_GOTOALLOWED; + retval = retval | UA_GOTOALLOWED | UA_POSTALLOWED; + } + + /* Aides and Room Aides have admin privileges */ + if ( (userbuf->axlevel >= 6) + || (userbuf->usernum == roombuf->QRroomaide) + ) { + retval = retval | UA_ADMINALLOWED | UA_DELETEALLOWED; } 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; } @@ -155,13 +191,17 @@ 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; } /* * Self-checking stuff for a room record read into memory */ -void room_sanity_check(struct quickroom *qrbuf) +void room_sanity_check(struct ctdlroom *qrbuf) { /* Mailbox rooms are always on the lowest floor */ if (qrbuf->QRflags & QR_MAILBOX) { @@ -180,7 +220,7 @@ void room_sanity_check(struct quickroom *qrbuf) /* * getroom() - retrieve room data from disk */ -int getroom(struct quickroom *qrbuf, char *room_name) +int getroom(struct ctdlroom *qrbuf, char *room_name) { struct cdbdata *cdbqr; char lowercase_name[ROOMNAMELEN]; @@ -192,25 +232,25 @@ int getroom(struct quickroom *qrbuf, char *room_name) } lowercase_name[a] = 0; - memset(qrbuf, 0, sizeof(struct quickroom)); + memset(qrbuf, 0, sizeof(struct ctdlroom)); /* First, try the public namespace */ - cdbqr = cdb_fetch(CDB_QUICKROOM, + cdbqr = cdb_fetch(CDB_ROOMS, lowercase_name, strlen(lowercase_name)); /* If that didn't work, try the user's personal namespace */ if (cdbqr == NULL) { snprintf(personal_lowercase_name, sizeof personal_lowercase_name, "%010ld.%s", - CC->usersupp.usernum, lowercase_name); - cdbqr = cdb_fetch(CDB_QUICKROOM, + CC->user.usernum, lowercase_name); + cdbqr = cdb_fetch(CDB_ROOMS, personal_lowercase_name, strlen(personal_lowercase_name)); } if (cdbqr != NULL) { memcpy(qrbuf, cdbqr->ptr, - ((cdbqr->len > sizeof(struct quickroom)) ? - sizeof(struct quickroom) : cdbqr->len)); + ((cdbqr->len > sizeof(struct ctdlroom)) ? + sizeof(struct ctdlroom) : cdbqr->len)); cdb_free(cdbqr); room_sanity_check(qrbuf); @@ -224,11 +264,11 @@ int getroom(struct quickroom *qrbuf, char *room_name) /* * lgetroom() - same as getroom() but locks the record (if supported) */ -int lgetroom(struct quickroom *qrbuf, char *room_name) +int lgetroom(struct ctdlroom *qrbuf, char *room_name) { register int retval; retval = getroom(qrbuf, room_name); - if (retval == 0) begin_critical_section(S_QUICKROOM); + if (retval == 0) begin_critical_section(S_ROOMS); return(retval); } @@ -237,7 +277,7 @@ int lgetroom(struct quickroom *qrbuf, char *room_name) * b_putroom() - back end to putroom() and b_deleteroom() * (if the supplied buffer is NULL, delete the room record) */ -void b_putroom(struct quickroom *qrbuf, char *room_name) +void b_putroom(struct ctdlroom *qrbuf, char *room_name) { char lowercase_name[ROOMNAMELEN]; int a; @@ -247,13 +287,13 @@ void b_putroom(struct quickroom *qrbuf, char *room_name) } if (qrbuf == NULL) { - cdb_delete(CDB_QUICKROOM, + cdb_delete(CDB_ROOMS, lowercase_name, strlen(lowercase_name)); } else { time(&qrbuf->QRmtime); - cdb_store(CDB_QUICKROOM, + cdb_store(CDB_ROOMS, lowercase_name, strlen(lowercase_name), - qrbuf, sizeof(struct quickroom)); + qrbuf, sizeof(struct ctdlroom)); } } @@ -261,7 +301,7 @@ void b_putroom(struct quickroom *qrbuf, char *room_name) /* * putroom() - store room data to disk */ -void putroom(struct quickroom *qrbuf) { +void putroom(struct ctdlroom *qrbuf) { b_putroom(qrbuf, qrbuf->QRname); } @@ -278,11 +318,11 @@ void b_deleteroom(char *room_name) { /* * lputroom() - same as putroom() but unlocks the record (if supported) */ -void lputroom(struct quickroom *qrbuf) +void lputroom(struct ctdlroom *qrbuf) { putroom(qrbuf); - end_critical_section(S_QUICKROOM); + end_critical_section(S_ROOMS); } @@ -304,7 +344,8 @@ void getfloor(struct floor *flbuf, int floor_num) cdb_free(cdbfl); } else { if (floor_num == 0) { - strcpy(flbuf->f_name, "Main Floor"); + safestrncpy(flbuf->f_name, "Main Floor", + sizeof flbuf->f_name); flbuf->f_flags = F_INUSE; flbuf->f_ref_count = 3; } @@ -331,17 +372,30 @@ void lgetfloor(struct floor *flbuf, int floor_num) struct floor *cgetfloor(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; iptr, - ((cdbqr->len > sizeof(struct quickroom)) ? - sizeof(struct quickroom) : cdbqr->len)); + ((cdbqr->len > sizeof(struct ctdlroom)) ? + sizeof(struct ctdlroom) : cdbqr->len)); cdb_free(cdbqr); room_sanity_check(&qrbuf); if (qrbuf.QRflags & QR_INUSE) @@ -404,7 +461,7 @@ void ForEachRoom(void (*CallBack) (struct quickroom *EachRoom, void *out_data), /* * delete_msglist() - delete room message pointers */ -void delete_msglist(struct quickroom *whichroom) +void delete_msglist(struct ctdlroom *whichroom) { struct cdbdata *cdbml; @@ -463,7 +520,7 @@ int sort_msglist(long listptrs[], int oldcount) /* * Determine whether a given room is non-editable. */ -int is_noneditable(struct quickroom *qrbuf) +int is_noneditable(struct ctdlroom *qrbuf) { /* Mail> rooms are non-editable */ @@ -480,15 +537,15 @@ int is_noneditable(struct quickroom *qrbuf) /* * Back-back-end for all room listing commands */ -void list_roomname(struct quickroom *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->usersupp.usernum) ) { - strcpy(truncated_roomname, qrbuf->QRname); - strcpy(truncated_roomname, &truncated_roomname[11]); + && (atol(qrbuf->QRname) == CC->user.usernum) ) { + 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 */ @@ -497,12 +554,15 @@ void list_roomname(struct quickroom *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 ); } @@ -510,29 +570,30 @@ void list_roomname(struct quickroom *qrbuf, int ra) /* * cmd_lrms() - List all accessible rooms, known or forgotten */ -void cmd_lrms_backend(struct quickroom *qrbuf, void *data) +void cmd_lrms_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); int ra; + int view; FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->usersupp); + 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->usersupp, CC->curr_user)) { + if (getuser(&CC->user, CC->curr_user)) { cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); return; } @@ -547,29 +608,30 @@ void cmd_lrms(char *argbuf) /* * cmd_lkra() - List all known rooms */ -void cmd_lkra_backend(struct quickroom *qrbuf, void *data) +void cmd_lkra_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); int ra; + int view; FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->usersupp); + 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->usersupp, CC->curr_user)) { + if (getuser(&CC->user, CC->curr_user)) { cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); return; } @@ -581,25 +643,26 @@ void cmd_lkra(char *argbuf) -void cmd_lprm_backend(struct quickroom *qrbuf, void *data) +void cmd_lprm_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); int ra; + int view; FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->usersupp); + 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); @@ -613,30 +676,31 @@ void cmd_lprm(char *argbuf) /* * cmd_lkrn() - List all known rooms with new messages */ -void cmd_lkrn_backend(struct quickroom *qrbuf, void *data) +void cmd_lkrn_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); int ra; + int view; FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->usersupp); + 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->usersupp, CC->curr_user)) { + if (getuser(&CC->user, CC->curr_user)) { cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); return; } @@ -651,30 +715,31 @@ void cmd_lkrn(char *argbuf) /* * cmd_lkro() - List all known rooms */ -void cmd_lkro_backend(struct quickroom *qrbuf, void *data) +void cmd_lkro_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); int ra; + int view; FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->usersupp); + 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->usersupp, CC->curr_user)) { + if (getuser(&CC->user, CC->curr_user)) { cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); return; } @@ -689,30 +754,31 @@ void cmd_lkro(char *argbuf) /* * cmd_lzrm() - List all forgotten rooms */ -void cmd_lzrm_backend(struct quickroom *qrbuf, void *data) +void cmd_lzrm_backend(struct ctdlroom *qrbuf, void *data) { int FloorBeingSearched = (-1); - int ra; + int view; + FloorBeingSearched = *(int *)data; - ra = CtdlRoomAccess(qrbuf, &CC->usersupp); + 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->usersupp, CC->curr_user)) { + if (getuser(&CC->user, CC->curr_user)) { cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR); return; } @@ -733,6 +799,7 @@ void usergoto(char *where, int display_result, int transiently, { int a; int new_messages = 0; + int old_messages = 0; int total_messages = 0; int info = 0; int rmailflag; @@ -743,136 +810,202 @@ void usergoto(char *where, int display_result, int transiently, 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 quickroom record into CC->quickroom, so + * it has already copied the room record into CC->room, so * we can skip the extra database fetch. */ if (where != NULL) { - strcpy(CC->quickroom.QRname, where); - getroom(&CC->quickroom, where); + safestrncpy(CC->room.QRname, where, sizeof CC->room.QRname); + getroom(&CC->room, where); } /* Take care of all the formalities. */ - begin_critical_section(S_USERSUPP); - CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom); + 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. */ - if ((strcasecmp(CC->quickroom.QRname, config.c_logpages)) + if ((strcasecmp(CC->room.QRname, config.c_logpages)) && (transiently == 0) ) { vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT; vbuf.v_flags = vbuf.v_flags | V_ACCESS; } - CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom); - end_critical_section(S_USERSUPP); + + /* 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 */ newmailcount = NewMailCount(); /* set info to 1 if the user needs to read the room's info file */ - if (CC->quickroom.QRinfo > vbuf.v_lastseen) { + if (CC->room.QRinfo > vbuf.v_lastseen) { info = 1; } - get_mm(); - cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->quickroom.QRnumber, sizeof(long)); + 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; /* usergoto() 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->quickroom.QRflags & QR_MAILBOX) + if (CC->room.QRflags & QR_MAILBOX) rmailflag = 1; else rmailflag = 0; - if ((CC->quickroom.QRroomaide == CC->usersupp.usernum) - || (CC->usersupp.axlevel >= 6)) + if ((CC->room.QRroomaide == CC->user.usernum) + || (CC->user.axlevel >= 6)) raideflag = 1; else raideflag = 0; - strcpy(truncated_roomname, CC->quickroom.QRname); - if ( (CC->quickroom.QRflags & QR_MAILBOX) - && (atol(CC->quickroom.QRname) == CC->usersupp.usernum) ) { - strcpy(truncated_roomname, &truncated_roomname[11]); + safestrncpy(truncated_roomname, CC->room.QRname, sizeof truncated_roomname); + if ( (CC->room.QRflags & QR_MAILBOX) + && (atol(CC->room.QRname) == CC->user.usernum) ) { + 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", - CC->quickroom.QRname, + lprintf(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, (int)total_messages, (int)info, - (int)CC->quickroom.QRflags, - (long)CC->quickroom.QRhighest, + (int)CC->room.QRflags, + (long)CC->room.QRhighest, (long)vbuf.v_lastseen, (int)rmailflag, (int)raideflag, (int)newmailcount, - (int)CC->quickroom.QRfloor, + (int)CC->room.QRfloor, (int)vbuf.v_view, - (int)CC->quickroom.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, "_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 */ void cmd_goto(char *gargs) { - struct quickroom QRscratch; + struct ctdlroom QRscratch; 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->usersupp, 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); + getuser(&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); @@ -880,10 +1013,10 @@ void cmd_goto(char *gargs) /* Then try a mailbox name match */ if (c != 0) { MailboxName(augmented_roomname, sizeof augmented_roomname, - &CC->usersupp, towhere); + &CC->user, towhere); c = getroom(&QRscratch, augmented_roomname); if (c == 0) - strcpy(towhere, augmented_roomname); + safestrncpy(towhere, augmented_roomname, sizeof towhere); } /* And if the room was found... */ @@ -891,14 +1024,14 @@ void cmd_goto(char *gargs) /* Let internal programs go directly to any room. */ if (CC->internal_pgm) { - memcpy(&CC->quickroom, &QRscratch, - sizeof(struct quickroom)); + memcpy(&CC->room, &QRscratch, + sizeof(struct ctdlroom)); usergoto(NULL, 1, transiently, NULL, NULL); return; } /* See if there is an existing user/room relationship */ - ra = CtdlRoomAccess(&QRscratch, &CC->usersupp); + CtdlRoomAccess(&QRscratch, &CC->user, &ra, NULL); /* normal clients have to pass through security */ if (ra & UA_GOTOALLOWED) { @@ -908,14 +1041,14 @@ void cmd_goto(char *gargs) if (ok == 1) { if ((QRscratch.QRflags & QR_MAILBOX) && ((ra & UA_GOTOALLOWED))) { - memcpy(&CC->quickroom, &QRscratch, - sizeof(struct quickroom)); + memcpy(&CC->room, &QRscratch, + sizeof(struct ctdlroom)); usergoto(NULL, 1, transiently, NULL, NULL); return; } else if ((QRscratch.QRflags & QR_PASSWORDED) && ((ra & UA_KNOWN) == 0) && (strcasecmp(QRscratch.QRpasswd, password)) && - (CC->usersupp.axlevel < 6) + (CC->user.axlevel < 6) ) { cprintf("%d wrong or missing passwd\n", ERROR + PASSWORD_REQUIRED); @@ -924,54 +1057,38 @@ void cmd_goto(char *gargs) ((QRscratch.QRflags & QR_PASSWORDED) == 0) && ((QRscratch.QRflags & QR_GUESSNAME) == 0) && ((ra & UA_KNOWN) == 0) && - (CC->usersupp.axlevel < 6) + (CC->user.axlevel < 6) ) { - lprintf(9, "Failed to acquire private room\n"); - goto NOPE; + lprintf(CTDL_DEBUG, "Failed to acquire private room\n"); } else { - memcpy(&CC->quickroom, &QRscratch, - sizeof(struct quickroom)); + memcpy(&CC->room, &QRscratch, + sizeof(struct ctdlroom)); usergoto(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) { - struct usersupp temp; + struct ctdluser temp; struct cdbdata *cdbus; - - getuser(&CC->usersupp, CC->curr_user); - - /* - * This command is only allowed by aides, room aides, - * and room namespace owners - */ - if (is_room_aide() - || (atol(CC->quickroom.QRname) == CC->usersupp.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_USERSUPP); - while (cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) { + cdb_rewind(CDB_USERS); + while (cdbus = cdb_next_item(CDB_USERS), cdbus != NULL) { memset(&temp, 0, sizeof temp); memcpy(&temp, cdbus->ptr, sizeof temp); cdb_free(cdbus); - if ((CC->quickroom.QRflags & QR_INUSE) - && (CtdlRoomAccess(&CC->quickroom, &temp) & UA_KNOWN) + CtdlRoomAccess(&CC->room, &temp, &ra, NULL); + if ((CC->room.QRflags & QR_INUSE) + && (ra & UA_KNOWN) ) cprintf("%s\n", temp.fullname); } @@ -984,50 +1101,64 @@ void cmd_whok(void) */ void cmd_rdir(void) { - char buf[SIZ]; - char flnm[SIZ]; - char comment[SIZ]; + char buf[256]; + char flnm[256]; + char comment[256]; FILE *ls, *fd; struct stat statbuf; + char tempfilename[PATH_MAX]; if (CtdlAccessCheck(ac_logged_in)) return; + CtdlMakeTempFileName(tempfilename, sizeof tempfilename); - getroom(&CC->quickroom, CC->quickroom.QRname); - getuser(&CC->usersupp, CC->curr_user); + getroom(&CC->room, CC->room.QRname); + getuser(&CC->user, CC->curr_user); - if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) { + if ((CC->room.QRflags & QR_DIRECTORY) == 0) { cprintf("%d not here.\n", ERROR + NOT_HERE); return; } - if (((CC->quickroom.QRflags & QR_VISDIR) == 0) - && (CC->usersupp.axlevel < 6) - && (CC->usersupp.usernum != CC->quickroom.QRroomaide)) { + if (((CC->room.QRflags & QR_VISDIR) == 0) + && (CC->user.axlevel < 6) + && (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->quickroom.QRdirname); - - snprintf(buf, sizeof buf, "ls %s/files/%s >%s 2> /dev/null", - BBSDIR, CC->quickroom.QRdirname, CC->temp); - system(buf); - - snprintf(buf, sizeof buf, "%s/files/%s/filedir", BBSDIR, CC->quickroom.QRdirname); + cprintf("%d %s|%s/%s\n", + LISTING_FOLLOWS, + config.c_fqdn, + ctdl_file_dir, + CC->room.QRdirname); + + snprintf(buf, sizeof buf, + "ls %s/%s >%s 2>/dev/null", + ctdl_file_dir, + CC->room.QRdirname, + tempfilename); + system(buf); + + 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"); + ls = fopen(tempfilename, "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->quickroom.QRdirname, flnm); + snprintf(buf, sizeof buf, + "%s/%s/%s", + ctdl_file_dir, + CC->room.QRdirname, + flnm); stat(buf, &statbuf); - strcpy(comment, ""); + safestrncpy(comment, "", sizeof comment); fseek(fd, 0L, 0); while ((fgets(buf, sizeof buf, fd) != NULL) - && (strlen(comment) == 0)) { + && (IsEmptyStr(comment))) { buf[strlen(buf) - 1] = 0; if ((!strncasecmp(buf, flnm, strlen(flnm))) && (buf[strlen(flnm)] == ' ')) @@ -1040,7 +1171,7 @@ void cmd_rdir(void) } fclose(ls); fclose(fd); - unlink(CC->temp); + unlink(tempfilename); cprintf("000\n"); } @@ -1052,26 +1183,26 @@ void cmd_getr(void) { if (CtdlAccessCheck(ac_room_aide)) return; - getroom(&CC->quickroom, CC->quickroom.QRname); + getroom(&CC->room, CC->room.QRname); cprintf("%d%c%s|%s|%s|%d|%d|%d|%d|%d|\n", CIT_OK, CtdlCheckExpress(), - ((CC->quickroom.QRflags & QR_MAILBOX) ? - &CC->quickroom.QRname[11] : CC->quickroom.QRname), + ((CC->room.QRflags & QR_MAILBOX) ? + &CC->room.QRname[11] : CC->room.QRname), - ((CC->quickroom.QRflags & QR_PASSWORDED) ? - CC->quickroom.QRpasswd : ""), + ((CC->room.QRflags & QR_PASSWORDED) ? + CC->room.QRpasswd : ""), - ((CC->quickroom.QRflags & QR_DIRECTORY) ? - CC->quickroom.QRdirname : ""), + ((CC->room.QRflags & QR_DIRECTORY) ? + CC->room.QRdirname : ""), - CC->quickroom.QRflags, - (int) CC->quickroom.QRfloor, - (int) CC->quickroom.QRorder, + CC->room.QRflags, + (int) CC->room.QRfloor, + (int) CC->room.QRorder, - CC->quickroom.QRdefaultview, - CC->quickroom.QRflags2 + CC->room.QRdefaultview, + CC->room.QRflags2 ); } @@ -1086,15 +1217,15 @@ void cmd_getr(void) */ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { int old_floor = 0; - struct quickroom qrbuf; - struct quickroom qrtmp; + struct ctdlroom qrbuf; + struct ctdlroom qrtmp; int ret = 0; 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", + lprintf(CTDL_DEBUG, "CtdlRenameRoom(%s, %s, %d)\n", old_name, new_name, new_floor); if (new_floor >= 0) { @@ -1104,7 +1235,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { } } - begin_critical_section(S_QUICKROOM); + begin_critical_section(S_ROOMS); if ( (getroom(&qrtmp, new_name) == 0) && (strcasecmp(new_name, old_name)) ) { @@ -1115,9 +1246,9 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { ret = crr_room_not_found; } - else if ( (CC->usersupp.axlevel < 6) - && (CC->usersupp.usernum != qrbuf.QRroomaide) - && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CC->usersupp.usernum))) ) { + else if ( (CC->user.axlevel < 6) && (!CC->internal_pgm) + && (CC->user.usernum != qrbuf.QRroomaide) + && ( (((qrbuf.QRflags & QR_MAILBOX) == 0) || (atol(qrbuf.QRname) != CC->user.usernum))) ) { ret = crr_access_denied; } @@ -1127,7 +1258,7 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { 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); } @@ -1178,16 +1309,18 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) { ret = crr_ok; } - end_critical_section(S_QUICKROOM); + end_critical_section(S_ROOMS); /* Adjust the floor reference counts if necessary */ if (new_floor != old_floor) { lgetfloor(&flbuf, old_floor); --flbuf.f_ref_count; lputfloor(&flbuf, old_floor); - lgetfloor(&flbuf, CC->quickroom.QRfloor); + lprintf(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->quickroom.QRfloor); + lputfloor(&flbuf, new_floor); + lprintf(CTDL_DEBUG, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count); } /* ...and everybody say "YATTA!" */ @@ -1200,7 +1333,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; @@ -1217,39 +1350,39 @@ void cmd_setr(char *args) /* When is a new name more than just a new name? When the old name * has a namespace prefix. */ - if (CC->quickroom.QRflags & QR_MAILBOX) { - sprintf(new_name, "%010ld.", atol(CC->quickroom.QRname) ); + 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->quickroom.QRname, new_name, new_floor); + 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); } else if (r == crr_access_denied) { cprintf("%d You do not have permission to edit '%s'\n", ERROR + HIGHER_ACCESS_REQUIRED, - CC->quickroom.QRname); + 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->quickroom, new_name); + getroom(&CC->room, new_name); /* Now we have to do a bunch of other stuff */ @@ -1261,78 +1394,79 @@ void cmd_setr(char *args) new_order = 127; } - lgetroom(&CC->quickroom, CC->quickroom.QRname); + lgetroom(&CC->room, CC->room.QRname); /* Directory room */ - extract(buf, args, 2); + extract_token(buf, args, 2, '|', sizeof buf); buf[15] = 0; - safestrncpy(CC->quickroom.QRdirname, buf, - sizeof CC->quickroom.QRdirname); + safestrncpy(CC->room.QRdirname, buf, + sizeof CC->room.QRdirname); /* Default view */ if (num_parms(args) >= 8) { - CC->quickroom.QRdefaultview = extract_int(args, 7); + CC->room.QRdefaultview = extract_int(args, 7); } /* Second set of flags */ if (num_parms(args) >= 9) { - CC->quickroom.QRflags2 = extract_int(args, 8); + CC->room.QRflags2 = extract_int(args, 8); } /* Misc. flags */ - CC->quickroom.QRflags = (extract_int(args, 3) | QR_INUSE); + CC->room.QRflags = (extract_int(args, 3) | QR_INUSE); /* Clean up a client boo-boo: if the client set the room to * guess-name or passworded, ensure that the private flag is * also set. */ - if ((CC->quickroom.QRflags & QR_GUESSNAME) - || (CC->quickroom.QRflags & QR_PASSWORDED)) - CC->quickroom.QRflags |= QR_PRIVATE; + if ((CC->room.QRflags & QR_GUESSNAME) + || (CC->room.QRflags & QR_PASSWORDED)) + CC->room.QRflags |= QR_PRIVATE; /* Some changes can't apply to BASEROOM */ - if (!strncasecmp(CC->quickroom.QRname, config.c_baseroom, + if (!strncasecmp(CC->room.QRname, config.c_baseroom, ROOMNAMELEN)) { - CC->quickroom.QRorder = 0; - CC->quickroom.QRpasswd[0] = '\0'; - CC->quickroom.QRflags &= ~(QR_PRIVATE & QR_PASSWORDED & + CC->room.QRorder = 0; + CC->room.QRpasswd[0] = '\0'; + CC->room.QRflags &= ~(QR_PRIVATE & QR_PASSWORDED & QR_GUESSNAME & QR_PREFONLY & QR_MAILBOX); - CC->quickroom.QRflags |= QR_PERMANENT; + CC->room.QRflags |= QR_PERMANENT; } else { /* March order (doesn't apply to AIDEROOM) */ if (num_parms(args) >= 7) - CC->quickroom.QRorder = (char) new_order; + CC->room.QRorder = (char) new_order; /* Room password */ - extract(buf, args, 1); + extract_token(buf, args, 1, '|', sizeof buf); buf[10] = 0; - safestrncpy(CC->quickroom.QRpasswd, buf, - sizeof CC->quickroom.QRpasswd); + safestrncpy(CC->room.QRpasswd, buf, + sizeof CC->room.QRpasswd); /* Kick everyone out if the client requested it * (by changing the room's generation number) */ if (extract_int(args, 4)) { - time(&CC->quickroom.QRgen); + time(&CC->room.QRgen); } } /* Some changes can't apply to AIDEROOM */ - if (!strncasecmp(CC->quickroom.QRname, config.c_baseroom, + if (!strncasecmp(CC->room.QRname, config.c_baseroom, ROOMNAMELEN)) { - CC->quickroom.QRorder = 0; - CC->quickroom.QRflags &= ~QR_MAILBOX; - CC->quickroom.QRflags |= QR_PERMANENT; + CC->room.QRorder = 0; + CC->room.QRflags &= ~QR_MAILBOX; + CC->room.QRflags |= QR_PERMANENT; } /* Write the room record back to disk */ - lputroom(&CC->quickroom); + lputroom(&CC->room); /* Create a room directory if necessary */ - if (CC->quickroom.QRflags & QR_DIRECTORY) { - snprintf(buf, sizeof buf, - "mkdir ./files/%s /dev/null 2>/dev/null", - CC->quickroom.QRdirname); - system(buf); - } - snprintf(buf, sizeof buf, "%s> edited by %s\n", CC->quickroom.QRname, CC->curr_user); - aide_message(buf); + if (CC->room.QRflags & QR_DIRECTORY) { + snprintf(buf, sizeof buf,"%s/%s", + ctdl_file_dir, + CC->room.QRdirname); + mkdir(buf, 0755); + } + snprintf(buf, sizeof buf, "The room \"%s\" has been edited by %s.\n", + CC->room.QRname, CC->curr_user); + aide_message(buf, "Room modification Message"); cprintf("%d Ok\n", CIT_OK); } @@ -1343,11 +1477,11 @@ void cmd_setr(char *args) */ void cmd_geta(void) { - struct usersupp usbuf; + struct ctdluser usbuf; if (CtdlAccessCheck(ac_logged_in)) return; - if (getuserbynumber(&usbuf, CC->quickroom.QRroomaide) == 0) { + if (getuserbynumber(&usbuf, CC->room.QRroomaide) == 0) { cprintf("%d %s\n", CIT_OK, usbuf.fullname); } else { cprintf("%d \n", CIT_OK); @@ -1360,7 +1494,7 @@ void cmd_geta(void) */ void cmd_seta(char *new_ra) { - struct usersupp usbuf; + struct ctdluser usbuf; long newu; char buf[SIZ]; int post_notice; @@ -1373,41 +1507,32 @@ void cmd_seta(char *new_ra) newu = usbuf.usernum; } - lgetroom(&CC->quickroom, CC->quickroom.QRname); + lgetroom(&CC->room, CC->room.QRname); post_notice = 0; - if (CC->quickroom.QRroomaide != newu) { + if (CC->room.QRroomaide != newu) { post_notice = 1; } - CC->quickroom.QRroomaide = newu; - lputroom(&CC->quickroom); + CC->room.QRroomaide = newu; + lputroom(&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", - usbuf.fullname, CC->quickroom.QRname); + "%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", - CC->quickroom.QRname); - aide_message(buf); + "There is now no room aide for \"%s\".\n", + CC->room.QRname); + aide_message(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 quickroom *qrbuf, const char *prefix) -{ - snprintf(buf, n, "./%s/%ld", prefix, qrbuf->QRnumber); -} - /* * retrieve info file for this room */ @@ -1417,16 +1542,16 @@ void cmd_rinf(void) char buf[SIZ]; FILE *info_fp; - assoc_file_name(filename, sizeof filename, &CC->quickroom, "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); } @@ -1434,32 +1559,72 @@ 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 schedule_room_for_deletion(struct ctdlroom *qrbuf) +{ + char old_name[ROOMNAMELEN]; + static int seq = 0; + + lprintf(CTDL_NOTICE, "Scheduling room <%s> for deletion\n", + qrbuf->QRname); + + safestrncpy(old_name, qrbuf->QRname, sizeof old_name); + + getroom(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 */ + + putroom(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 quickroom *qrbuf) +void delete_room(struct ctdlroom *qrbuf) { struct floor flbuf; char filename[100]; + /* TODO: filename magic? does this realy work? */ - lprintf(9, "Deleting room <%s>\n", qrbuf->QRname); + lprintf(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_QUICKROOM critical section!) + * (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); @@ -1480,7 +1645,7 @@ void delete_room(struct quickroom *qrbuf) /* * Check access control for deleting a room */ -int CtdlDoIHavePermissionToDeleteThisRoom(struct quickroom *qr) { +int CtdlDoIHavePermissionToDeleteThisRoom(struct ctdlroom *qr) { if ((!(CC->logged_in)) && (!(CC->internal_pgm))) { return(0); @@ -1497,12 +1662,12 @@ int CtdlDoIHavePermissionToDeleteThisRoom(struct quickroom *qr) { if (strlen(qr->QRname) < 12) return(0); /* bad name */ - if (atol(qr->QRname) != CC->usersupp.usernum) { + if (atol(qr->QRname) != CC->user.usernum) { return(0); /* not my room */ } /* 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); @@ -1525,28 +1690,28 @@ void cmd_kill(char *argbuf) kill_ok = extract_int(argbuf, 0); - if (CtdlDoIHavePermissionToDeleteThisRoom(&CC->quickroom) == 0) { + if (CtdlDoIHavePermissionToDeleteThisRoom(&CC->room) == 0) { cprintf("%d Can't delete this room.\n", ERROR + NOT_HERE); return; } if (kill_ok) { - if (CC->quickroom.QRflags & QR_MAILBOX) { - strcpy(deleted_room_name, &CC->quickroom.QRname[11]); + if (CC->room.QRflags & QR_MAILBOX) { + safestrncpy(deleted_room_name, &CC->room.QRname[11], sizeof deleted_room_name); } else { - strcpy(deleted_room_name, CC->quickroom.QRname); + safestrncpy(deleted_room_name, CC->room.QRname, sizeof deleted_room_name); } /* Do the dirty work */ - delete_room(&CC->quickroom); + schedule_room_for_deletion(&CC->room); /* Return to the Lobby */ usergoto(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); + aide_message(msg, "Room Purger Message"); cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name); } else { cprintf("%d ok to delete.\n", CIT_OK); @@ -1565,21 +1730,23 @@ unsigned create_room(char *new_room_name, char *new_room_pass, int new_room_floor, int really_create, - int avoid_access) + int avoid_access, + int new_room_view) { - struct quickroom qrbuf; + struct ctdlroom qrbuf; struct floor flbuf; struct visit vbuf; - lprintf(9, "create_room(%s)\n", new_room_name); + lprintf(CTDL_DEBUG, "create_room(name=%s, type=%d, view=%d)\n", + new_room_name, new_room_type, new_room_view); + if (getroom(&qrbuf, new_room_name) == 0) { - lprintf(9, "%s already exists.\n", new_room_name); - return (0); /* already exists */ + lprintf(CTDL_DEBUG, "%s already exists.\n", new_room_name); + return(0); } - - memset(&qrbuf, 0, sizeof(struct quickroom)); + memset(&qrbuf, 0, sizeof(struct ctdlroom)); safestrncpy(qrbuf.QRpasswd, new_room_pass, sizeof qrbuf.QRpasswd); qrbuf.QRflags = QR_INUSE; if (new_room_type > 0) @@ -1588,14 +1755,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->usersupp, new_room_name); + MailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->user, new_room_name); } else { safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname); @@ -1606,7 +1775,7 @@ unsigned create_room(char *new_room_name, * set the room aide to undefined. */ if ((qrbuf.QRflags & QR_PRIVATE) && (CREATAIDE == 1)) { - qrbuf.QRroomaide = CC->usersupp.usernum; + qrbuf.QRroomaide = CC->user.usernum; } else { qrbuf.QRroomaide = (-1L); } @@ -1621,6 +1790,7 @@ 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); @@ -1633,13 +1803,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->usersupp, CC->curr_user); - CtdlGetRelationship(&vbuf, &CC->usersupp, &qrbuf); + 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->usersupp, &qrbuf); - lputuser(&CC->usersupp); + CtdlSetRelationship(&vbuf, &CC->user, &qrbuf); } /* resume our happy day */ @@ -1653,26 +1821,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,7 +1854,12 @@ void cmd_cre8(char *args) if (num_parms(args) >= 5) { fl = cgetfloor(extract_int(args, 4)); - if ((fl->f_flags & F_INUSE) == 0) { + 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; @@ -1695,27 +1870,26 @@ void cmd_cre8(char *args) if (CtdlAccessCheck(ac_logged_in)) return; - if (CC->usersupp.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->usersupp.axlevel < 6)) { + if (CC->user.axlevel < 6) { cprintf("%d Higher access required\n", - ERROR+HIGHER_ACCESS_REQUIRED); + ERROR + HIGHER_ACCESS_REQUIRED); return; } } @@ -1723,7 +1897,7 @@ void cmd_cre8(char *args) /* Check to make sure the requested room name doesn't already exist */ newflags = create_room(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,24 +1912,23 @@ 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); + 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->usersupp.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 : "") + ); + aide_message(notification_message, "Room Creation Message"); + free(notification_message); cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name); } @@ -1768,16 +1941,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->quickroom, "info"); - lprintf(9, "opening\n"); + assoc_file_name(infofilename, sizeof infofilename, &CC->room, ctdl_info_dir); + lprintf(CTDL_DEBUG, "opening\n"); fp = fopen(infofilename, "w"); - lprintf(9, "checking\n"); + lprintf(CTDL_DEBUG, "checking\n"); if (fp == NULL) { cprintf("%d Cannot open %s: %s\n", ERROR + INTERNAL_ERROR, infofilename, strerror(errno)); @@ -1786,16 +1961,16 @@ 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->quickroom, CC->quickroom.QRname); /* lock so no one steps on us */ - CC->quickroom.QRinfo = CC->quickroom.QRhighest + 1L; - lputroom(&CC->quickroom); + lgetroom(&CC->room, CC->room.QRname); /* lock so no one steps on us */ + CC->room.QRinfo = CC->room.QRhighest + 1L; + lputroom(&CC->room); } @@ -1830,20 +2005,20 @@ 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; } @@ -1939,7 +2114,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; } @@ -1954,7 +2129,7 @@ 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);