webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trust address/uuid combination from unidentified sender certificate

Browse source
This commit is contained in:
AsamK 2021-05-09 19:48:51 +02:00
parent 3643d57d0e
commit 7364f0f7cf
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -1839,6 +1839,7 @@ public class Manager implements Closeable {
if (envelope.hasSource()) { if (envelope.hasSource()) {
// Store uuid if we don't have it already // Store uuid if we don't have it already
// address/uuid in envelope is sent by server
resolveRecipientTrusted(envelope.getSourceAddress()); resolveRecipientTrusted(envelope.getSourceAddress());
} }
final var notAGroupMember = isNotAGroupMember(envelope, content); final var notAGroupMember = isNotAGroupMember(envelope, content);
@ -1848,6 +1849,11 @@ public class Manager implements Closeable {
} catch (Exception e) { } catch (Exception e) {
exception = e; exception = e;
} }
if (!envelope.hasSource() && content != null) {
// Store uuid if we don't have it already
// address/uuid is validated by unidentified sender certificate
resolveRecipientTrusted(content.getSender());
}
var actions = handleMessage(envelope, content, ignoreAttachments); var actions = handleMessage(envelope, content, ignoreAttachments);
if (exception instanceof ProtocolInvalidMessageException) { if (exception instanceof ProtocolInvalidMessageException) {
final var sender = resolveRecipient(((ProtocolInvalidMessageException) exception).getSender()); final var sender = resolveRecipient(((ProtocolInvalidMessageException) exception).getSender());