ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-20 17:52:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1287 from balena-io/1180-fix-checkint

Browse Source 
Correctly check if value is a valid Integer
This commit is contained in:
M. Casqueira 2020-05-12 13:58:06 -04:00 committed by GitHub
commit 6e9141d102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/validation.ts
View File

@ -12,6 +12,7 @@ export interface CheckIntOptions {
const ENV_VAR_KEY_REGEX = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
const LABEL_NAME_REGEX = /^[a-zA-Z][a-zA-Z0-9\.\-]*$/;
const NUMERALS_REGEX = /^-?[0-9]+\.?0*$/; // Allows trailing 0 decimals
/**
* checkInt
@ -23,15 +24,14 @@ export function checkInt(
s: unknown,
options: CheckIntOptions = {},
): number | undefined {
if (s == null) {
// Check for non-numeric characters
if (!NUMERALS_REGEX.test(s as string)) {
return;
}
// parseInt will happily take a number, but the typings won't accept it,
// simply cast it here
const i = parseInt(s as string, 10);
const i = Number(s);
if (isNaN(i)) {
if (!Number.isInteger(i)) {
return;
}

19
test/07-validation.spec.ts
View File

@ -59,21 +59,30 @@ describe('validation', () => {
describe('checkInt', () => {
it('returns an integer for a string that can be parsed as one', () => {
expect(validation.checkInt('200')).to.equal(200);
expect(validation.checkInt('200.00')).to.equal(200); // Allow since no data is being lost
expect(validation.checkInt('0')).to.equal(0);
expect(validation.checkInt('-3')).to.equal(-3);
});
it('returns the same integer when passed an integer', () => {
expect(validation.checkInt(345)).to.equal(345);
return expect(validation.checkInt(-345)).to.equal(-345);
expect(validation.checkInt(-345)).to.equal(-345);
});
it("returns undefined when passed something that can't be parsed as int", () => {
expect(validation.checkInt({})).to.be.undefined;
expect(validation.checkInt([])).to.be.undefined;
expect(validation.checkInt('foo')).to.be.undefined;
expect(validation.checkInt('')).to.be.undefined;
expect(validation.checkInt(null)).to.be.undefined;
return expect(validation.checkInt(undefined)).to.be.undefined;
expect(validation.checkInt(undefined)).to.be.undefined;
expect(validation.checkInt('45notanumber')).to.be.undefined;
expect(validation.checkInt('000123.45notanumber')).to.be.undefined;
expect(validation.checkInt(50.55)).to.be.undefined; // Fractional digits
expect(validation.checkInt('50.55')).to.be.undefined; // Fractional digits
expect(validation.checkInt('0x11')).to.be.undefined; // Hexadecimal
expect(validation.checkInt('0b11')).to.be.undefined; // Binary
expect(validation.checkInt('0o11')).to.be.undefined; // Octal
});
it('returns undefined when passed a negative or zero value and the positive option is set', () => {
@ -196,7 +205,7 @@ describe('validation', () => {
},
},
};
expect(validation.isValidAppsObject(apps)).to.equal(true);
expect(validation.isValidAppsObject(apps)).to.equal(false);
});
});
@ -250,9 +259,7 @@ describe('validation', () => {
},
},
};
return expect(validation.isValidDependentDevicesObject(devices)).to.equal(
false,
);
expect(validation.isValidDependentDevicesObject(devices)).to.equal(false);
});
});
});