moxxy/moxxmpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Only add envelope elements that should be encrypted

Browse Source
This commit is contained in:
PapaTutuWawa 2023-01-23 13:10:07 +01:00
parent c9c45baabc
commit 72099dfde5
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/moxxmpp/lib/src/xeps/xep_0384/xep_0384.dart
View File

@ -459,9 +459,25 @@ abstract class BaseOmemoManager extends XmppManagerBase {
);
}
children.addAll(
envelope.firstTag('content')!.children,
);
final envelopeChildren = envelope.firstTag('content')?.children;
if (envelopeChildren != null) {
children.addAll(
envelopeChildren
// Do not add forbidden elements from the envelope
.where((XMLNode child) {
for (final ignore in _doNotEncryptList) {
final xmlns = child.attributes['xmlns'] ?? '';
if (child.tag == ignore.tag && xmlns == ignore.xmlns) {
return false;
}
}
return true;
}),
);
} else {
logger.warning('Invalid envelope element: No <content /> element');
}
if (!checkAffixElements(envelope, stanza.from!, ourJid)) {
other['encryption_error'] = InvalidAffixElementsException();