#include <signal.h>
#include <pwd.h>
-#include <setjmp.h>
#include <errno.h>
#include <stdarg.h>
#include "citadel.h"
#include "snprintf.h"
#endif
#include "screen.h"
-#include "client_crypto.h"
+
+/* work around solaris include files */
+#ifdef reg
+#undef reg
+#endif
extern char temp[];
extern char tempdir[];
*/
-int room_prompt(int qrflags)
+int room_prompt(unsigned int qrflags)
{ /* return proper room prompt character */
int a;
a = '>';
int r; /* IPC response code */
if (rc_alt_semantics) {
- if (maxmsgnum == highest_msg_read == 0) {
- /* err_printf("maxmsgnum == highest_msg_read == 0\n"); */
+ if (maxmsgnum == 0 && highest_msg_read == 0) {
return;
}
r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
maxmsgnum : highest_msg_read, buf);
} else {
- r = CtdlIPCSetLastRead(ipc, 0, buf);
+ r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
+ maxmsgnum : highest_msg_read, buf);
+/* r = CtdlIPCSetLastRead(ipc, maxmsgnum, buf); */
+/* This is a quick-and-dirty fix to all msgs becoming new in Mail>.
+ * It will need to be rethought when messages.c is rewritten.
+ */
}
if (r / 100 != 2)
scr_printf("%s\n", buf);
}
-/*
- * This routine completes a client upload
- */
-void do_upload(CtdlIPC *ipc, int fd)
-{
- char buf[SIZ];
- char tbuf[4096];
- long transmitted_bytes, total_bytes;
- int bytes_to_send;
- int bytes_expected;
-
- /* learn the size of the file */
- total_bytes = lseek(fd, 0L, 2);
- lseek(fd, 0L, 0);
-
- transmitted_bytes = 0L;
- progress(transmitted_bytes, total_bytes);
- do {
- bytes_to_send = read(fd, tbuf, 4096);
- if (bytes_to_send > 0) {
- snprintf(buf, sizeof buf, "WRIT %d", bytes_to_send);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '7') {
- bytes_expected = atoi(&buf[4]);
- serv_write(ipc, tbuf, bytes_expected);
- } else {
- scr_printf("%s\n", &buf[4]);
- }
- }
- transmitted_bytes = transmitted_bytes + (long) bytes_to_send;
- progress(transmitted_bytes, total_bytes);
- } while (bytes_to_send > 0);
-
- /* close the upload file, locally and at the server */
- close(fd);
- CtdlIPC_putline(ipc, "UCLS 1");
- CtdlIPC_getline(ipc, buf);
- scr_printf("%s\n", &buf[4]);
-}
-
-
/*
* client-based uploads (for users with their own clientware)
*/
char desc[151];
char buf[SIZ];
char tbuf[SIZ];
+ int r; /* IPC response code */
int a;
int fd;
scr_printf("Enter a description of this file:\n");
newprompt(": ", desc, 75);
- /* keep generating filenames in hope of finding a unique one */
+ /* Keep generating filenames in hope of finding a unique one */
a = 0;
- do {
- if (a == 10)
- return; /* fail if tried 10 times */
- strcpy(buf, flnm);
- while ((strlen(buf) > 0) && (haschar(buf, '/')))
- strcpy(buf, &buf[1]);
+ while (a < 10) {
+ /* basename of filename */
+ strcpy(tbuf, flnm);
+ if (haschar(tbuf, '/'))
+ strcpy(tbuf, strrchr(tbuf, '/'));
+ /* filename.1, filename.2, etc */
if (a > 0) {
- size_t tmp = strlen(buf);
- snprintf(&buf[tmp], sizeof buf - tmp, "%d", a);
+ sprintf(buf + strlen(buf), ".%d", a);
}
- snprintf(tbuf, sizeof tbuf, "UOPN %s|%s", buf, desc);
- CtdlIPC_putline(ipc, tbuf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] != '2')
- scr_printf("%s\n", &buf[4]);
+ /* Try upload */
+ r = CtdlIPCFileUpload(ipc, tbuf, desc, flnm, progress, buf);
+ if (r / 100 == 5 || r < 0)
+ scr_printf("%s\n", buf);
+ else
+ break;
++a;
- } while (buf[0] != '2');
-
- /* at this point we have an open upload file at the server */
- do_upload(ipc, fd);
+ };
}
{
char flnm[SIZ];
char buf[SIZ];
- int fd;
+ int r;
- snprintf(buf, sizeof buf, "UIMG 0|%s", keyname);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] != '2') {
- scr_printf("%s\n", &buf[4]);
+ /* Can we upload this image? */
+ r = CtdlIPCImageUpload(ipc, 0, NULL, keyname, NULL, buf);
+ if (r / 100 != 2) {
+ err_printf("%s\n", buf);
return;
}
newprompt("Image file to be uploaded: ", flnm, 55);
- fd = open(flnm, O_RDONLY);
- if (fd < 0) {
- scr_printf("Cannot open '%s': %s\n", flnm, strerror(errno));
- return;
- }
- snprintf(buf, sizeof buf, "UIMG 1|%s", keyname);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] != '2') {
- scr_printf("%s\n", &buf[4]);
- return;
+ r = CtdlIPCImageUpload(ipc, 1, flnm, keyname, progress, buf);
+ if (r / 100 == 5) {
+ err_printf("%s\n", buf);
+ } else if (r < 0) {
+ err_printf("Cannot upload '%s': %s\n", flnm, strerror(errno));
}
- do_upload(ipc, fd);
+ /* else upload succeeded */
}
int xfer_pid;
int a, b;
FILE *fp, *lsfp;
- int fd;
+ int r;
if ((room_flags & QR_UPLOAD) == 0) {
scr_printf("*** You cannot upload to this room.\n");
|| (flnm[a] == ';') || (flnm[a] == '&'))
flnm[a] = '_';
- newprompt("Enter a short description of the file:\n: ", desc, 150);
-
/* create a temporary directory... */
if (mkdir(tempdir, 0700) != 0) {
scr_printf("*** Could not create temporary directory %s: %s\n",
nukedir(tempdir);
return;
}
- scr_printf("\r*** Transfer successful. Sending file(s) to server...\n");
+ scr_printf("\r*** Transfer successful.\n");
snprintf(buf, sizeof buf, "cd %s; ls", tempdir);
lsfp = popen(buf, "r");
if (lsfp != NULL) {
while (fgets(flnm, sizeof flnm, lsfp) != NULL) {
- flnm[strlen(flnm) - 1] = 0;
+ flnm[strlen(flnm) - 1] = 0; /* chop newline */
+ snprintf(buf, sizeof buf,
+ "Enter a short description of '%s':\n: ",
+ flnm);
+ newprompt(buf, desc, 150);
snprintf(buf, sizeof buf, "%s/%s", tempdir, flnm);
- fd = open(buf, O_RDONLY);
- if (fd >= 0) {
- a = 0;
- do {
- snprintf(buf, sizeof buf, "UOPN %s|%s", flnm, desc);
- if (a > 0) {
- size_t tmp = strlen(buf);
- snprintf(&buf[tmp],
- sizeof buf - tmp,
- ".%d", a);
- }
- ++a;
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- } while ((buf[0] != '2') && (a < 100));
- if (buf[0] == '2')
- do {
- a = read(fd, tbuf, 4096);
- if (a > 0) {
- snprintf(buf, sizeof buf, "WRIT %d", a);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '7')
- serv_write(ipc, tbuf, a);
- }
- } while (a > 0);
- close(fd);
- CtdlIPC_putline(ipc, "UCLS 1");
- CtdlIPC_getline(ipc, buf);
- scr_printf("%s\n", &buf[4]);
- }
+ r = CtdlIPCFileUpload(ipc, flnm, desc, buf, progress, tbuf);
+ scr_printf("%s\n", tbuf);
}
pclose(lsfp);
}
}
/*
- * validate a user
+ * validate a user (returns 0 for successful validation, nonzero if quitting)
*/
-void val_user(CtdlIPC *ipc, char *user, int do_validate)
+int val_user(CtdlIPC *ipc, char *user, int do_validate)
{
int a;
char cmd[SIZ];
char buf[SIZ];
+ char *resp = NULL;
int ax = 0;
+ char answer[2];
int r; /* IPC response code */
- snprintf(cmd, sizeof cmd, "GREG %s", user);
- CtdlIPC_putline(ipc, cmd);
- CtdlIPC_getline(ipc, cmd);
- if (cmd[0] == '1') {
+ scr_printf("\n");
+ r = CtdlIPCGetUserRegistration(ipc, user, &resp, cmd);
+ if (r / 100 == 1) {
a = 0;
do {
- CtdlIPC_getline(ipc, buf);
+ extract_token(buf, resp, 0, '\n');
+ remove_token(resp, 0, '\n');
++a;
if (a == 1)
- scr_printf("User #%s - %s ", buf, &cmd[4]);
+ scr_printf("User #%s - %s ", buf, cmd);
if (a == 2)
scr_printf("PW: %s\n", buf);
if (a == 3)
scr_printf("%s\n", buf);
if (a == 11)
scr_printf("%s\n", buf);
- } while (strcmp(buf, "000"));
+ } while (strlen(resp));
scr_printf("Current access level: %d (%s)\n", ax, axdefs[ax]);
} else {
- scr_printf("%-30s\n%s\n", user, &cmd[4]);
+ scr_printf("%s\n%s\n", user, &cmd[4]);
}
+ if (resp) free(resp);
if (do_validate) {
/* now set the access level */
- ax = intprompt("Access level", ax, 0, 6);
- r = CtdlIPCValidateUser(ipc, user, ax, cmd);
- if (r / 100 != 2)
- scr_printf("%s\n", cmd);
+ while(1) {
+ sprintf(answer, "%d", ax);
+ strprompt("New access level (? for help, q to quit)",
+ answer, 1);
+ if ((answer[0] >= '0') && (answer[0] <= '6')) {
+ ax = atoi(answer);
+ r = CtdlIPCValidateUser(ipc, user, ax, cmd);
+ if (r / 100 != 2)
+ scr_printf("%s\n\n", cmd);
+ return(0);
+ }
+ if (tolower(answer[0]) == 'q') {
+ scr_printf("*** Aborted.\n\n");
+ return(1);
+ }
+ if (answer[0] == '?') {
+ scr_printf("Available access levels:\n");
+ for (a=0; a<7; ++a) {
+ scr_printf("%d - %s\n",
+ a, axdefs[a]);
+ }
+ }
+ }
}
- scr_printf("\n");
+ return(0);
}
scr_printf("%s\n", cmd);
if (r / 100 == 3) {
extract(buf, cmd, 0);
- val_user(ipc, buf, 1);
+ if (val_user(ipc, buf, 1) != 0) finished = 1;
}
} while (finished == 0);
}
void list_bio(CtdlIPC *ipc)
{
char buf[SIZ];
+ char *resp = NULL;
int pos = 1;
+ int r; /* IPC response code */
- CtdlIPC_putline(ipc, "LBIO");
- CtdlIPC_getline(ipc, buf);
- if (buf[0] != '1') {
- pprintf("%s\n", &buf[4]);
+ r = CtdlIPCListUsersWithBios(ipc, &resp, buf);
+ if (r / 100 != 1) {
+ pprintf("%s\n", buf);
return;
}
- while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
+ while (strlen(resp)) {
+ extract_token(buf, resp, 0, '\n');
+ remove_token(resp, 0, '\n');
if ((pos + strlen(buf) + 5) > screenwidth) {
pprintf("\n");
pos = 1;
pos = pos + strlen(buf) + 2;
}
pprintf("%c%c \n\n", 8, 8);
+ if (resp) free(resp);
}
{
char who[SIZ];
char buf[SIZ];
+ char *resp = NULL;
+ int r; /* IPC response code */
do {
newprompt("Read bio for who ('?' for list) : ", who, 25);
if (!strcmp(who, "?"))
list_bio(ipc);
} while (!strcmp(who, "?"));
- snprintf(buf, sizeof buf, "RBIO %s", who);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] != '1') {
- pprintf("%s\n", &buf[4]);
+
+ r = CtdlIPCGetBio(ipc, who, &resp, buf);
+ if (r / 100 != 1) {
+ pprintf("%s\n", buf);
return;
}
- while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
+ while (strlen(resp)) {
+ extract_token(buf, resp, 0, '\n');
+ remove_token(resp, 0, '\n');
pprintf("%s\n", buf);
}
+ if (resp) free(resp);
}
{
char buf[SIZ];
char sc[31][SIZ];
- int expire_mode = 0;
- int expire_value = 0;
+ char *resp = NULL;
+ struct ExpirePolicy *expirepolicy = NULL;
int a;
int logpages = 0;
+ int r; /* IPC response code */
/* Clear out the config buffers */
memset(&sc[0][0], 0, sizeof(sc));
/* Fetch the current config */
- CtdlIPC_putline(ipc, "CONF get");
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '1') {
+ r = CtdlIPCGetSystemConfig(ipc, &resp, buf);
+ if (r / 100 == 1) {
a = 0;
- while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
+ while (strlen(resp)) {
+ extract_token(buf, resp, 0, '\n');
+ remove_token(resp, 0, '\n');
if (a < 31) {
strcpy(&sc[a][0], buf);
}
++a;
}
}
+ if (resp) free(resp);
+ resp = NULL;
/* Fetch the expire policy (this will silently fail on old servers,
* resulting in "default" policy)
*/
- CtdlIPC_putline(ipc, "GPEX site");
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '2') {
- expire_mode = extract_int(&buf[4], 0);
- expire_value = extract_int(&buf[4], 1);
- }
-
+ r = CtdlIPCGetMessageExpirationPolicy(ipc, 2, &expirepolicy, buf);
/* Identification parameters */
snprintf(sc[26], sizeof sc[26], "%d", (boolprompt(
"Allow Aides to Zap (forget) rooms",
atoi(&sc[26][0]))));
- snprintf(sc[30], sizeof sc[29], "%d", (boolprompt(
+ snprintf(sc[30], sizeof sc[30], "%d", (boolprompt(
"Allow system Aides access to user mailboxes",
atoi(&sc[30][0]))));
*/
strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
- strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
strprompt("IMAP server port (-1 to disable)", &sc[27][0], 5);
+ strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
+
+ /* This logic flips the question around, because it's one of those
+ * situations where 0=yes and 1=no
+ */
+ a = atoi(sc[25]);
+ a = (a ? 0 : 1);
+ a = boolprompt("Correct forged From: lines during authenticated SMTP",
+ a);
+ a = (a ? 0 : 1);
+ snprintf(sc[25], sizeof sc[25], "%d", a);
/* Expiry settings */
strprompt("Default user purge time (days)", &sc[16][0], 5);
/* Angels and demons dancing in my head... */
do {
- snprintf(buf, sizeof buf, "%d", expire_mode);
+ snprintf(buf, sizeof buf, "%d", expirepolicy->expire_mode);
strprompt("System default message expire policy (? for list)",
buf, 1);
if (buf[0] == '?') {
"2. Expire by message count\n"
"3. Expire by message age\n");
}
- } while ((buf[0] < 49) || (buf[0] > 51));
- expire_mode = buf[0] - 48;
+ } while ((buf[0] < '1') || (buf[0] > '3'));
+ expirepolicy->expire_mode = buf[0] - '0';
/* ...lunatics and monsters underneath my bed */
- if (expire_mode == 2) {
- snprintf(buf, sizeof buf, "%d", expire_value);
+ if (expirepolicy->expire_mode == 2) {
+ snprintf(buf, sizeof buf, "%d", expirepolicy->expire_value);
strprompt("Keep how many messages online?", buf, 10);
- expire_value = atol(buf);
+ expirepolicy->expire_value = atol(buf);
}
- if (expire_mode == 3) {
- snprintf(buf, sizeof buf, "%d", expire_value);
+ if (expirepolicy->expire_mode == 3) {
+ snprintf(buf, sizeof buf, "%d", expirepolicy->expire_value);
strprompt("Keep messages for how many days?", buf, 10);
- expire_value = atol(buf);
+ expirepolicy->expire_value = atol(buf);
}
/* Save it */
scr_printf("Save this configuration? ");
if (yesno()) {
- CtdlIPC_putline(ipc, "CONF set");
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '4') {
- for (a = 0; a < 31; ++a)
- CtdlIPC_putline(ipc, &sc[a][0]);
- CtdlIPC_putline(ipc, "000");
+ r = 1;
+ for (a = 0; a < 31; a++)
+ r += 1 + strlen(sc[a]);
+ resp = (char *)calloc(1, r);
+ if (!resp) {
+ err_printf("Can't save config - out of memory!\n");
+ logoff(ipc, 1);
+ }
+ for (a = 0; a < 31; a++) {
+ strcat(resp, sc[a]);
+ strcat(resp, "\n");
+ }
+ r = CtdlIPCSetSystemConfig(ipc, resp, buf);
+ if (r / 100 != 4) {
+ err_printf("%s\n", buf);
+ }
+ free(resp);
+ r = CtdlIPCSetMessageExpirationPolicy(ipc, 2, expirepolicy, buf);
+ if (r / 100 != 2) {
+ err_printf("%s\n", buf);
}
- snprintf(buf, sizeof buf, "SPEX site|%d|%d",
- expire_mode, expire_value);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
}
}
keyopt(" <3> smart-host (Forward all outbound mail to this host)\n");
keyopt(" <4> directory (Consult the Global Address Book)\n");
keyopt(" <5> SpamAssassin (Address of SpamAssassin server)\n");
- sel = intprompt("Which one", 1, 1, 5);
+ keyopt(" <6> RBL (domain suffix of spam hunting RBL)\n");
+ sel = intprompt("Which one", 1, 1, 6);
switch(sel) {
case 1: strcpy(buf, "localhost");
return;
return;
case 5: strcpy(buf, "spamassassin");
return;
+ case 6: strcpy(buf, "rbl");
+ return;
}
}
void do_internet_configuration(CtdlIPC *ipc)
{
char buf[SIZ];
+ char *resp = NULL;
int num_recs = 0;
char **recs = NULL;
char ch;
int badkey;
int i, j;
int quitting = 0;
+ int r;
-
- snprintf(buf, sizeof buf, "CONF getsys|%s", INTERNETCFG);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '1') while (CtdlIPC_getline(ipc, buf), strcmp(buf, "000")) {
- ++num_recs;
- if (num_recs == 1) recs = malloc(sizeof(char *));
- else recs = realloc(recs, (sizeof(char *)) * num_recs);
- recs[num_recs-1] = malloc(SIZ);
- strcpy(recs[num_recs-1], buf);
+ r = CtdlIPCGetSystemConfigByType(ipc, INTERNETCFG, &resp, buf);
+ if (r / 100 == 1) {
+ while (strlen(resp)) {
+ extract_token(buf, resp, 0, '\n');
+ remove_token(resp, 0, '\n');
+ ++num_recs;
+ if (num_recs == 1) recs = malloc(sizeof(char *));
+ else recs = realloc(recs, (sizeof(char *)) * num_recs);
+ recs[num_recs-1] = malloc(strlen(buf) + 1);
+ strcpy(recs[num_recs-1], buf);
+ }
}
+ if (resp) free(resp);
do {
scr_printf("\n");
ch = keymenu("", "<A>dd|<D>elete|<S>ave|<Q>uit");
switch(ch) {
case 'a':
- ++num_recs;
- if (num_recs == 1)
- recs = malloc(sizeof(char *));
- else recs = realloc(recs,
- (sizeof(char *)) * num_recs);
newprompt("Enter host name: ",
buf, 50);
- strcat(buf, "|");
- get_inet_rec_type(ipc, &buf[strlen(buf)]);
- recs[num_recs-1] = strdup(buf);
+ striplt(buf);
+ if (strlen(buf) > 0) {
+ ++num_recs;
+ if (num_recs == 1)
+ recs = malloc(sizeof(char *));
+ else recs = realloc(recs,
+ (sizeof(char *)) * num_recs);
+ strcat(buf, "|");
+ get_inet_rec_type(ipc,
+ &buf[strlen(buf)]);
+ recs[num_recs-1] = strdup(buf);
+ }
break;
case 'd':
i = intprompt("Delete which one",
recs[j] = recs[j+1];
break;
case 's':
- snprintf(buf, sizeof buf, "CONF putsys|%s",
- INTERNETCFG);
- CtdlIPC_putline(ipc, buf);
- CtdlIPC_getline(ipc, buf);
- if (buf[0] == '4') {
- for (i=0; i<num_recs; ++i) {
- CtdlIPC_putline(ipc, recs[i]);
- }
- CtdlIPC_putline(ipc, "000");
+ r = 1;
+ for (i = 0; i < num_recs; i++)
+ r += 1 + strlen(recs[i]);
+ resp = (char *)calloc(1, r);
+ if (!resp) {
+ err_printf("Can't save config - out of memory!\n");
+ logoff(ipc, 1);
}
- else {
- scr_printf("%s\n", &buf[4]);
+ if (num_recs) for (i = 0; i < num_recs; i++) {
+ strcat(resp, recs[i]);
+ strcat(resp, "\n");
+ }
+ r = CtdlIPCSetSystemConfigByType(ipc, INTERNETCFG, resp, buf);
+ if (r / 100 != 4) {
+ err_printf("%s\n", buf);
}
quitting = 1;
break;
FILE *tempfp;
FILE *changefp;
- if (strlen(editor_path) == 0) {
+ if (strlen(editor_paths[0]) == 0) {
scr_printf("You must have an external editor configured in"
" order to use this function.\n");
return;
fclose(tempfp);
e_ex_code = 1; /* start with a failed exit code */
+ screen_reset();
+ sttybbs(SB_RESTORE);
editor_pid = fork();
cksum = file_checksum(filename);
if (editor_pid == 0) {
chmod(filename, 0600);
- screen_reset();
- sttybbs(SB_RESTORE);
putenv("WINDOW_TITLE=Network configuration");
- execlp(editor_path, editor_path, filename, NULL);
+ execlp(editor_paths[0], editor_paths[0], filename, NULL);
exit(1);
}
if (editor_pid > 0) {