From 346496ffd0e53fa32518a4cf897a608430d063b3 Mon Sep 17 00:00:00 2001
From: bontric <benjohnwie@gmail.com>
Date: Fri, 28 Sep 2018 20:17:45 +0200
Subject: [PATCH] add contactId check in ContactMailboxSession

---
 .../bramble/mailbox/sessions/ContactMailboxSession.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/ContactMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/ContactMailboxSession.java
index 7503f5e7d..9ba85e25c 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/ContactMailboxSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/ContactMailboxSession.java
@@ -109,6 +109,11 @@ public class ContactMailboxSession extends AbstractMailboxSession {
 		public void handleRequest(MailboxRequest request)
 				throws ProtocolException {
 			MailboxRequestTake takeRequest = (MailboxRequestTake) request;
+
+			if (takeRequest.hasContactId())
+				throw new ProtocolException(
+						"TAKE request from contact mailbox must not have contactId");
+
 			InputStream in = new ByteArrayInputStream(
 					takeRequest.getEncryptedSyncStream());
 			try {
-- 
GitLab