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

Merge pull request #1450 from wstrm/issue-1449

Browse Source 
Cast chat/muc window to correct type and refactor cmd_sendfile
This commit is contained in:
Michael Vetter
2020-12-10 09:17:12 +01:00
committed by GitHub
parent aa1f907125 a1486012d2
commit f0bfa69296
3 changed files with 41 additions and 30 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");
gboolean omemo_enabled = FALSE;
gboolean sendfile_enabled = TRUE;
switch (window->type) {
case WIN_MUC:
{
ProfMucWin* mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
omemo_enabled = mucwin->is_omemo == TRUE;
break;
}
case WIN_CHAT:
{
ProfChatWin* chatwin = (ProfChatWin*)window;
#ifdef HAVE_OMEMO
if (chatwin->is_omemo) {
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;
}
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;
}
}
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
omemo_enabled = chatwin->is_omemo == TRUE;
sendfile_enabled = !((chatwin->pgp_send == TRUE && !prefs_get_boolean(PREF_PGP_SENDFILE))
|| (chatwin->is_otr == TRUE && !prefs_get_boolean(PREF_OTR_SENDFILE)));
break;
}
case WIN_PRIVATE: // We don't support encryption in private MUC windows.
default:
cons_show_error("Unsupported window for file transmission.");
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;
}
if (omemo_enabled) {
#ifdef HAVE_OMEMO
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));
upload->window = window;

12
src/common.c
View File

@@ -629,15 +629,15 @@ _basename_from_url(const char* url)
}
gchar*
get_expanded_path(const char *path)
get_expanded_path(const char* path)
{
GString* exp_path = g_string_new("");
gchar *result;
gchar* result;
if (strlen(path) >= 2 && path[0] == '~' && path[1] == '/') {
g_string_printf(exp_path, "%s/%s", getenv("HOME"), path+2);
g_string_printf(exp_path, "%s/%s", getenv("HOME"), path + 2);
} else {
g_string_printf(exp_path, "%s", path+2);
g_string_printf(exp_path, "%s", path);
}
result = exp_path->str;
@@ -649,11 +649,11 @@ get_expanded_path(const char *path)
gchar*
unique_filename_from_url(const char* url, const char* path)
{
gchar *realpath;
gchar* realpath;
// Default to './' as path when none has been provided.
if (path == NULL) {
realpath = strdup("./");
realpath = g_strdup("./");
} else {
realpath = get_expanded_path(path);
}

2
src/ui/chatwin.c
View File

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