Skip to content

Commit a895d1d

Browse files
n1474335n1474335
committed
Added 'Parse TCP' operation
1 parent 477e4a7 commit a895d1d

14 files changed

+430
-81
lines changed

‎Gruntfile.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ module.exports = function (grunt) {
217217
client: {
218218
logging: "error",
219219
overlay: true
220-
}
220+
},
221+
hot: "only"
221222
},
222223
plugins: [
223224
new webpack.DefinePlugin(BUILD_CONSTANTS),

‎package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"autoprefixer": "^10.4.4",
4949
"babel-loader": "^8.2.4",
5050
"babel-plugin-dynamic-import-node": "^2.3.3",
51-
"chromedriver": "^99.0.0",
51+
"chromedriver": "^101.0.0",
5252
"cli-progress": "^3.10.0",
5353
"colors": "^1.4.0",
5454
"copy-webpack-plugin": "^10.2.4",

‎src/core/config/Categories.json

+1
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@
190190
"Parse IP range",
191191
"Parse IPv6 address",
192192
"Parse IPv4 header",
193+
"Parse TCP",
193194
"Parse UDP",
194195
"Parse SSH Host Key",
195196
"Parse URI",

‎src/core/lib/Binary.mjs

+9-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import OperationError from "../errors/OperationError.mjs";
1313
/**
1414
* Convert a byte array into a binary string.
1515
*
16-
* @param {Uint8Array|byteArray} data
16+
* @param {Uint8Array|byteArray|number} data
1717
* @param {string} [delim="Space"]
1818
* @param {number} [padding=8]
1919
* @returns {string}
@@ -26,13 +26,17 @@ import OperationError from "../errors/OperationError.mjs";
2626
* toBinary([10,20,30], ":");
2727
*/
2828
export function toBinary(data, delim="Space", padding=8) {
29-
if (!data) return "";
30-
3129
delim = Utils.charRep(delim);
3230
let output = "";
3331

34-
for (let i = 0; i < data.length; i++) {
35-
output += data[i].toString(2).padStart(padding, "0") + delim;
32+
if (data.length) { // array
33+
for (let i = 0; i < data.length; i++) {
34+
output += data[i].toString(2).padStart(padding, "0") + delim;
35+
}
36+
} else if (typeof data === "number") { // Single value
37+
return data.toString(2).padStart(padding, "0");
38+
} else {
39+
return "";
3640
}
3741

3842
if (delim.length) {

‎src/core/lib/FileSignatures.mjs

+12-12
Original file line numberDiff line numberDiff line change
@@ -3778,8 +3778,8 @@ function parseDEFLATE(stream) {
37783778

37793779
while (!finalBlock) {
37803780
// Read header
3781-
finalBlock = stream.readBits(1);
3782-
const blockType = stream.readBits(2);
3781+
finalBlock = stream.readBits(1, "le");
3782+
const blockType = stream.readBits(2, "le");
37833783

37843784
if (blockType === 0) {
37853785
/* No compression */
@@ -3798,16 +3798,16 @@ function parseDEFLATE(stream) {
37983798
/* Dynamic Huffman */
37993799

38003800
// Read the number of liternal and length codes
3801-
const hlit = stream.readBits(5) + 257;
3801+
const hlit = stream.readBits(5, "le") + 257;
38023802
// Read the number of distance codes
3803-
const hdist = stream.readBits(5) + 1;
3803+
const hdist = stream.readBits(5, "le") + 1;
38043804
// Read the number of code lengths
3805-
const hclen = stream.readBits(4) + 4;
3805+
const hclen = stream.readBits(4, "le") + 4;
38063806

38073807
// Parse code lengths
38083808
const codeLengths = new Uint8Array(huffmanOrder.length);
38093809
for (let i = 0; i < hclen; i++) {
3810-
codeLengths[huffmanOrder[i]] = stream.readBits(3);
3810+
codeLengths[huffmanOrder[i]] = stream.readBits(3, "le");
38113811
}
38123812

38133813
// Parse length table
@@ -3819,16 +3819,16 @@ function parseDEFLATE(stream) {
38193819
code = readHuffmanCode(stream, codeLengthsTable);
38203820
switch (code) {
38213821
case 16:
3822-
repeat = 3 + stream.readBits(2);
3822+
repeat = 3 + stream.readBits(2, "le");
38233823
while (repeat--) lengthTable[i++] = prev;
38243824
break;
38253825
case 17:
3826-
repeat = 3 + stream.readBits(3);
3826+
repeat = 3 + stream.readBits(3, "le");
38273827
while (repeat--) lengthTable[i++] = 0;
38283828
prev = 0;
38293829
break;
38303830
case 18:
3831-
repeat = 11 + stream.readBits(7);
3831+
repeat = 11 + stream.readBits(7, "le");
38323832
while (repeat--) lengthTable[i++] = 0;
38333833
prev = 0;
38343834
break;
@@ -3886,11 +3886,11 @@ function parseHuffmanBlock(stream, litTab, distTab) {
38863886
if (code < 256) continue;
38873887

38883888
// Length code
3889-
stream.readBits(lengthExtraTable[code - 257]);
3889+
stream.readBits(lengthExtraTable[code - 257], "le");
38903890

38913891
// Dist code
38923892
code = readHuffmanCode(stream, distTab);
3893-
stream.readBits(distanceExtraTable[code]);
3893+
stream.readBits(distanceExtraTable[code], "le");
38943894
}
38953895
}
38963896

@@ -3948,7 +3948,7 @@ function readHuffmanCode(stream, table) {
39483948
const [codeTable, maxCodeLength] = table;
39493949

39503950
// Read max length
3951-
const bitsBuf = stream.readBits(maxCodeLength);
3951+
const bitsBuf = stream.readBits(maxCodeLength, "le");
39523952
const codeWithLength = codeTable[bitsBuf & ((1 << maxCodeLength) - 1)];
39533953
const codeLength = codeWithLength >>> 16;
39543954

‎src/core/lib/Protocol.mjs

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/**
2+
* Protocol parsing functions.
3+
*
4+
* @author n1474335 [[email protected]]
5+
* @copyright Crown Copyright 2022
6+
* @license Apache-2.0
7+
*/
8+
9+
import BigNumber from "bignumber.js";
10+
import {toHexFast} from "../lib/Hex.mjs";
11+
12+
/**
13+
* Recursively displays a JSON object as an HTML table
14+
*
15+
* @param {Object} obj
16+
* @returns string
17+
*/
18+
export function objToTable(obj, nested=false) {
19+
let html = `<table
20+
class='table table-sm table-nonfluid ${nested ? "mb-0 table-borderless" : "table-bordered"}'
21+
style='table-layout: fixed; ${nested ? "margin: -1px !important;" : ""}'>`;
22+
if (!nested)
23+
html += `<tr>
24+
<th>Field</th>
25+
<th>Value</th>
26+
</tr>`;
27+
28+
for (const key in obj) {
29+
html += `<tr><td style='word-wrap: break-word'>${key}</td>`;
30+
if (typeof obj[key] === "object")
31+
html += `<td style='padding: 0'>${objToTable(obj[key], true)}</td>`;
32+
else
33+
html += `<td>${obj[key]}</td>`;
34+
html += "</tr>";
35+
}
36+
html += "</table>";
37+
return html;
38+
}
39+
40+
/**
41+
* Converts bytes into a BigNumber string
42+
* @param {Uint8Array} bs
43+
* @returns {string}
44+
*/
45+
export function bytesToLargeNumber(bs) {
46+
return BigNumber(toHexFast(bs), 16).toString();
47+
}

‎src/core/lib/Stream.mjs

+22-12
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,17 @@ export default class Stream {
2727
}
2828

2929
/**
30-
* Get a number of bytes from the current position.
30+
* Get a number of bytes from the current position, or all remaining bytes.
3131
*
32-
* @param {number} numBytes
32+
* @param {number} [numBytes=null]
3333
* @returns {Uint8Array}
3434
*/
35-
getBytes(numBytes) {
35+
getBytes(numBytes=null) {
3636
if (this.position > this.length) return undefined;
3737

38-
const newPosition = this.position + numBytes;
38+
const newPosition = numBytes !== null ?
39+
this.position + numBytes :
40+
this.length;
3941
const bytes = this.bytes.slice(this.position, newPosition);
4042
this.position = newPosition;
4143
this.bitPos = 0;
@@ -91,34 +93,40 @@ export default class Stream {
9193
}
9294

9395
/**
94-
* Reads a number of bits from the buffer.
95-
*
96-
* @TODO Add endianness
96+
* Reads a number of bits from the buffer in big or little endian.
9797
*
9898
* @param {number} numBits
99+
* @param {string} [endianness="be"]
99100
* @returns {number}
100101
*/
101-
readBits(numBits) {
102+
readBits(numBits, endianness="be") {
102103
if (this.position > this.length) return undefined;
103104

104105
let bitBuf = 0,
105106
bitBufLen = 0;
106107

107108
// Add remaining bits from current byte
108-
bitBuf = (this.bytes[this.position++] & bitMask(this.bitPos)) >>> this.bitPos;
109+
bitBuf = this.bytes[this.position++] & bitMask(this.bitPos);
110+
if (endianness !== "be") bitBuf >>>= this.bitPos;
109111
bitBufLen = 8 - this.bitPos;
110112
this.bitPos = 0;
111113

112114
// Not enough bits yet
113115
while (bitBufLen < numBits) {
114-
bitBuf |= this.bytes[this.position++] << bitBufLen;
116+
if (endianness === "be")
117+
bitBuf = (bitBuf << bitBufLen) | this.bytes[this.position++];
118+
else
119+
bitBuf |= this.bytes[this.position++] << bitBufLen;
115120
bitBufLen += 8;
116121
}
117122

118123
// Reverse back to numBits
119124
if (bitBufLen > numBits) {
120125
const excess = bitBufLen - numBits;
121-
bitBuf &= (1 << numBits) - 1;
126+
if (endianness === "be")
127+
bitBuf >>>= excess;
128+
else
129+
bitBuf &= (1 << numBits) - 1;
122130
bitBufLen -= excess;
123131
this.position--;
124132
this.bitPos = 8 - excess;
@@ -133,7 +141,9 @@ export default class Stream {
133141
* @returns {number} The bit mask
134142
*/
135143
function bitMask(bitPos) {
136-
return 256 - (1 << bitPos);
144+
return endianness === "be" ?
145+
(1 << (8 - bitPos)) - 1 :
146+
256 - (1 << bitPos);
137147
}
138148
}
139149

0 commit comments

Comments
 (0)