X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimage%2Fserv_image.c;h=6be5afc307a2da4057f9aed88c777ccd62837b8e;hb=5165e905c8c869b92876738b0436c9e784abce3a;hp=669c865418a1c187c4d0f9128380cd45df422664;hpb=0b55ec44c85decd53458815eece962a47a66c8d2;p=citadel.git diff --git a/citadel/modules/image/serv_image.c b/citadel/modules/image/serv_image.c index 669c86541..6be5afc30 100644 --- a/citadel/modules/image/serv_image.c +++ b/citadel/modules/image/serv_image.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1987-2016 by the citadel.org team + * Copyright (c) 1987-2021 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,19 +14,98 @@ #include "ctdl_module.h" #include "config.h" - #include #include #include +/* + * DownLoad Room Image (see its icon or whatever) + * If this command succeeds, it follows the same protocol as the DLAT command. + */ +void cmd_dlri(char *cmdbuf) { + if (CtdlAccessCheck(ac_logged_in_or_guest)) return; + if (CC->room.msgnum_pic < 1) { + cprintf("%d No image found.\n", ERROR + FILE_NOT_FOUND); + return; + } + + struct CtdlMessage *msg = CtdlFetchMessage(CC->room.msgnum_pic, 1); + if (msg != NULL) { + // The call to CtdlOutputPreLoadedMsg() with MT_SPEW_SECTION will cause the DLRI command + // to have the same output format as the DLAT command, because it calls the same code. + // For example: 600 402132|-1||image/gif| + safestrncpy(CC->download_desired_section, "1", sizeof CC->download_desired_section); + CtdlOutputPreLoadedMsg(msg, MT_SPEW_SECTION, HEADERS_NONE, 1, 0, 0); + CM_Free(msg); + } + else { + cprintf("%d No image found.\n", ERROR + MESSAGE_NOT_FOUND); + return; + } +} + + +/* + * UpLoad Room Image (avatar or photo or whatever) + */ +void cmd_ulri(char *cmdbuf) { + long data_length; + char mimetype[SIZ]; + + if (CtdlAccessCheck(ac_room_aide)) return; + + data_length = extract_long(cmdbuf, 0); + extract_token(mimetype, cmdbuf, 1, '|', sizeof mimetype); + + if (data_length < 20) { + cprintf("%d That's an awfully small file. Try again.\n", ERROR + ILLEGAL_VALUE); + return; + } + + if (strncasecmp(mimetype, "image/", 6)) { + cprintf("%d Only image files are permitted.\n", ERROR + ILLEGAL_VALUE); + return; + } + + char *unencoded_data = malloc(data_length + 1); + if (!unencoded_data) { + cprintf("%d Could not allocate %ld bytes of memory\n", ERROR + INTERNAL_ERROR , data_length); + return; + } + + cprintf("%d %ld\n", SEND_BINARY, data_length); + client_read(unencoded_data, data_length); + + // We've got the data read from the client, now save it. + char *encoded_data = malloc((data_length * 2) + 100); + if (encoded_data) { + sprintf(encoded_data, "Content-type: %s\nContent-transfer-encoding: base64\n\n", mimetype); + CtdlEncodeBase64(&encoded_data[strlen(encoded_data)], unencoded_data, data_length, 1); + long new_msgnum = quickie_message("Citadel", NULL, NULL, SYSCONFIGROOM, encoded_data, FMT_RFC822, "Image uploaded by admin user"); + + if (CtdlGetRoomLock(&CC->room, CC->room.QRname) == 0) { + long old_msgnum = CC->room.msgnum_pic; + syslog(LOG_DEBUG, "Message %ld is now the photo for %s", new_msgnum, CC->room.QRname); + CC->room.msgnum_pic = new_msgnum; + CtdlPutRoomLock(&CC->room); + if (old_msgnum > 0) { + syslog(LOG_DEBUG, "Deleting old message %ld from %s", old_msgnum, SYSCONFIGROOM); + CtdlDeleteMessages(SYSCONFIGROOM, &old_msgnum, 1, ""); + } + } + free(encoded_data); + } + + free(unencoded_data); +} + /* * DownLoad User Image (see their avatar or photo or whatever) * If this command succeeds, it follows the same protocol as the DLAT command. */ -void cmd_dlui(char *cmdbuf) -{ +void cmd_dlui(char *cmdbuf) { struct ctdluser ruser; char buf[SIZ]; @@ -41,7 +120,7 @@ void cmd_dlui(char *cmdbuf) return; } - struct CtdlMessage *msg = CtdlFetchMessage(ruser.msgnum_pic, 1, 1); + struct CtdlMessage *msg = CtdlFetchMessage(ruser.msgnum_pic, 1); if (msg != NULL) { // The call to CtdlOutputPreLoadedMsg() with MT_SPEW_SECTION will cause the DLUI command // to have the same output format as the DLAT command, because it calls the same code. @@ -58,10 +137,9 @@ void cmd_dlui(char *cmdbuf) /* - * DownLoad User Image (avatar or photo or whatever) + * UpLoad User Image (avatar or photo or whatever) */ -void cmd_ului(char *cmdbuf) -{ +void cmd_ului(char *cmdbuf) { long data_length; char mimetype[SIZ]; char username[USERNAME_SIZE]; @@ -69,8 +147,7 @@ void cmd_ului(char *cmdbuf) if (CtdlAccessCheck(ac_logged_in_or_guest)) return; - if (num_parms(cmdbuf) < 2) - { + if (num_parms(cmdbuf) < 2) { cprintf("%d Usage error\n", ERROR + ILLEGAL_VALUE); return; } @@ -143,8 +220,7 @@ void cmd_ului(char *cmdbuf) /* * Import function called by import_old_userpic_files() for a single user */ -void import_one_userpic_file(char *username, long usernum, char *path) -{ +void import_one_userpic_file(char *username, long usernum, char *path) { syslog(LOG_DEBUG, "Import legacy userpic for %s, usernum=%ld, filename=%s", username, usernum, path); FILE *fp = fopen(path, "r"); @@ -191,11 +267,9 @@ void import_one_userpic_file(char *username, long usernum, char *path) /* * Look for old-format "userpic" files and import them into the message base */ -void import_old_userpic_files(void) -{ +void import_old_userpic_files(void) { DIR *filedir = NULL; struct dirent *filedir_entry; - struct dirent *d; size_t d_namelen; struct ctdluser usbuf; long usernum = 0; @@ -205,18 +279,11 @@ void import_old_userpic_files(void) syslog(LOG_DEBUG, "Importing old style userpic files into the message base"); - d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 2); - if (d == NULL) { - return; - } - filedir = opendir (ctdl_usrpic_dir); if (filedir == NULL) { - free(d); return; } - while ((readdir_r(filedir, d, &filedir_entry) == 0) && - (filedir_entry != NULL)) + while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL)) { #ifdef _DIRENT_HAVE_D_NAMLEN d_namelen = filedir_entry->d_namlen; @@ -267,7 +334,6 @@ void import_old_userpic_files(void) } } } - free(d); closedir(filedir); rmdir(ctdl_usrpic_dir); } @@ -279,6 +345,8 @@ CTDL_MODULE_INIT(image) if (!threading) { import_old_userpic_files(); + CtdlRegisterProtoHook(cmd_dlri, "DLRI", "DownLoad Room Image"); + CtdlRegisterProtoHook(cmd_ulri, "ULRI", "UpLoad Room Image"); CtdlRegisterProtoHook(cmd_dlui, "DLUI", "DownLoad User Image"); CtdlRegisterProtoHook(cmd_ului, "ULUI", "UpLoad User Image"); }