RunasSudo/DrCr
1
Fork 0
Code Issues 1 Pull Requests Releases Activity

Validate commodity strings in input

Browse Source
This commit is contained in:
RunasSudo 2025-06-08 21:16:31 +10:00
parent b12fb30a20
commit 6174a7ce57
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/db.ts
View File

@ -177,6 +177,26 @@ function parseFloatStrict(quantity: string): number {
return parseFloat(quantity);
}
function validateCommodity(commodity: string) {
// Validate that the commodity is correctly formed
const commodityParts = commodity.split(' ');
if (commodityParts.length > 2) {
throw new DeserialiseAmountError('Invalid commodity (more spaces than expected): ' + commodity);
}
if (commodityParts.length === 2) {
// Validate that the second part is a cost basis
if (commodityParts[1].startsWith('{{') && commodityParts[1].endsWith('}}')) {
const costBase = commodityParts[1].substring(2, commodityParts[1].length - 2);
parseFloatStrict(costBase);
} else if (commodityParts[1].startsWith('{') && commodityParts[1].endsWith('}')) {
const costBase = commodityParts[1].substring(1, commodityParts[1].length - 1);
parseFloatStrict(costBase);
} else {
throw new DeserialiseAmountError('Invalid cost base: ' + commodityParts[1]);
}
}
}
export function deserialiseAmount(amount: string): { quantity: number, commodity: string } {
const factor = Math.pow(10, db.metadata.dps);
@ -206,6 +226,7 @@ export function deserialiseAmount(amount: string): { quantity: number, commodity
}
if (!Number.isSafeInteger(quantity)) { throw new DeserialiseAmountError('Quantity not representable by safe integer: ' + amount); }
validateCommodity(commodity);
return {
'quantity': quantity,
@ -232,6 +253,7 @@ export function deserialiseAmount(amount: string): { quantity: number, commodity
if (!Number.isSafeInteger(quantity)) { throw new DeserialiseAmountError('Quantity not representable by safe integer: ' + amount); }
const commodity = amount.substring(amount.indexOf(' ') + 1);
validateCommodity(commodity);
return {
'quantity': quantity,