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

Merge pull request #1066 from paulfariello/hotfix/OMEMO-ensure-muc-is-nonanonymous

Browse Source 
Ensure MUC is Non-Anonymous before starting OMEMO
This commit is contained in:
Michael Vetter
2019-04-17 13:58:45 +02:00
committed by GitHub
parent 2eaec58c41 8c71a74afe
commit 9574127177
3 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/command/cmd_funcs.c
View File

@@ -8032,14 +8032,14 @@ cmd_omemo_start(ProfWin *window, const char *const command, gchar **args)
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
/* TODO: Check room is configured correctly, no anonymous and access to
* full jid */
omemo_start_muc_sessions(mucwin->roomjid);
mucwin->is_omemo = TRUE;
if (muc_anonymity_type(mucwin->roomjid) == MUC_ANONYMITY_TYPE_NONANONYMOUS) {
omemo_start_muc_sessions(mucwin->roomjid);
mucwin->is_omemo = TRUE;
} else {
win_println(window, THEME_DEFAULT, '!', "MUC must be non-anonymous (i.e. be configured to present real jid to anyone) in order to support OMEMO.");
}
} else {
win_println(window, THEME_DEFAULT, '-', "You must be in a regular chat window to start an OMEMO session.");
return TRUE;
}
}