Skip to content

Commit feaf3dd

Browse files
a3957273a3957273
authored
Merge branch 'master' into theme-auto-detection
2 parents bce0460 + 13f94a2 commit feaf3dd

File tree

9 files changed

+270
-38
lines changed

9 files changed

+270
-38
lines changed

‎package-lock.json

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

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"chromedriver": "^130.0.0",
5959
"cli-progress": "^3.12.0",
6060
"colors": "^1.4.0",
61+
"compression-webpack-plugin": "^11.1.0",
6162
"copy-webpack-plugin": "^12.0.2",
6263
"core-js": "^3.37.1",
6364
"css-loader": "7.1.2",

‎src/core/config/Categories.json

+1
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@
235235
"Parse IP range",
236236
"Parse IPv6 address",
237237
"Parse IPv4 header",
238+
"Strip IPv4 header",
238239
"Parse TCP",
239240
"Strip TCP header",
240241
"Parse TLS record",

‎src/core/operations/AddLineNumbers.mjs

+9-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ class AddLineNumbers extends Operation {
2222
this.description = "Adds line numbers to the output.";
2323
this.inputType = "string";
2424
this.outputType = "string";
25-
this.args = [];
25+
this.args = [
26+
{
27+
"name": "Offset",
28+
"type": "number",
29+
"value": 0
30+
}
31+
];
2632
}
2733

2834
/**
@@ -33,10 +39,11 @@ class AddLineNumbers extends Operation {
3339
run(input, args) {
3440
const lines = input.split("\n"),
3541
width = lines.length.toString().length;
42+
const offset = args[0] ? parseInt(args[0], 10) : 0;
3643
let output = "";
3744

3845
for (let n = 0; n < lines.length; n++) {
39-
output += (n+1).toString().padStart(width, " ") + " " + lines[n] + "\n";
46+
output += (n+1+offset).toString().padStart(width, " ") + " " + lines[n] + "\n";
4047
}
4148
return output.slice(0, output.length-1);
4249
}

‎src/core/operations/StripIPv4Header.mjs

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/**
2+
* @author c65722 []
3+
* @copyright Crown Copyright 2024
4+
* @license Apache-2.0
5+
*/
6+
7+
import Operation from "../Operation.mjs";
8+
import OperationError from "../errors/OperationError.mjs";
9+
import Stream from "../lib/Stream.mjs";
10+
11+
/**
12+
* Strip IPv4 header operation
13+
*/
14+
class StripIPv4Header extends Operation {
15+
16+
/**
17+
* StripIPv4Header constructor
18+
*/
19+
constructor() {
20+
super();
21+
22+
this.name = "Strip IPv4 header";
23+
this.module = "Default";
24+
this.description = "Strips the IPv4 header from an IPv4 packet, outputting the payload.";
25+
this.infoURL = "https://wikipedia.org/wiki/IPv4";
26+
this.inputType = "ArrayBuffer";
27+
this.outputType = "ArrayBuffer";
28+
this.args = [];
29+
}
30+
31+
/**
32+
* @param {ArrayBuffer} input
33+
* @param {Object[]} args
34+
* @returns {ArrayBuffer}
35+
*/
36+
run(input, args) {
37+
const MIN_HEADER_LEN = 20;
38+
39+
const s = new Stream(new Uint8Array(input));
40+
if (s.length < MIN_HEADER_LEN) {
41+
throw new OperationError("Input length is less than minimum IPv4 header length");
42+
}
43+
44+
const ihl = s.readInt(1) & 0x0f;
45+
const dataOffsetBytes = ihl * 4;
46+
if (s.length < dataOffsetBytes) {
47+
throw new OperationError("Input length is less than IHL");
48+
}
49+
50+
s.moveTo(dataOffsetBytes);
51+
52+
return s.getBytes().buffer;
53+
}
54+
55+
}
56+
57+
export default StripIPv4Header;

‎tests/browser/01_io.js

+36-36
Original file line numberDiff line numberDiff line change
@@ -675,42 +675,42 @@ module.exports = {
675675
}
676676
},
677677

678-
"Loading from URL": browser => {
679-
utils.clear(browser);
680-
681-
/* Side panel displays correct info */
682-
utils.uploadFile(browser, "files/TowelDay.jpeg");
683-
684-
browser
685-
.waitForElementVisible("#input-text .cm-file-details")
686-
.waitForElementVisible("#input-text .cm-file-details .file-details-toggle-shown")
687-
.waitForElementVisible("#input-text .cm-file-details .file-details-thumbnail")
688-
.waitForElementVisible("#input-text .cm-file-details .file-details-name")
689-
.waitForElementVisible("#input-text .cm-file-details .file-details-size")
690-
.waitForElementVisible("#input-text .cm-file-details .file-details-type")
691-
.waitForElementVisible("#input-text .cm-file-details .file-details-loaded");
692-
693-
/* Complex deep link populates the input correctly (encoding, eol, input) */
694-
browser
695-
.urlHash("recipe=To_Base64('A-Za-z0-9%2B/%3D')&input=VGhlIHNoaXBzIGh1bmcgaW4gdGhlIHNreSBpbiBtdWNoIHRoZSBzYW1lIHdheSB0aGF0IGJyaWNrcyBkb24ndC4M&ienc=21866&oenc=1201&ieol=FF&oeol=PS")
696-
.waitForElementVisible("#rec-list li.operation");
697-
698-
browser.expect.element(`#input-text .cm-content`).to.have.property("textContent").match(/^.{65}$/);
699-
browser.expect.element("#input-text .cm-status-bar .stats-length-value").text.to.equal("66");
700-
browser.expect.element("#input-text .cm-status-bar .stats-lines-value").text.to.equal("2");
701-
702-
browser.expect.element("#input-text .chr-enc-value").text.that.equals("KOI8-U Ukrainian Cyrillic");
703-
browser.expect.element("#output-text .chr-enc-value").text.that.equals("UTF-16BE");
704-
705-
browser.expect.element("#input-text .eol-value").text.that.equals("FF");
706-
browser.expect.element("#output-text .eol-value").text.that.equals("PS");
707-
708-
utils.bake(browser);
709-
710-
browser.expect.element(`#output-text .cm-content`).to.have.property("textContent").match(/^.{44}$/);
711-
browser.expect.element("#output-text .cm-status-bar .stats-length-value").text.to.equal("44");
712-
browser.expect.element("#output-text .cm-status-bar .stats-lines-value").text.to.equal("1");
713-
},
678+
// "Loading from URL": browser => {
679+
// utils.clear(browser);
680+
681+
// /* Side panel displays correct info */
682+
// utils.uploadFile(browser, "files/TowelDay.jpeg");
683+
684+
// browser
685+
// .waitForElementVisible("#input-text .cm-file-details")
686+
// .waitForElementVisible("#input-text .cm-file-details .file-details-toggle-shown")
687+
// .waitForElementVisible("#input-text .cm-file-details .file-details-thumbnail")
688+
// .waitForElementVisible("#input-text .cm-file-details .file-details-name")
689+
// .waitForElementVisible("#input-text .cm-file-details .file-details-size")
690+
// .waitForElementVisible("#input-text .cm-file-details .file-details-type")
691+
// .waitForElementVisible("#input-text .cm-file-details .file-details-loaded");
692+
693+
// /* Complex deep link populates the input correctly (encoding, eol, input) */
694+
// browser
695+
// .urlHash("recipe=To_Base64('A-Za-z0-9%2B/%3D')&input=VGhlIHNoaXBzIGh1bmcgaW4gdGhlIHNreSBpbiBtdWNoIHRoZSBzYW1lIHdheSB0aGF0IGJyaWNrcyBkb24ndC4M&ienc=21866&oenc=1201&ieol=FF&oeol=PS")
696+
// .waitForElementVisible("#rec-list li.operation");
697+
698+
// browser.expect.element(`#input-text .cm-content`).to.have.property("textContent").match(/^.{65}$/);
699+
// browser.expect.element("#input-text .cm-status-bar .stats-length-value").text.to.equal("66");
700+
// browser.expect.element("#input-text .cm-status-bar .stats-lines-value").text.to.equal("2");
701+
702+
// browser.expect.element("#input-text .chr-enc-value").text.that.equals("KOI8-U Ukrainian Cyrillic");
703+
// browser.expect.element("#output-text .chr-enc-value").text.that.equals("UTF-16BE");
704+
705+
// browser.expect.element("#input-text .eol-value").text.that.equals("FF");
706+
// browser.expect.element("#output-text .eol-value").text.that.equals("PS");
707+
708+
// utils.bake(browser);
709+
710+
// browser.expect.element(`#output-text .cm-content`).to.have.property("textContent").match(/^.{44}$/);
711+
// browser.expect.element("#output-text .cm-status-bar .stats-length-value").text.to.equal("44");
712+
// browser.expect.element("#output-text .cm-status-bar .stats-lines-value").text.to.equal("1");
713+
// },
714714

715715
"Replace input with output": browser => {
716716
/* Input is correctly populated */

‎tests/operations/index.mjs

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ import "./tests/SIGABA.mjs";
143143
import "./tests/SM4.mjs";
144144
// import "./tests/SplitColourChannels.mjs"; // Cannot test operations that use the File type yet
145145
import "./tests/StrUtils.mjs";
146+
import "./tests/StripIPv4Header.mjs";
146147
import "./tests/StripTCPHeader.mjs";
147148
import "./tests/StripUDPHeader.mjs";
148149
import "./tests/Subsection.mjs";

‎tests/operations/tests/StripIPv4Header.mjs

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
/**
2+
* Strip IPv4 header tests.
3+
*
4+
* @author c65722 []
5+
* @copyright Crown Copyright 2024
6+
* @license Apache-2.0
7+
*/
8+
9+
import TestRegister from "../../lib/TestRegister.mjs";
10+
11+
TestRegister.addTests([
12+
{
13+
name: "Strip IPv4 header: No options, No payload",
14+
input: "450000140005400080060000c0a80001c0a80002",
15+
expectedOutput: "",
16+
recipeConfig: [
17+
{
18+
op: "From Hex",
19+
args: ["None"]
20+
},
21+
{
22+
op: "Strip IPv4 header",
23+
args: [],
24+
},
25+
{
26+
op: "To Hex",
27+
args: ["None", 0]
28+
}
29+
]
30+
},
31+
{
32+
name: "Strip IPv4 header: No options, Payload",
33+
input: "450000140005400080060000c0a80001c0a80002ffffffffffffffff",
34+
expectedOutput: "ffffffffffffffff",
35+
recipeConfig: [
36+
{
37+
op: "From Hex",
38+
args: ["None"]
39+
},
40+
{
41+
op: "Strip IPv4 header",
42+
args: [],
43+
},
44+
{
45+
op: "To Hex",
46+
args: ["None", 0]
47+
}
48+
]
49+
},
50+
{
51+
name: "Strip IPv4 header: Options, No payload",
52+
input: "460000140005400080060000c0a80001c0a8000207000000",
53+
expectedOutput: "",
54+
recipeConfig: [
55+
{
56+
op: "From Hex",
57+
args: ["None"]
58+
},
59+
{
60+
op: "Strip IPv4 header",
61+
args: [],
62+
},
63+
{
64+
op: "To Hex",
65+
args: ["None", 0]
66+
}
67+
]
68+
},
69+
{
70+
name: "Strip IPv4 header: Options, Payload",
71+
input: "460000140005400080060000c0a80001c0a8000207000000ffffffffffffffff",
72+
expectedOutput: "ffffffffffffffff",
73+
recipeConfig: [
74+
{
75+
op: "From Hex",
76+
args: ["None"]
77+
},
78+
{
79+
op: "Strip IPv4 header",
80+
args: [],
81+
},
82+
{
83+
op: "To Hex",
84+
args: ["None", 0]
85+
}
86+
]
87+
},
88+
{
89+
name: "Strip IPv4 header: Input length lesss than minimum header length",
90+
input: "450000140005400080060000c0a80001c0a800",
91+
expectedOutput: "Input length is less than minimum IPv4 header length",
92+
recipeConfig: [
93+
{
94+
op: "From Hex",
95+
args: ["None"]
96+
},
97+
{
98+
op: "Strip IPv4 header",
99+
args: [],
100+
},
101+
{
102+
op: "To Hex",
103+
args: ["None", 0]
104+
}
105+
]
106+
},
107+
{
108+
name: "Strip IPv4 header: Input length less than IHL",
109+
input: "460000140005400080060000c0a80001c0a80000",
110+
expectedOutput: "Input length is less than IHL",
111+
recipeConfig: [
112+
{
113+
op: "From Hex",
114+
args: ["None"]
115+
},
116+
{
117+
op: "Strip IPv4 header",
118+
args: [],
119+
},
120+
{
121+
op: "To Hex",
122+
args: ["None", 0]
123+
}
124+
]
125+
}
126+
]);

‎webpack.config.js

+17
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
const webpack = require("webpack");
22
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
3+
const CompressionPlugin = require("compression-webpack-plugin");
34
const CopyWebpackPlugin = require("copy-webpack-plugin");
45
const { ModifySourcePlugin, ReplaceOperation } = require("modify-source-webpack-plugin");
56
const path = require("path");
7+
const zlib = require("zlib");
68

79
/**
810
* Webpack configuration details for use with Grunt.
@@ -64,6 +66,21 @@ module.exports = {
6466
new MiniCssExtractPlugin({
6567
filename: "assets/[name].css"
6668
}),
69+
new CompressionPlugin({
70+
filename: "[path][base].gz",
71+
algorithm: "gzip",
72+
test: /\.(js|css|html)$/,
73+
}),
74+
new CompressionPlugin({
75+
filename: "[path][base].br",
76+
algorithm: "brotliCompress",
77+
test: /\.(js|css|html)$/,
78+
compressionOptions: {
79+
params: {
80+
[zlib.constants.BROTLI_PARAM_QUALITY]: 11,
81+
},
82+
},
83+
}),
6784
new CopyWebpackPlugin({
6885
patterns: [
6986
{

0 commit comments

Comments
 (0)