exlim/cyberchef
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/makeNpmPostInstallOSAgnostic

Browse Source
This commit is contained in:
BigYellowHammer 2026-03-27 11:18:53 +01:00 committed by GitHub
commit 6266e5066f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package-lock.json generated
View File

@ -121,7 +121,7 @@
"autoprefixer": "^10.4.27", "autoprefixer": "^10.4.27",
"babel-loader": "^10.1.1", "babel-loader": "^10.1.1",
"base64-loader": "^1.0.0", "base64-loader": "^1.0.0",
"chromedriver": "^130.0.4", "chromedriver": "^146.0.6",
"cli-progress": "^3.12.0", "cli-progress": "^3.12.0",
"colors": "^1.4.0", "colors": "^1.4.0",
"compression-webpack-plugin": "^11.1.0", "compression-webpack-plugin": "^11.1.0",
@ -6246,26 +6246,36 @@
} }
}, },
"node_modules/chromedriver": { "node_modules/chromedriver": {
"version": "130.0.4", "version": "146.0.6",
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-130.0.4.tgz", "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-146.0.6.tgz",
"integrity": "sha512-lpR+PWXszij1k4Ig3t338Zvll9HtCTiwoLM7n4pCCswALHxzmgwaaIFBh3rt9+5wRk9D07oFblrazrBxwaYYAQ==", "integrity": "sha512-FIRi3hy0nRiyirK03etVXEpYTIodevFcvTBAM5ZCq+pX3w31jLm6JE8BVW1ypAVLvSp6HJDvboCcdgUroS3miw==",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@testim/chrome-version": "^1.1.4", "@testim/chrome-version": "^1.1.4",
"axios": "^1.7.4", "axios": "^1.13.5",
"compare-versions": "^6.1.0", "compare-versions": "^6.1.0",
"extract-zip": "^2.0.1", "extract-zip": "^2.0.1",
"proxy-agent": "^6.4.0", "proxy-agent": "^6.5.0",
"proxy-from-env": "^1.1.0", "proxy-from-env": "^2.0.0",
"tcp-port-used": "^1.0.2" "tcp-port-used": "^1.0.2"
}, },
"bin": { "bin": {
"chromedriver": "bin/chromedriver" "chromedriver": "bin/chromedriver"
}, },
"engines": { "engines": {
"node": ">=18" "node": ">=20"
}
},
"node_modules/chromedriver/node_modules/proxy-from-env": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
"integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=10"
} }
}, },
"node_modules/ci-info": { "node_modules/ci-info": {

2
package.json
View File

@ -52,7 +52,7 @@
"autoprefixer": "^10.4.27", "autoprefixer": "^10.4.27",
"babel-loader": "^10.1.1", "babel-loader": "^10.1.1",
"base64-loader": "^1.0.0", "base64-loader": "^1.0.0",
"chromedriver": "^130.0.4", "chromedriver": "^146.0.6",
"cli-progress": "^3.12.0", "cli-progress": "^3.12.0",
"colors": "^1.4.0", "colors": "^1.4.0",
"compression-webpack-plugin": "^11.1.0", "compression-webpack-plugin": "^11.1.0",

9
src/core/operations/ParseEthernetFrame.mjs
View File

@ -74,17 +74,14 @@ class ParseEthernetFrame extends Operation {
const ethType = Utils.byteArrayToChars(input.slice(offset, offset+2)); const ethType = Utils.byteArrayToChars(input.slice(offset, offset+2));
offset += 2; offset += 2;
if (ethType === "\x81\x00" || ethType === "\x88\xA8") {
if (ethType === "\x08\x00") {
break;
} else if (ethType === "\x81\x00" || ethType === "\x88\xA8") {
// Parse the VLAN tag: // Parse the VLAN tag:
// [0000] 0000 0000 0000 // [0000] 0000 0000 0000
// ^^^ PRIO - Ignored // ^^^ PRIO - Ignored
// ^ DEI - Ignored // ^ DEI - Ignored
// ^^^^ ^^^^ ^^^^ VLAN ID // ^^^^ ^^^^ ^^^^ VLAN ID
const vlanTag = input.slice(offset+2, offset+4); const vlanTag = input.slice(offset, offset+2);
vlans.push((vlanTag[0] & 0b00001111) << 4 | vlanTag[1]); vlans.push(((vlanTag[0] & 0b00001111) << 8) | vlanTag[1]);
offset += 2; offset += 2;
} else { } else {

4
tests/operations/tests/ParseEthernetFrame.mjs
View File

@ -23,7 +23,7 @@ TestRegister.addTests([
{ {
name: "Parse Ethernet frame with one VLAN tag (802.1q)", name: "Parse Ethernet frame with one VLAN tag (802.1q)",
input: "01000ccdcdd00013c3dfae188100a0760165aaaa", input: "01000ccdcdd00013c3dfae188100a0760165aaaa",
expectedOutput: "Source MAC: 00:13:c3:df:ae:18\nDestination MAC: 01:00:0c:cd:cd:d0\nVLAN: 117\nData:\naa aa", expectedOutput: "Source MAC: 00:13:c3:df:ae:18\nDestination MAC: 01:00:0c:cd:cd:d0\nVLAN: 118\nData:\naa aa",
recipeConfig: [ recipeConfig: [
{ {
"op": "Parse Ethernet frame", "op": "Parse Ethernet frame",
@ -34,7 +34,7 @@ TestRegister.addTests([
{ {
name: "Parse Ethernet frame with two VLAN tags (802.1ad)", name: "Parse Ethernet frame with two VLAN tags (802.1ad)",
input: "0019aa7de688002155c8f13c810000d18100001408004500", input: "0019aa7de688002155c8f13c810000d18100001408004500",
expectedOutput: "Source MAC: 00:21:55:c8:f1:3c\nDestination MAC: 00:19:aa:7d:e6:88\nVLAN: 16, 128\nData:\n45 00", expectedOutput: "Source MAC: 00:21:55:c8:f1:3c\nDestination MAC: 00:19:aa:7d:e6:88\nVLAN: 209, 20\nData:\n45 00",
recipeConfig: [ recipeConfig: [
{ {
"op": "Parse Ethernet frame", "op": "Parse Ethernet frame",