devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Cast chat/muc window to correct type and refactor cmd_sendfile

Browse Source 
Fixes #1449
This commit is contained in:
William Wennerström
2020-12-09 19:02:37 +01:00
parent b525befe67
commit 00dbc1ba7c
2 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/command/cmd_funcs.c
View File

@@ -4889,43 +4889,52 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
FILE* fh = fdopen(fd, "rb"); FILE* fh = fdopen(fd, "rb");
gboolean omemo_enabled = FALSE;
gboolean sendfile_enabled = TRUE;
switch (window->type) { switch (window->type) {
case WIN_MUC: case WIN_MUC:
{
ProfMucWin* mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
omemo_enabled = mucwin->is_omemo == TRUE;
break;
}
case WIN_CHAT: case WIN_CHAT:
{ {
ProfChatWin* chatwin = (ProfChatWin*)window; ProfChatWin* chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
#ifdef HAVE_OMEMO omemo_enabled = chatwin->is_omemo == TRUE;
if (chatwin->is_omemo) { sendfile_enabled = !((chatwin->pgp_send == TRUE && !prefs_get_boolean(PREF_PGP_SENDFILE))
char* err = NULL; || (chatwin->is_otr == TRUE && !prefs_get_boolean(PREF_OTR_SENDFILE)));
alt_scheme = OMEMO_AESGCM_URL_SCHEME;
alt_fragment = _add_omemo_stream(&fd, &fh, &err);
if (err != NULL) {
cons_show_error(err);
win_println(window, THEME_ERROR, "-", err);
goto out;
}
break;
}
#endif
if (window->type == WIN_CHAT) {
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
if ((chatwin->pgp_send && !prefs_get_boolean(PREF_PGP_SENDFILE))
|| (chatwin->is_otr && !prefs_get_boolean(PREF_OTR_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.");
goto out;
}
}
break; break;
} }
case WIN_PRIVATE: // We don't support encryption in private MUC windows. case WIN_PRIVATE: // We don't support encryption in private MUC windows.
default: default:
cons_show_error("Unsupported window for file transmission."); cons_show_error("Unsupported window for file transmission.");
goto out; goto out;
} }
if (!sendfile_enabled) {
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.");
goto out;
}
#ifdef HAVE_OMEMO
if (omemo_enabled) {
char* err = NULL;
alt_scheme = OMEMO_AESGCM_URL_SCHEME;
alt_fragment = _add_omemo_stream(&fd, &fh, &err);
if (err != NULL) {
cons_show_error(err);
win_println(window, THEME_ERROR, "-", err);
goto out;
}
}
#endif
HTTPUpload* upload = malloc(sizeof(HTTPUpload)); HTTPUpload* upload = malloc(sizeof(HTTPUpload));
upload->window = window; upload->window = window;

2
src/ui/chatwin.c
View File

@@ -80,6 +80,7 @@ chatwin_new(const char* const barejid)
} }
} }
chatwin->is_omemo = FALSE;
#ifdef HAVE_OMEMO #ifdef HAVE_OMEMO
if (omemo_automatic_start(barejid)) { if (omemo_automatic_start(barejid)) {
omemo_start_session(barejid); omemo_start_session(barejid);
@@ -90,6 +91,7 @@ chatwin_new(const char* const barejid)
if (prefs_get_boolean(PREF_MAM)) { if (prefs_get_boolean(PREF_MAM)) {
iq_mam_request(chatwin); iq_mam_request(chatwin);
} }
// XEP-0373: OpenPGP for XMPP // XEP-0373: OpenPGP for XMPP
chatwin->is_ox = FALSE; chatwin->is_ox = FALSE;