devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-08-01 16:36:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add guards for OMEMO

Browse Source
This commit is contained in:
William Wennerström
2020-06-28 14:36:16 +02:00
parent fc6136ddf0
commit e98644f631
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/command/cmd_funcs.c
View File

@@ -4858,6 +4858,7 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
ProfChatWin *chatwin = (ProfChatWin*)window; ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
#ifdef HAVE_OMEMO
if (chatwin->is_omemo && !prefs_get_boolean(PREF_OMEMO_SENDFILE)) { if (chatwin->is_omemo && !prefs_get_boolean(PREF_OMEMO_SENDFILE)) {
// Create temporary file for writing ciphertext. // Create temporary file for writing ciphertext.
@@ -4871,7 +4872,7 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
} }
FILE *tmpfh = fdopen(tmpfd, "wb"); FILE *tmpfh = fdopen(tmpfd, "wb");
int crypt_res = GPG_ERR_NO_ERROR; int crypt_res;
alt_scheme = AES256_GCM_URL_SCHEME; alt_scheme = AES256_GCM_URL_SCHEME;
alt_fragment = aes256gcm_encrypt_file(fh, tmpfh, file_size(fd), &crypt_res); alt_fragment = aes256gcm_encrypt_file(fh, tmpfh, file_size(fd), &crypt_res);
if (crypt_res != 0) { if (crypt_res != 0) {
@@ -4895,10 +4896,11 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
break; break;
} }
#endif
if ((chatwin->pgp_send && !prefs_get_boolean(PREF_PGP_SENDFILE)) if ((chatwin->pgp_send && !prefs_get_boolean(PREF_PGP_SENDFILE))
|| (chatwin->is_otr && !prefs_get_boolean(PREF_OTR_SENDFILE))) { || (chatwin->is_otr && !prefs_get_boolean(PREF_OTR_SENDFILE))) {
cons_show_error("Uploading unencrypted files disabled. See /omemo sendfile, /otr sendfile, /pgp sendfile."); cons_show_error("Uploading unencrypted files disabled. See /otr sendfile or /pgp sendfile.");
win_println(window, THEME_ERROR, "-", "Sending encrypted files via http_upload is not possible yet."); win_println(window, THEME_ERROR, "-", "Sending encrypted files via http_upload is not possible yet.");
goto out; goto out;
} }
@@ -4929,14 +4931,26 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
upload->filehandle = fh; upload->filehandle = fh;
upload->filesize = file_size(fd); upload->filesize = file_size(fd);
upload->mime_type = file_mime_type(filename); upload->mime_type = file_mime_type(filename);
upload->alt_scheme = strdup(alt_scheme);
upload->alt_fragment = strdup(alt_fragment); if (alt_scheme != NULL) {
upload->alt_scheme = strdup(alt_scheme);
} else {
upload->alt_scheme = NULL;
}
if (alt_fragment != NULL) {
upload->alt_fragment = strdup(alt_fragment);
} else {
upload->alt_fragment = NULL;
}
iq_http_upload_request(upload); iq_http_upload_request(upload);
out: out:
#ifdef HAVE_OMEMO
if (alt_fragment != NULL) if (alt_fragment != NULL)
aes256gcm_fragment_free(alt_fragment); aes256gcm_fragment_free(alt_fragment);
#endif
if (filename != NULL) if (filename != NULL)
free(filename); free(filename);

4
src/tools/http_upload.c
View File

@@ -286,7 +286,9 @@ http_file_put(void *userdata)
char *url = NULL; char *url = NULL;
if (format_alt_url(upload->get_url, upload->alt_scheme, upload->alt_fragment, &url) != 0) { if (format_alt_url(upload->get_url, upload->alt_scheme, upload->alt_fragment, &url) != 0) {
char *msg; char *msg;
asprintf(&msg, "Uploading '%s' failed: Bad URL ('%s')", upload->filename, upload->get_url); if (asprintf(&msg, "Uploading '%s' failed: Bad URL ('%s')", upload->filename, upload->get_url)== -1) {
msg = strdup(FALLBACK_MSG);
}
cons_show_error(msg); cons_show_error(msg);
free(msg); free(msg);
} else { } else {