Skip to content

fix: Validate CIDR masks in IP configuration #10641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mukeshr06 wants to merge 1 commit into
base: alpha
Choose a base branch
from
+54 −6
Open

fix: Validate CIDR masks in IP configuration #10641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions spec/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,12 +460,53 @@ describe('server', () => {
});
});

it('fails if you provide an invalid CIDR mask in masterKeyIps', async () => {
const invalidIps = [
'127.0.0.1/999',
'10.0.0.0/8.9',
'127.0.0.0/32.0',
'127.0.0.0/3.2e1',
'127.0.0.0/0x20',
'127.0.0.0/0b100000',
'127.0.0.0/ 32',
'127.0.0.0/32 ',
'127.0.0.1/-1',
'127.0.0.1/',
'127.0.0.1/32/ignored',
'2001:db8::/129',
];

for (const ip of invalidIps) {
expect(() => Config.validateIps('masterKeyIps', [ip]))
.withContext(ip)
.toThrow(
`The Parse Server option "masterKeyIps" contains an invalid CIDR notation "${ip}".`
);
}

const startupIp = '127.0.0.1/33';
await expectAsync(reconfigureServer({ masterKeyIps: [startupIp] })).toBeRejectedWith(
`The Parse Server option \"masterKeyIps\" contains an invalid CIDR notation \"${startupIp}\".`
);
});

it('should succeed if you provide valid ip in masterKeyIps', done => {
reconfigureServer({
masterKeyIps: ['1.2.3.4', '2001:0db8:0000:0042:0000:8a2e:0370:7334'],
}).then(done);
});

it('should succeed if you provide valid CIDR boundaries in masterKeyIps', () => {
expect(() =>
Config.validateIps('masterKeyIps', [
'0.0.0.0/0',
'255.255.255.255/32',
'::/0',
'2001:db8::/128',
])
).not.toThrow();
});

it('should set default masterKeyIps for IPv4 and IPv6 localhost', () => {
const definitions = require('../lib/Options/Definitions.js');
expect(definitions.ParseServerOptions.masterKeyIps.default).toEqual(['127.0.0.1', '::1']);
Expand Down
19 changes: 13 additions & 6 deletions src/Config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,12 +625,19 @@ export class Config {
}

static validateIps(field, masterKeyIps) {
for (let ip of masterKeyIps) {
if (ip.includes('/')) {
ip = ip.split('/')[0];
}
if (!net.isIP(ip)) {
throw `The Parse Server option "${field}" contains an invalid IP address "${ip}".`;
for (const ip of masterKeyIps) {
const parts = ip.split('/');
const address = parts[0];
const ipVersion = net.isIP(address);
if (!ipVersion) {
throw `The Parse Server option "${field}" contains an invalid IP address "${address}".`;
}
if (parts.length > 1) {
const mask = parts[1];
const maxMask = ipVersion === 4 ? 32 : 128;
if (parts.length !== 2 || !/^\d+$/.test(mask) || Number(mask) > maxMask) {
throw `The Parse Server option "${field}" contains an invalid CIDR notation "${ip}".`;
}
}
}
}
Expand Down