-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Server functions which perform operations on room objects.
+ *
+ */
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
#include <string.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
#endif
-#include <time.h>
+
#include <limits.h>
#include <errno.h>
#include "citadel.h"
#include "support.h"
#include "user_ops.h"
#include "msgbase.h"
-#include "serv_chat.h"
#include "citserver.h"
#include "control.h"
#include "tools.h"
+struct floor *floorcache[MAXFLOORS];
+
/*
* Generic routine for determining user access to rooms
*/
if (vbuf.v_flags & V_LOCKOUT) {
retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED;
}
+
/* Aides get access to everything */
if (userbuf->axlevel >= 6) {
- retval = retval | UA_KNOWN | UA_GOTOALLOWED;
- retval = retval & ~UA_ZAPPED;
+ if (vbuf.v_flags & V_FORGET) {
+ retval = retval | UA_GOTOALLOWED;
+ }
+ else {
+ retval = retval | UA_KNOWN | UA_GOTOALLOWED;
+ }
}
- NEWMSG: /* By the way, we also check for the presence of new messages */
- if ((roombuf->QRhighest) > (vbuf.v_lastseen)) {
+
+NEWMSG: /* By the way, we also check for the presence of new messages */
+ if (is_msg_in_mset(vbuf.v_seen, roombuf->QRhighest) == 0) {
retval = retval | UA_HASNEWMSGS;
}
return (retval);
*/
int lgetroom(struct quickroom *qrbuf, char *room_name)
{
- begin_critical_section(S_QUICKROOM);
- return (getroom(qrbuf, room_name));
+ register int retval;
+ retval = getroom(qrbuf, room_name);
+ if (retval == 0) begin_critical_section(S_QUICKROOM);
+ return(retval);
}
}
+/*
+ * cgetfloor() - Get floor record from *cache* (loads from disk if needed)
+ *
+ * This is strictly a performance hack.
+ */
+struct floor *cgetfloor(int floor_num) {
+ static int initialized = 0;
+ int i;
+
+ if (initialized == 0) {
+ for (i=0; i<MAXFLOORS; ++i) {
+ floorcache[floor_num] = NULL;
+ }
+ initialized = 1;
+ }
+
+ if (floorcache[floor_num] == NULL) {
+ floorcache[floor_num] = mallok(sizeof(struct floor));
+ getfloor(floorcache[floor_num], floor_num);
+ }
+
+ return(floorcache[floor_num]);
+}
+
+
+
/*
* putfloor() - store floor data on disk
*/
{
cdb_store(CDB_FLOORTAB, &floor_num, sizeof(int),
flbuf, sizeof(struct floor));
+
+ /* If we've cached this, clear it out, 'cuz it's WRONG now! */
+ if (floorcache[floor_num] != NULL) {
+ phree(floorcache[floor_num]);
+ floorcache[floor_num] = NULL;
+ }
}
/*
* Traverse the room file...
*/
-void ForEachRoom(void (*CallBack) (struct quickroom * EachRoom))
+void ForEachRoom(void (*CallBack) (struct quickroom *EachRoom, void *out_data),
+ void *in_data)
{
struct quickroom qrbuf;
struct cdbdata *cdbqr;
cdb_free(cdbqr);
room_sanity_check(&qrbuf);
if (qrbuf.QRflags & QR_INUSE)
- (*CallBack) (&qrbuf);
+ (*CallBack)(&qrbuf, in_data);
}
}
-
-/*
- * get_msglist() - retrieve room message pointers
- */
-void get_msglist(struct quickroom *whichroom)
-{
- struct cdbdata *cdbfr;
-
- if (CC->msglist != NULL) {
- phree(CC->msglist);
- }
- CC->msglist = NULL;
- CC->num_msgs = 0;
-
- cdbfr = cdb_fetch(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
- if (cdbfr == NULL) {
- return;
- }
- CC->msglist = mallok(cdbfr->len);
- memcpy(CC->msglist, cdbfr->ptr, cdbfr->len);
- CC->num_msgs = cdbfr->len / sizeof(long);
- cdb_free(cdbfr);
-}
-
-
-/*
- * put_msglist() - retrieve room message pointers
- */
-void put_msglist(struct quickroom *whichroom)
-{
-
- if (CC->msglist != NULL)
- cdb_store(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long),
- CC->msglist, CC->num_msgs * sizeof(long));
-}
-
-
/*
* delete_msglist() - delete room message pointers
- * FIX - this really should check first to make sure there's actually a
- * msglist to delete. As things stand now, calling this function on
- * a room which has never been posted in will result in a message
- * like "gdbm: illegal data" (no big deal, but could use fixing).
*/
void delete_msglist(struct quickroom *whichroom)
{
+ struct cdbdata *cdbml;
- cdb_delete(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
-}
-
-
-/*
- * Add a message number to a room's message list.
- * So, why doesn't this function use the get_msglist() and put_msglist() stuff
- * defined above? Because the room the message number is being written to
- * may not be the current room (as is the case with cmd_move() for example).
- *
- * This function returns the highest message number present in the room after
- * the add operation is performed - which is not necessarily the message
- * being added.
- */
-long AddMessageToRoom(struct quickroom *whichroom, long newmsgid)
-{
- struct cdbdata *cdbfr;
- int num_msgs;
- long *msglist;
- long highest_msg = 0L;
-
- lprintf(9, "AddMessageToRoom(%s, %ld)\n", whichroom->QRname, newmsgid);
- cdbfr = cdb_fetch(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
- if (cdbfr == NULL) {
- msglist = NULL;
- num_msgs = 0;
- } else {
- msglist = mallok(cdbfr->len);
- if (msglist == NULL)
- lprintf(3, "ERROR malloc msglist!\n");
- num_msgs = cdbfr->len / sizeof(long);
- memcpy(msglist, cdbfr->ptr, cdbfr->len);
- cdb_free(cdbfr);
- }
-
- /* Now add the new message */
- ++num_msgs;
- msglist = reallok(msglist,
- (num_msgs * sizeof(long)));
+ /* Make sure the msglist we're deleting actually exists, otherwise
+ * gdbm will complain when we try to delete an invalid record
+ */
+ cdbml = cdb_fetch(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
+ if (cdbml != NULL) {
+ cdb_free(cdbml);
- if (msglist == NULL) {
- lprintf(3, "ERROR: can't realloc message list!\n");
+ /* Go ahead and delete it */
+ cdb_delete(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
}
- msglist[num_msgs - 1] = newmsgid;
-
- /* Sort the message list, so all the msgid's are in order */
- num_msgs = sort_msglist(msglist, num_msgs);
-
- /* Determine the highest message number */
- highest_msg = msglist[num_msgs - 1];
-
- /* Write it back to disk. */
- cdb_store(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long),
- msglist, num_msgs * sizeof(long));
-
- /* And finally, free up the memory we used. */
- phree(msglist);
- return (highest_msg);
}
-/*
- * MessageFromList() - get a message number from the list currently in memory
- */
-long MessageFromList(int whichpos)
-{
-
- /* Return zero if the position is invalid */
- if (whichpos >= CC->num_msgs)
- return 0L;
-
- return (CC->msglist[whichpos]);
-}
-
-/*
- * SetMessageInList() - set a message number in the list currently in memory
- */
-void SetMessageInList(int whichpos, long newmsgnum)
-{
-
- /* Return zero if the position is invalid */
- if (whichpos >= CC->num_msgs)
- return;
-
- CC->msglist[whichpos] = newmsgnum;
-}
-
/*
/* and yank any nulls */
while ((numitems > 0) && (listptrs[0] == 0L)) {
memcpy(&listptrs[0], &listptrs[1],
- (sizeof(long) * (CC->num_msgs - 1)));
+ (sizeof(long) * (numitems - 1)));
--numitems;
}
/*
* cmd_lrms() - List all accessible rooms, known or forgotten
*/
-void cmd_lrms_backend(struct quickroom *qrbuf)
+void cmd_lrms_backend(struct quickroom *qrbuf, void *data)
{
+ int FloorBeingSearched = (-1);
+ FloorBeingSearched = *(int *)data;
+
if (((CtdlRoomAccess(qrbuf, &CC->usersupp)
& (UA_KNOWN | UA_ZAPPED)))
- && ((qrbuf->QRfloor == (CC->FloorBeingSearched))
- || ((CC->FloorBeingSearched) < 0)))
+ && ((qrbuf->QRfloor == (FloorBeingSearched))
+ || ((FloorBeingSearched) < 0)))
list_roomname(qrbuf);
}
void cmd_lrms(char *argbuf)
{
- CC->FloorBeingSearched = (-1);
+ int FloorBeingSearched = (-1);
if (strlen(argbuf) > 0)
- CC->FloorBeingSearched = extract_int(argbuf, 0);
+ FloorBeingSearched = extract_int(argbuf, 0);
+
+ if (CtdlAccessCheck(ac_logged_in)) return;
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
if (getuser(&CC->usersupp, 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);
+ ForEachRoom(cmd_lrms_backend, &FloorBeingSearched);
cprintf("000\n");
}
/*
* cmd_lkra() - List all known rooms
*/
-void cmd_lkra_backend(struct quickroom *qrbuf)
+void cmd_lkra_backend(struct quickroom *qrbuf, void *data)
{
+ int FloorBeingSearched = (-1);
+ FloorBeingSearched = *(int *)data;
+
if (((CtdlRoomAccess(qrbuf, &CC->usersupp)
& (UA_KNOWN)))
- && ((qrbuf->QRfloor == (CC->FloorBeingSearched))
- || ((CC->FloorBeingSearched) < 0)))
+ && ((qrbuf->QRfloor == (FloorBeingSearched))
+ || ((FloorBeingSearched) < 0)))
list_roomname(qrbuf);
}
void cmd_lkra(char *argbuf)
{
- CC->FloorBeingSearched = (-1);
+ int FloorBeingSearched = (-1);
if (strlen(argbuf) > 0)
- CC->FloorBeingSearched = extract_int(argbuf, 0);
+ FloorBeingSearched = extract_int(argbuf, 0);
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
+ if (CtdlAccessCheck(ac_logged_in)) return;
+
if (getuser(&CC->usersupp, 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);
+ ForEachRoom(cmd_lkra_backend, &FloorBeingSearched);
cprintf("000\n");
}
/*
* cmd_lkrn() - List all known rooms with new messages
*/
-void cmd_lkrn_backend(struct quickroom *qrbuf)
+void cmd_lkrn_backend(struct quickroom *qrbuf, void *data)
{
int ra;
+ int FloorBeingSearched = (-1);
+ FloorBeingSearched = *(int *)data;
ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
if ((ra & UA_KNOWN)
&& (ra & UA_HASNEWMSGS)
- && ((qrbuf->QRfloor == (CC->FloorBeingSearched))
- || ((CC->FloorBeingSearched) < 0)))
+ && ((qrbuf->QRfloor == (FloorBeingSearched))
+ || ((FloorBeingSearched) < 0)))
list_roomname(qrbuf);
}
void cmd_lkrn(char *argbuf)
{
- CC->FloorBeingSearched = (-1);
+ int FloorBeingSearched = (-1);
if (strlen(argbuf) > 0)
- CC->FloorBeingSearched = extract_int(argbuf, 0);
+ FloorBeingSearched = extract_int(argbuf, 0);
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
+ if (CtdlAccessCheck(ac_logged_in)) return;
+
if (getuser(&CC->usersupp, 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);
+ ForEachRoom(cmd_lkrn_backend, &FloorBeingSearched);
cprintf("000\n");
}
/*
* cmd_lkro() - List all known rooms
*/
-void cmd_lkro_backend(struct quickroom *qrbuf)
+void cmd_lkro_backend(struct quickroom *qrbuf, void *data)
{
int ra;
+ int FloorBeingSearched = (-1);
+ FloorBeingSearched = *(int *)data;
ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
if ((ra & UA_KNOWN)
&& ((ra & UA_HASNEWMSGS) == 0)
- && ((qrbuf->QRfloor == (CC->FloorBeingSearched))
- || ((CC->FloorBeingSearched) < 0)))
+ && ((qrbuf->QRfloor == (FloorBeingSearched))
+ || ((FloorBeingSearched) < 0)))
list_roomname(qrbuf);
}
void cmd_lkro(char *argbuf)
{
- CC->FloorBeingSearched = (-1);
+ int FloorBeingSearched = (-1);
if (strlen(argbuf) > 0)
- CC->FloorBeingSearched = extract_int(argbuf, 0);
+ FloorBeingSearched = extract_int(argbuf, 0);
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
+ if (CtdlAccessCheck(ac_logged_in)) return;
+
if (getuser(&CC->usersupp, 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);
+ ForEachRoom(cmd_lkro_backend, &FloorBeingSearched);
cprintf("000\n");
}
/*
* cmd_lzrm() - List all forgotten rooms
*/
-void cmd_lzrm_backend(struct quickroom *qrbuf)
+void cmd_lzrm_backend(struct quickroom *qrbuf, void *data)
{
int ra;
+ int FloorBeingSearched = (-1);
+ FloorBeingSearched = *(int *)data;
ra = CtdlRoomAccess(qrbuf, &CC->usersupp);
if ((ra & UA_GOTOALLOWED)
&& (ra & UA_ZAPPED)
- && ((qrbuf->QRfloor == (CC->FloorBeingSearched))
- || ((CC->FloorBeingSearched) < 0)))
+ && ((qrbuf->QRfloor == (FloorBeingSearched))
+ || ((FloorBeingSearched) < 0)))
list_roomname(qrbuf);
}
void cmd_lzrm(char *argbuf)
{
- CC->FloorBeingSearched = (-1);
+ int FloorBeingSearched = (-1);
if (strlen(argbuf) > 0)
- CC->FloorBeingSearched = extract_int(argbuf, 0);
+ FloorBeingSearched = extract_int(argbuf, 0);
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
+ if (CtdlAccessCheck(ac_logged_in)) return;
+
if (getuser(&CC->usersupp, 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);
+ ForEachRoom(cmd_lzrm_backend, &FloorBeingSearched);
cprintf("000\n");
}
-void usergoto(char *where, int display_result)
+void usergoto(char *where, int display_result, int *retmsgs, int *retnew)
{
int a;
int new_messages = 0;
int newmailcount = 0;
struct visit vbuf;
char truncated_roomname[ROOMNAMELEN];
+ struct cdbdata *cdbfr;
+ long *msglist = NULL;
+ int num_msgs = 0;
strcpy(CC->quickroom.QRname, where);
getroom(&CC->quickroom, where);
vbuf.v_flags = vbuf.v_flags | V_ACCESS;
}
CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
- lputuser(&CC->usersupp, CC->curr_user);
+ lputuser(&CC->usersupp);
/* check for new mail */
newmailcount = NewMailCount();
info = 1;
get_mm();
- get_msglist(&CC->quickroom);
- for (a = 0; a < CC->num_msgs; ++a) {
- if (MessageFromList(a) > 0L) {
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->quickroom.QRnumber, sizeof(long));
+ if (cdbfr != NULL) {
+ msglist = mallok(cdbfr->len);
+ memcpy(msglist, cdbfr->ptr, cdbfr->len);
+ 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 (MessageFromList(a) > vbuf.v_lastseen) {
+ if (is_msg_in_mset(vbuf.v_seen, msglist[a]) == 0) {
++new_messages;
}
}
}
+ if (msglist != NULL) phree(msglist);
+
if (CC->quickroom.QRflags & QR_MAILBOX)
rmailflag = 1;
else
if (CC->quickroom.QRflags & QR_MAILBOX) {
strcpy(truncated_roomname, &truncated_roomname[11]);
}
+
+ 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, new_messages, total_messages);
+
if (display_result)
cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d\n",
- OK, check_express(),
+ OK, CtdlCheckExpress(),
truncated_roomname,
new_messages, total_messages,
info, CC->quickroom.QRflags,
CC->quickroom.QRhighest,
vbuf.v_lastseen,
- rmailflag, raideflag, newmailcount, CC->quickroom.QRfloor);
+ rmailflag, raideflag, newmailcount,
+ CC->quickroom.QRfloor);
- set_wtmpsupp_to_current_room();
}
int c;
int ok = 0;
int ra;
- char augmented_roomname[256];
- char towhere[256];
- char password[256];
+ char augmented_roomname[SIZ];
+ char towhere[SIZ];
+ char password[SIZ];
+
+ if (CtdlAccessCheck(ac_logged_in)) return;
- if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
- cprintf("%d not logged in\n", ERROR + NOT_LOGGED_IN);
- return;
- }
extract(towhere, gargs, 0);
extract(password, gargs, 1);
if (c == 0)
strcpy(towhere, augmented_roomname);
}
+
/* And if the room was found... */
if (c == 0) {
/* let internal programs go directly to any room */
if (CC->internal_pgm) {
- usergoto(towhere, 1);
+ usergoto(towhere, 1, NULL, NULL);
return;
}
+
/* See if there is an existing user/room relationship */
ra = CtdlRoomAccess(&QRscratch, &CC->usersupp);
if (ok == 1) {
if ((QRscratch.QRflags & QR_PASSWORDED) &&
((ra & UA_KNOWN) == 0) &&
- (strcasecmp(QRscratch.QRpasswd, password))
+ (strcasecmp(QRscratch.QRpasswd, password)) &&
+ (CC->usersupp.axlevel < 6)
) {
cprintf("%d wrong or missing passwd\n",
ERROR + PASSWORD_REQUIRED);
} else if ((QRscratch.QRflags & QR_PRIVATE) &&
((QRscratch.QRflags & QR_PASSWORDED) == 0) &&
((QRscratch.QRflags & QR_GUESSNAME) == 0) &&
- ((ra & UA_KNOWN) == 0)) {
+ ((ra & UA_KNOWN) == 0) &&
+ (CC->usersupp.axlevel < 6)
+ ) {
goto NOPE;
} else {
- usergoto(towhere, 1);
+ usergoto(towhere, 1, NULL, NULL);
return;
}
}
}
- NOPE:cprintf("%d room '%s' not found\n", ERROR + ROOM_NOT_FOUND, towhere);
+
+NOPE: cprintf("%d room '%s' not found\n", ERROR + ROOM_NOT_FOUND, towhere);
}
struct usersupp temp;
struct cdbdata *cdbus;
- if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
getuser(&CC->usersupp, CC->curr_user);
+ if (CtdlAccessCheck(ac_room_aide)) return;
- if ((!is_room_aide()) && (!(CC->internal_pgm))) {
- cprintf("%d Higher access required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
cprintf("%d Who knows room:\n", LISTING_FOLLOWS);
cdb_rewind(CDB_USERSUPP);
while (cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) {
- memset(&temp, 0, sizeof(struct usersupp));
- memcpy(&temp, cdbus->ptr, cdbus->len);
+ memset(&temp, 0, sizeof temp);
+ memcpy(&temp, cdbus->ptr, sizeof temp);
cdb_free(cdbus);
if ((CC->quickroom.QRflags & QR_INUSE)
*/
void cmd_rdir(void)
{
- char buf[256];
- char flnm[256];
- char comment[256];
+ char buf[SIZ];
+ char flnm[SIZ];
+ char comment[SIZ];
FILE *ls, *fd;
struct stat statbuf;
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
+ if (CtdlAccessCheck(ac_logged_in)) return;
+
getroom(&CC->quickroom, CC->quickroom.QRname);
getuser(&CC->usersupp, CC->curr_user);
cprintf("%d %s|%s/files/%s\n",
LISTING_FOLLOWS, config.c_fqdn, BBSDIR, CC->quickroom.QRdirname);
- sprintf(buf, "cd %s/files/%s; ls >%s 2>/dev/null",
- BBSDIR, CC->quickroom.QRdirname, CC->temp);
- system(buf);
+ sprintf(buf, "ls %s/files/%s >%s 2> /dev/null",
+ BBSDIR, CC->quickroom.QRdirname, CC->temp);
+ system(buf);
sprintf(buf, "%s/files/%s/filedir", BBSDIR, CC->quickroom.QRdirname);
fd = fopen(buf, "r");
fd = fopen("/dev/null", "r");
ls = fopen(CC->temp, "r");
- while (fgets(flnm, 256, ls) != NULL) {
+ while (fgets(flnm, sizeof flnm, ls) != NULL) {
flnm[strlen(flnm) - 1] = 0;
if (strcasecmp(flnm, "filedir")) {
sprintf(buf, "%s/files/%s/%s",
stat(buf, &statbuf);
strcpy(comment, "");
fseek(fd, 0L, 0);
- while ((fgets(buf, 256, fd) != NULL)
+ while ((fgets(buf, sizeof buf, fd) != NULL)
&& (strlen(comment) == 0)) {
buf[strlen(buf) - 1] = 0;
if ((!strncasecmp(buf, flnm, strlen(flnm)))
&& (buf[strlen(flnm)] == ' '))
- strncpy(comment,
- &buf[strlen(flnm) + 1], 255);
+ safestrncpy(comment,
+ &buf[strlen(flnm) + 1],
+ sizeof comment);
}
cprintf("%s|%ld|%s\n", flnm, statbuf.st_size, comment);
}
*/
void cmd_getr(void)
{
- if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- if ((!is_room_aide()) && (!(CC->internal_pgm))) {
- cprintf("%d Higher access required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
+ if (CtdlAccessCheck(ac_room_aide)) return;
+
+ /********
if (is_noneditable(&CC->quickroom)) {
cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
return;
}
+ ************/
+
getroom(&CC->quickroom, CC->quickroom.QRname);
cprintf("%d%c%s|%s|%s|%d|%d|%d\n",
- OK, check_express(),
+ OK, CtdlCheckExpress(),
CC->quickroom.QRname,
((CC->quickroom.QRflags & QR_PASSWORDED) ? CC->quickroom.QRpasswd : ""),
((CC->quickroom.QRflags & QR_DIRECTORY) ? CC->quickroom.QRdirname : ""),
*/
void cmd_setr(char *args)
{
- char buf[256];
+ char buf[SIZ];
+ struct floor *fl;
struct floor flbuf;
char old_name[ROOMNAMELEN];
int old_floor;
int new_order = 0;
+ int ne = 0;
+
+ if (CtdlAccessCheck(ac_room_aide)) return;
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- if (!is_room_aide()) {
- cprintf("%d Higher access required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
if (is_noneditable(&CC->quickroom)) {
+ ne = 1;
+ }
+
+ /***
cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
return;
}
+ ***/
+
+
if (num_parms(args) >= 6) {
- getfloor(&flbuf, extract_int(args, 5));
- if ((flbuf.f_flags & F_INUSE) == 0) {
+ fl = cgetfloor(extract_int(args, 5));
+ if ((fl->f_flags & F_INUSE) == 0) {
cprintf("%d Invalid floor number.\n",
ERROR + INVALID_FLOOR_OPERATION);
return;
new_order = 127;
}
lgetroom(&CC->quickroom, CC->quickroom.QRname);
+
+ /* Non-editable base rooms can't be renamed */
strcpy(old_name, CC->quickroom.QRname);
- extract(buf, args, 0);
- buf[ROOMNAMELEN] = 0;
- strncpy(CC->quickroom.QRname, buf, ROOMNAMELEN - 1);
+ if (!ne) {
+ extract(buf, args, 0);
+ buf[ROOMNAMELEN] = 0;
+ safestrncpy(CC->quickroom.QRname, buf,
+ sizeof CC->quickroom.QRname);
+ }
+
extract(buf, args, 1);
buf[10] = 0;
- strncpy(CC->quickroom.QRpasswd, buf, 9);
+ safestrncpy(CC->quickroom.QRpasswd, buf, sizeof CC->quickroom.QRpasswd);
extract(buf, args, 2);
buf[15] = 0;
- strncpy(CC->quickroom.QRdirname, buf, 19);
+ safestrncpy(CC->quickroom.QRdirname, buf,
+ sizeof CC->quickroom.QRdirname);
CC->quickroom.QRflags = (extract_int(args, 3) | QR_INUSE);
if (num_parms(args) >= 7)
CC->quickroom.QRorder = (char) new_order;
CC->quickroom.QRdirname);
system(buf);
}
- sprintf(buf, "%s> edited by %s", CC->quickroom.QRname, CC->curr_user);
+ sprintf(buf, "%s> edited by %s\n", CC->quickroom.QRname, CC->curr_user);
aide_message(buf);
cprintf("%d Ok\n", OK);
}
{
struct usersupp usbuf;
- if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
+ if (CtdlAccessCheck(ac_logged_in)) return;
+
if (is_noneditable(&CC->quickroom)) {
cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
return;
{
struct usersupp usbuf;
long newu;
- char buf[256];
+ char buf[SIZ];
int post_notice;
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- if (!is_room_aide()) {
- cprintf("%d Higher access required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
+ if (CtdlAccessCheck(ac_room_aide)) return;
+
if (getuser(&usbuf, new_ra) != 0) {
newu = (-1L);
} else {
* the room table, otherwise it would deadlock!
*/
if (post_notice == 1) {
- sprintf(buf, "%s is now room aide for %s>",
+ sprintf(buf, "%s is now room aide for %s>\n",
usbuf.fullname, CC->quickroom.QRname);
aide_message(buf);
}
void cmd_rinf(void)
{
char filename[128];
- char buf[256];
+ char buf[SIZ];
FILE *info_fp;
assoc_file_name(filename, &CC->quickroom, "info");
return;
}
cprintf("%d Info:\n", LISTING_FOLLOWS);
- while (fgets(buf, 256, info_fp) != NULL) {
+ while (fgets(buf, sizeof buf, info_fp) != NULL) {
if (strlen(buf) > 0)
buf[strlen(buf) - 1] = 0;
cprintf("%s\n", buf);
void delete_room(struct quickroom *qrbuf)
{
struct floor flbuf;
- long MsgToDelete;
- char aaa[100];
- int a;
+ char filename[100];
lprintf(9, "Deleting room <%s>\n", qrbuf->QRname);
/* Delete the info file */
- assoc_file_name(aaa, qrbuf, "info");
- unlink(aaa);
+ assoc_file_name(filename, qrbuf, "info");
+ unlink(filename);
/* Delete the image file */
- assoc_file_name(aaa, qrbuf, "images");
- unlink(aaa);
+ assoc_file_name(filename, qrbuf, "images");
+ unlink(filename);
- /* first flag the room record as not in use */
+ /* Delete the room's network config file */
+ assoc_file_name(filename, qrbuf, "netconfigs");
+ unlink(filename);
+
+ /* Delete the messages in the room
+ * (Careful: this opens an S_QUICKROOM critical section!)
+ */
+ CtdlDeleteMessages(qrbuf->QRname, 0L, "");
+
+ /* Flag the room record as not in use */
lgetroom(qrbuf, qrbuf->QRname);
qrbuf->QRflags = 0;
-
- /* then delete the messages in the room */
- get_msglist(qrbuf);
- if (CC->num_msgs > 0)
- for (a = 0; a < CC->num_msgs; ++a) {
- MsgToDelete = MessageFromList(a);
- AdjRefCount(MsgToDelete, -1);
- }
- put_msglist(qrbuf);
- phree(CC->msglist);
- CC->msglist = NULL;
- CC->num_msgs = 0;
- delete_msglist(qrbuf);
lputroom(qrbuf);
/* then decrement the reference count for the floor */
}
+
+/*
+ * Check access control for deleting a room
+ */
+int CtdlDoIHavePermissionToDeleteThisRoom(struct quickroom *qr) {
+
+ if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
+ return(0);
+ }
+
+ if (is_noneditable(qr)) {
+ return(0);
+ }
+
+ /*
+ * For mailboxes, check stuff
+ */
+ if (qr->QRflags & QR_MAILBOX) {
+
+ if (strlen(qr->QRname) < 12) return(0); /* bad name */
+
+ if (atol(qr->QRname) != CC->usersupp.usernum) {
+ return(0); /* not my room */
+ }
+
+ /* Can't delete your Mail> room */
+ if (!strcasecmp(&qr->QRname[12], MAILROOM)) return(0);
+
+ /* Otherwise it's ok */
+ return(1);
+ }
+
+ /*
+ * For normal rooms, just check for aide or room aide status.
+ */
+ else {
+ return(is_room_aide());
+ }
+
+ /* Should never get to this point, but to keep the compiler quiet... */
+ return(0);
+}
+
/*
* aide command: kill the current room
*/
kill_ok = extract_int(argbuf, 0);
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- if (!is_room_aide()) {
- cprintf("%d Higher access required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
- if (is_noneditable(&CC->quickroom)) {
- cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
+ if (CtdlDoIHavePermissionToDeleteThisRoom(&CC->quickroom) == 0) {
+ cprintf("%d Can't delete this room.\n", ERROR + NOT_HERE);
return;
}
if (kill_ok) {
strcpy(deleted_room_name, CC->quickroom.QRname);
delete_room(&CC->quickroom); /* Do the dirty work */
- usergoto(BASEROOM, 0); /* Return to the Lobby */
+ usergoto(BASEROOM, 0, NULL, NULL); /* Return to the Lobby */
/* tell the world what we did */
- sprintf(aaa, "%s> killed by %s",
+ sprintf(aaa, "%s> killed by %s\n",
deleted_room_name, CC->curr_user);
aide_message(aaa);
cprintf("%d '%s' deleted.\n", OK, deleted_room_name);
/*
* Internal code to create a new room (returns room flags)
*
- * Room types: 0=public, 1=guessname, 2=passworded, 3=inv-only, 4=mailbox
+ * Room types: 0=public, 1=guessname, 2=passworded, 3=inv-only,
+ * 4=mailbox, 5=mailbox, but caller supplies namespace
*/
unsigned create_room(char *new_room_name,
int new_room_type,
char *new_room_pass,
- int new_room_floor)
+ int new_room_floor,
+ int really_create)
{
struct quickroom qrbuf;
struct floor flbuf;
struct visit vbuf;
- if (getroom(&qrbuf, new_room_name) == 0)
+ 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 */
+ }
+
memset(&qrbuf, 0, sizeof(struct quickroom));
- strncpy(qrbuf.QRname, new_room_name, ROOMNAMELEN);
- strncpy(qrbuf.QRpasswd, new_room_pass, 9);
+ safestrncpy(qrbuf.QRpasswd, new_room_pass, sizeof qrbuf.QRpasswd);
qrbuf.QRflags = QR_INUSE;
- qrbuf.QRnumber = get_new_room_number();
if (new_room_type > 0)
qrbuf.QRflags = (qrbuf.QRflags | QR_PRIVATE);
if (new_room_type == 1)
qrbuf.QRflags = (qrbuf.QRflags | QR_GUESSNAME);
if (new_room_type == 2)
qrbuf.QRflags = (qrbuf.QRflags | QR_PASSWORDED);
- if (new_room_type == 4)
+ if ( (new_room_type == 4) || (new_room_type == 5) )
qrbuf.QRflags = (qrbuf.QRflags | QR_MAILBOX);
+ /* 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, &CC->usersupp, new_room_name);
+ }
+ else {
+ safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);
+ }
+
/* If the room is private, and the system administrator has elected
* to automatically grant room aide privileges, do so now; otherwise,
* set the room aide to undefined.
qrbuf.QRroomaide = (-1L);
}
+ /*
+ * If the caller is only interested in testing whether this will work,
+ * return now without creating the room.
+ */
+ if (!really_create) return (qrbuf.QRflags);
+
+ qrbuf.QRnumber = get_new_room_number();
qrbuf.QRhighest = 0L; /* No messages in this room yet */
time(&qrbuf.QRgen); /* Use a timestamp as the generation number */
qrbuf.QRfloor = new_room_floor;
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, CC->curr_user);
+ lputuser(&CC->usersupp);
/* resume our happy day */
return (qrbuf.QRflags);
void cmd_cre8(char *args)
{
int cre8_ok;
- char new_room_name[256];
+ char new_room_name[SIZ];
int new_room_type;
- char new_room_pass[256];
+ char new_room_pass[SIZ];
int new_room_floor;
- char aaa[256];
+ char aaa[SIZ];
unsigned newflags;
struct quickroom qrbuf;
- struct floor flbuf;
+ struct floor *fl;
cre8_ok = extract_int(args, 0);
extract(new_room_name, args, 1);
}
if (num_parms(args) >= 5) {
- getfloor(&flbuf, extract_int(args, 4));
- if ((flbuf.f_flags & F_INUSE) == 0) {
+ fl = cgetfloor(extract_int(args, 4));
+ if ((fl->f_flags & F_INUSE) == 0) {
cprintf("%d Invalid floor number.\n",
ERROR + INVALID_FLOOR_OPERATION);
return;
}
}
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
+ if (CtdlAccessCheck(ac_logged_in)) return;
if (CC->usersupp.axlevel < config.c_createax) {
cprintf("%d You need higher access to create rooms.\n",
return;
}
- /* If the user is requesting a personal room, set up the room
- * name accordingly (prepend the user number)
- */
- if (new_room_type == 4) {
- sprintf(aaa, "%010ld.%s",
- CC->usersupp.usernum, new_room_name);
- strcpy(new_room_name, aaa);
- }
-
/* Check to make sure the requested room name doesn't already exist */
- if (getroom(&qrbuf, new_room_name) == 0) {
+ newflags = create_room(new_room_name,
+ new_room_type, new_room_pass, new_room_floor, 0);
+ if (newflags == 0) {
cprintf("%d '%s' already exists.\n",
ERROR + ALREADY_EXISTS, qrbuf.QRname);
return;
return;
}
+ /* 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);
+ new_room_type, new_room_pass, new_room_floor, 1);
/* post a message in Aide> describing the new room */
- strncpy(aaa, new_room_name, 255);
+ safestrncpy(aaa, new_room_name, sizeof aaa);
strcat(aaa, "> created by ");
strcat(aaa, CC->usersupp.fullname);
if (newflags & QR_MAILBOX)
strcat(aaa, "\n Password: ");
strcat(aaa, new_room_pass);
}
+ strcat(aaa, "\n");
aide_message(aaa);
cprintf("%d '%s' has been created.\n", OK, qrbuf.QRname);
void cmd_einf(char *ok)
{ /* enter info file for current room */
FILE *fp;
- char infofilename[256];
- char buf[256];
+ char infofilename[SIZ];
+ char buf[SIZ];
+
+ if (CtdlAccessCheck(ac_room_aide)) return;
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- if (!is_room_aide()) {
- cprintf("%d Higher access required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
if (atoi(ok) == 0) {
cprintf("%d Ok.\n", OK);
return;
int a;
struct floor flbuf;
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- /* if (getuser(&CC->usersupp,CC->curr_user)) {
- cprintf("%d Can't locate user!\n",ERROR+INTERNAL_ERROR);
- return;
- }
- */
+ if (CtdlAccessCheck(ac_logged_in)) return;
cprintf("%d Known floors:\n", LISTING_FOLLOWS);
*/
void cmd_cflr(char *argbuf)
{
- char new_floor_name[256];
+ char new_floor_name[SIZ];
struct floor flbuf;
int cflr_ok;
int free_slot = (-1);
cflr_ok = extract_int(argbuf, 1);
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- if (CC->usersupp.axlevel < 6) {
- cprintf("%d You need higher access to create rooms.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
+ if (CtdlAccessCheck(ac_aide)) return;
+
for (a = 0; a < MAXFLOORS; ++a) {
getfloor(&flbuf, a);
lgetfloor(&flbuf, free_slot);
flbuf.f_flags = F_INUSE;
flbuf.f_ref_count = 0;
- strncpy(flbuf.f_name, new_floor_name, 255);
+ safestrncpy(flbuf.f_name, new_floor_name, sizeof flbuf.f_name);
lputfloor(&flbuf, free_slot);
cprintf("%d %d\n", OK, free_slot);
}
floor_to_delete = extract_int(argbuf, 0);
kflr_ok = extract_int(argbuf, 1);
+ if (CtdlAccessCheck(ac_aide)) return;
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- if (CC->usersupp.axlevel < 6) {
- cprintf("%d You need higher access to delete floors.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
lgetfloor(&flbuf, floor_to_delete);
delete_ok = 1;
cprintf("%d Usage error.\n", ERROR);
return;
}
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- if (CC->usersupp.axlevel < 6) {
- cprintf("%d You need higher access to edit floors.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
+
+ if (CtdlAccessCheck(ac_aide)) return;
+
floor_num = extract_int(argbuf, 0);
lgetfloor(&flbuf, floor_num);
if ((flbuf.f_flags & F_INUSE) == 0) {
projects / citadel.git / blobdiff