mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-06-14 18:25:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor to have support for past output style

Browse source
This commit is contained in:
Jamie (Bear) Murphy 2025-05-13 23:46:20 +01:00
parent 7b28a1027c
commit d713bbad3a
1 changed files with 53 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

92
src/core/operations/PHPDeserialize.mjs
View file

@ -79,7 +79,7 @@ class PHPDeserialize extends Operation {
/** /**
* Read characters from the input that must be equal to `expect` * Read characters from the input that must be equal to `expect`
* @param expect * @param expectStr
* @returns {string} * @returns {string}
*/ */
function expect(expectStr) { function expect(expectStr) {
@ -131,21 +131,12 @@ class PHPDeserialize extends Operation {
const items = parseInt(readUntil(":"), 10) * 2; const items = parseInt(readUntil(":"), 10) * 2;
expect("{"); expect("{");
const result = {}; const result = {};
let isKey = true; for (let idx = 0; idx < items; idx += 2) {
let lastItem = null; const keyInfo = handleInput();
for (let idx = 0; idx < items; idx++) { const valueInfo = handleInput();
const item = handleInput(); let key = keyInfo.value;
if (isKey) { if (keyInfo.keyType === "i") key = parseInt(key, 10);
lastItem = item; result[key] = valueInfo.value;
isKey = false;
} else {
let key = lastItem;
if (args[0] && typeof key === "number") {
key = key.toString();
}
result[key] = item;
isKey = true;
}
} }
expect("}"); expect("}");
return result; return result;
@ -156,28 +147,29 @@ class PHPDeserialize extends Operation {
switch (kind) { switch (kind) {
case "n": case "n":
expect(";"); expect(";");
return record(null); return record({ value: null, keyType: kind });
case "i": {
expect(":");
const data = readUntil(";");
return record({ value: parseInt(data, 10), keyType: kind });
}
case "d": {
expect(":");
const data = readUntil(";");
return record({ value: parseFloat(data), keyType: kind });
}
case "i":
case "d":
case "b": { case "b": {
expect(":"); expect(":");
const data = readUntil(";"); const data = readUntil(";");
if (kind === "b") { return record({ value: data !== 0, keyType: kind });
return record(parseInt(data, 10) !== 0);
}
if (kind === "i") {
return record(parseInt(data, 10));
}
if (kind === "d") {
return record(parseFloat(data));
}
return record(data);
} }
case "a": case "a":
expect(":"); expect(":");
return record(handleArray()); return record({ value: handleArray(), keyType: kind });
case "s": { case "s": {
expect(":"); expect(":");
@ -202,7 +194,7 @@ class PHPDeserialize extends Operation {
console.warn(`Length mismatch: declared ${length}, got ${actualByteLength} — proceeding anyway`); console.warn(`Length mismatch: declared ${length}, got ${actualByteLength} — proceeding anyway`);
} }
return record(str); return record({ value: str, keyType: kind });
} }
case "o": { case "o": {
@ -221,17 +213,17 @@ class PHPDeserialize extends Operation {
for (let i = 0; i < propertyCount; i++) { for (let i = 0; i < propertyCount; i++) {
const keyRaw = handleInput(); const keyRaw = handleInput();
const value = handleInput(); const valueRaw = handleInput();
let key = keyRaw; let key = keyRaw.value;
if (typeof keyRaw === "string" && keyRaw.startsWith('"') && keyRaw.endsWith('"')) { if (typeof key === "string" && key.startsWith('"') && key.endsWith('"')) {
key = keyRaw.slice(1, -1); key = key.slice(1, -1);
} }
key = normalizeKey(key); key = normalizeKey(key);
obj[key] = value; obj[key] = valueRaw.value;
} }
expect("}"); expect("}");
return record(obj); return record({ value: obj, keyType: kind });
} }
case "r": { case "r": {
@ -240,7 +232,11 @@ class PHPDeserialize extends Operation {
if (refIndex >= refStore.length || refIndex < 0) { if (refIndex >= refStore.length || refIndex < 0) {
throw new OperationError(`Invalid reference index: ${refIndex}`); throw new OperationError(`Invalid reference index: ${refIndex}`);
} }
return refStore[refIndex]; const refValue = refStore[refIndex];
if (typeof refValue === "object" && refValue !== null && "value" in refValue && "keyType" in refValue) {
return refValue;
}
return record({ value: refValue, keyType: kind });
} }
default: default:
@ -248,7 +244,25 @@ class PHPDeserialize extends Operation {
} }
} }
return JSON.stringify(handleInput()); /**
* Helper function to make invalid json output (legacy support)
* @returns {String}
*/
function stringifyWithIntegerKeys(obj) {
const entries = Object.entries(obj).map(([key, value]) => {
const jsonKey = Number.isInteger(+key) ? key : JSON.stringify(key);
const jsonValue = JSON.stringify(value);
return `${jsonKey}:${jsonValue}`;
});
return `{${entries.join(',')}}`; // eslint-disable-line quotes
}
if (args[0]) {
return JSON.stringify(handleInput().value);
} else {
return stringifyWithIntegerKeys(handleInput().value);
}
} }
} }