From b55003488a46128f67cbce85bed1ae1b885a5410 Mon Sep 17 00:00:00 2001
From: serega6531 <S.Shkurov@bssys.com>
Date: Fri, 8 May 2020 23:37:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20=D1=80=D0=B0?=
 =?UTF-8?q?=D1=81=D1=88=D0=B8=D1=84=D1=80=D0=BE=D0=B2=D0=BA=D0=B8=20TLS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Packet.vue  | 20 +++++++++++++++++++-
 src/views/AddService.vue   | 11 +++++++++++
 src/views/ServiceModal.vue |  7 +++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/components/Packet.vue b/src/components/Packet.vue
index a5d1505..d07df53 100644
--- a/src/components/Packet.vue
+++ b/src/components/Packet.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="packet" :class="{'packet-incoming': packet.incoming}">
-		<div>#{{ packet.id }} at {{ dateToText(packet.timestamp) }}, {{ packet.ungzipped ? 'GZIP ' : '' }}{{ packet.webSocketParsed ? 'WS' : '' }}
+		<div>#{{ packet.id }} at {{ dateToText(packet.timestamp) }}, {{ printPacketFlags(packet) }}
 			<button @click.prevent="copyRaw" class="btn btn-link">Copy HEX</button>
 			<button @click.prevent="copyText" class="btn btn-link">Copy text</button>
 			<button @click.prevent="copyPythonBytes" class="btn btn-link">Copy as Python bytes</button>
@@ -26,6 +26,7 @@
 				incoming: Boolean(),
 				ungzipped: Boolean(),
 				webSocketParsed: Boolean(),
+				tlsDecrypted: Boolean(),
 				content: String(),
 			},
 		},
@@ -46,6 +47,23 @@
 			},
 		},
 		methods: {
+			printPacketFlags(packet) {
+				let flags = [];
+
+				if (packet.ungzipped) {
+					flags.push('GZIP');
+				}
+
+				if (packet.webSocketParsed) {
+					flags.push('WS');
+				}
+
+				if (packet.tlsDecrypted) {
+					flags.push('TLS');
+				}
+
+				return flags.join(' ');
+			},
 			hexdump(buffer, blockSize, lineNumberBase) {
 				blockSize = parseInt(blockSize, 10) || 16;
 				lineNumberBase = parseInt(lineNumberBase, 10) || 10;
diff --git a/src/views/AddService.vue b/src/views/AddService.vue
index 8fca287..1fd420a 100644
--- a/src/views/AddService.vue
+++ b/src/views/AddService.vue
@@ -52,6 +52,13 @@
 				<b-form-checkbox id="addSvc-inflateWS" required
 								 v-model="parseWebSockets"/>
 			</b-form-group>
+			<b-form-group
+					label-cols-sm="4"
+					label="Decrypt TLS (TLS_RSA_WITH_AES only)"
+					label-for="addSvc-decryptTls">
+				<b-form-checkbox id="addSvc-decryptTls" required
+								 v-model="decryptTls"/>
+			</b-form-group>
 		</form>
 	</b-modal>
 </template>
@@ -68,6 +75,7 @@
 				urldecodeHttpRequests: Boolean(),
 				mergeAdjacentPackets: Boolean(),
 				parseWebSockets: Boolean(),
+				decryptTls: Boolean(),
 			};
 		},
 		methods: {
@@ -85,6 +93,7 @@
 				this.urldecodeHttpRequests = false;
 				this.mergeAdjacentPackets = false;
 				this.parseWebSockets = false;
+				this.decryptTls = false;
 			},
 
 			createService(ev) {
@@ -95,6 +104,7 @@
 				const urldecodeHttpRequests = this.urldecodeHttpRequests;
 				const mergeAdjacentPackets = this.mergeAdjacentPackets;
 				const parseWebSockets = this.parseWebSockets;
+				const decryptTls = this.decryptTls;
 				if (!this.checkValidity()) {
 					ev.preventDefault();
 					console.debug('Form is invalid');
@@ -110,6 +120,7 @@
 					urldecodeHttpRequests,
 					mergeAdjacentPackets,
 					parseWebSockets,
+					decryptTls,
 				}).then(response => {
 					const data = response.data;
 					console.debug('Done adding service', data);
diff --git a/src/views/ServiceModal.vue b/src/views/ServiceModal.vue
index 21da170..8f4857b 100644
--- a/src/views/ServiceModal.vue
+++ b/src/views/ServiceModal.vue
@@ -47,6 +47,12 @@
 				<b-form-checkbox id="service-inflateWS" required
 								 v-model="service.parseWebSockets"/>
 			</b-form-group>
+			<b-form-group label-cols-sm="4"
+						  label="Decrypt TLS (TLS_RSA_WITH_AES only)"
+						  label-for="service-decryptTls">
+				<b-form-checkbox id="service-decryptTls" required
+								 v-model="service.decryptTls"/>
+			</b-form-group>
 		</b-form>
 	</b-modal>
 </template>
@@ -67,6 +73,7 @@
 				urldecodeHttpRequests: Boolean,
 				mergeAdjacentPackets: Boolean,
 				parseWebSockets: Boolean,
+				decryptTls: Boolean,
 			},
 		},
 		data() {