void *content, char *cbtype, char *cbcharset,
size_t length, char *encoding, char *cbid, void *userdata)
{
- syslog(LOG_DEBUG, "upload_handler()");
- syslog(LOG_DEBUG, " name: %s", name);
- syslog(LOG_DEBUG, " filename: %s", filename);
- syslog(LOG_DEBUG, " part number: %s", partnum);
- syslog(LOG_DEBUG, " disposition: %s", disp);
- syslog(LOG_DEBUG, "content type: %s", cbtype);
- syslog(LOG_DEBUG, " char set: %s", cbcharset);
- syslog(LOG_DEBUG, " length: %ld", length);
- syslog(LOG_DEBUG, " encoding: %s", encoding);
- syslog(LOG_DEBUG, " id: %s", cbid);
-
struct uploaded_file u;
- generate_uuid(u.id);
+
+ // create a random ID for the attachment
+ for (int i=0; i<sizeof(u.id); ++i) {
+ u.id[i] = (rand() % 26) + 'a';
+ }
+ u.id[sizeof(u.id)-1] = 0;
+
+ syslog(LOG_DEBUG,
+ "upload_handler: name=%s, filename=%s, partnum=%s, disp=%s, cbtype=%s, cbcharset=%s, length=%ld, encoding=%s, cbid=%s",
+ name, filename, partnum, disp, cbtype, cbcharset, length, encoding, cbid
+ );
+
safestrncpy(u.filename, filename, sizeof(u.filename));
safestrncpy(u.content_type, cbtype, sizeof(u.content_type));
u.length = length;
// Write the upload to a file that we can access later when the user saves the message.
+ // tmpfile() creates a file with zero links in the directory, so it will be deleted when it is closed.
u.fp = tmpfile();
if (!u.fp) {
syslog(LOG_ERR, "upload: %m");
return;
}
- fwrite(content, length, 1, u.fp); // this file will be deleted by the OS when it is closed
+ if (fwrite(content, length, 1, u.fp) != 1) {
+ syslog(LOG_ERR, "upload: %m");
+ fclose(u.fp);
+ return;
+ }
// Add it to the list of uploads the server is holding.
pthread_mutex_lock(&upload_list_mutex);
for (int i=0; i<array_len(upload_list); ++i) {
memcpy(&u, array_get_element_at(upload_list, i), sizeof(struct uploaded_file));
- syslog(LOG_DEBUG, "%d: %s %s", i, u.id, u.filename);
}
// Create a JSON object describing this upload
JsonArrayAppend(j_uploads, j_one_upload);
}
+
// upload handler
void upload_files(struct http_transaction *h, struct ctdlsession *c) {
// FIXME reject uploads if we're not logged in
// Normally the browser will upload only one file per transaction, but that behavior is not guaranteed.
JsonValue *j_uploads = NewJsonArray(HKEY(""));
- // h->request_body will contain the upload(s) in MIME format
- mime_parser(h->request_body, (h->request_body + h->request_body_length), *upload_handler, NULL, NULL, j_uploads, 0);
+ // h->request_body_with_synth_headers will contain the upload(s) in MIME format including headers
+ mime_parser(h->request_body_with_synth_headers, (h->request_body+h->request_body_length), *upload_handler, NULL, NULL, j_uploads, 0);
// probably do something more clever here
h->response_code = 200;
h->response_string = strdup("OK");
h->response_body_length = StrLength(sj);
h->response_body = SmashStrBuf(&sj);
+ syslog(LOG_DEBUG, "upload: %s", h->response_body);
}
}
+// Remove an uploaded item from the upload_list. Caller now owns the file handle and is responsible for closing it.
+struct uploaded_file pop_upload(char *id) {
+ int i;
+ struct uploaded_file *u;
+ struct uploaded_file ret;
+
+ memset(&ret, 0, sizeof(struct uploaded_file));
+
+ pthread_mutex_lock(&upload_list_mutex);
+ for (i=0; i<array_len(upload_list); ++i) {
+ u = (struct uploaded_file *) array_get_element_at(upload_list, i), sizeof(struct uploaded_file);
+ if (!strcmp(u->id, id)) {
+ ret = *u;
+ array_delete_element_at(upload_list, i);
+ i = array_len(upload_list) + 1; // Go out of scope; we're done here
+ }
+ }
+ pthread_mutex_unlock(&upload_list_mutex);
+
+ return(ret); // ret will be all-zeroes if we didn't find it
+}
+
+
+// Load the attachments from an existing message. This is typically used when forwarding a message,
+// so the attachments don't have to be sent out to the browser and back.
+void load_attachments_from_message(struct http_transaction *h, struct ctdlsession *c, char *name) {
+ syslog(LOG_DEBUG, "\033[33mload_attachments_from_message: method is \033[35m%s\033[33m, name is \033[33m%s\033[0m", h->method, name);
+
+ char buf[1024];
+ StrBuf *Body = NULL;
+
+ ctdl_printf(c, "MSG2 %ld", atol(name));
+ ctdl_readline(c, buf, sizeof buf);
+ if (buf[0] != '1') {
+ do_404(h);
+ return;
+ }
+
+ while (ctdl_readline(c, buf, sizeof buf), strcmp(buf, "000")) {
+ // do something
+ }
+
+ do_405(h);
+}
+
+
// Handle operations on a specific upload
void specific_upload(struct http_transaction *h, struct ctdlsession *c, char *name) {
int i;
struct uploaded_file *u;
struct uploaded_file this_one;
+ syslog(LOG_DEBUG, "\033[33mspecific_upload: method is \033[35m%s\033[33m, name is \033[33m%s\033[0m", h->method, name);
+
+ // GET of a msgnum is a request to load the attachments from an existing message.
+ if ( (!strcasecmp(h->method, "GET")) && (atol(name) > 0) ) {
+ load_attachments_from_message(h, c, name);
+ return;
+ }
+
if (upload_list == NULL) {
do_404(h);
return;
projects / citadel.git / blobdiff