mirrors/it-tools
1
0
Fork 0
mirror of https://github.com/CorentinTh/it-tools.git synced 2025-04-21 15:26:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(ipv4-range-expander): calculate correct for ip addresses where the first octet is lower than 128 (#405)

Browse source
This commit is contained in:
cgoIT 2023-05-15 10:23:16 +02:00 • committed by GitHub
parent 7aed9c56fd
commit 8c92d56318
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tools/ipv4-range-expander/ipv4-range-expander.e2e.spec.ts
View file

@ -23,6 +23,20 @@ test.describe('Tool - IPv4 range expander', () => {
expect(await page.getByTestId('cidr.new').textContent()).toEqual('192.168.0.0/21'); expect(await page.getByTestId('cidr.new').textContent()).toEqual('192.168.0.0/21');
}); });
test('Calculates correct for valid input, where first octet is lower than 128', async ({ page }) => {
await page.getByPlaceholder('Start IPv4 address...').fill('10.0.0.1');
await page.getByPlaceholder('End IPv4 address...').fill('10.0.0.17');
expect(await page.getByTestId('start-address.old').textContent()).toEqual('10.0.0.1');
expect(await page.getByTestId('start-address.new').textContent()).toEqual('10.0.0.0');
expect(await page.getByTestId('end-address.old').textContent()).toEqual('10.0.0.17');
expect(await page.getByTestId('end-address.new').textContent()).toEqual('10.0.0.31');
expect(await page.getByTestId('addresses-in-range.old').textContent()).toEqual('17');
expect(await page.getByTestId('addresses-in-range.new').textContent()).toEqual('32');
expect(await page.getByTestId('cidr.old').textContent()).toEqual('');
expect(await page.getByTestId('cidr.new').textContent()).toEqual('10.0.0.0/27');
});
test('Hides result for invalid input', async ({ page }) => { test('Hides result for invalid input', async ({ page }) => {
await page.getByPlaceholder('Start IPv4 address...').fill('192.168.1.1'); await page.getByPlaceholder('Start IPv4 address...').fill('192.168.1.1');
await page.getByPlaceholder('End IPv4 address...').fill('192.168.0.255'); await page.getByPlaceholder('End IPv4 address...').fill('192.168.0.255');

11
src/tools/ipv4-range-expander/ipv4-range-expander.service.test.ts
View file

@ -14,6 +14,17 @@ describe('ipv4RangeExpander', () => {
expect(result?.newCidr).toEqual('192.168.0.0/21'); expect(result?.newCidr).toEqual('192.168.0.0/21');
}); });
it('should calculate valid cidr for given addresses, where first octet is lower than 128', () => {
const result = calculateCidr({ startIp: '10.0.0.1', endIp: '10.0.0.17' });
expect(result).toBeDefined();
expect(result?.oldSize).toEqual(17);
expect(result?.newSize).toEqual(32);
expect(result?.newStart).toEqual('10.0.0.0');
expect(result?.newEnd).toEqual('10.0.0.31');
expect(result?.newCidr).toEqual('10.0.0.0/27');
});
it('should return empty result for invalid input', () => { it('should return empty result for invalid input', () => {
expect(calculateCidr({ startIp: '192.168.7.1', endIp: '192.168.6.255' })).not.toBeDefined(); expect(calculateCidr({ startIp: '192.168.7.1', endIp: '192.168.6.255' })).not.toBeDefined();
}); });

4
src/tools/ipv4-range-expander/ipv4-range-expander.service.ts
View file

@ -40,12 +40,12 @@ function calculateCidr({ startIp, endIp }: { startIp: string; endIp: string }) {
value: ipv4ToInt({ ip: startIp }).toString(), value: ipv4ToInt({ ip: startIp }).toString(),
fromBase: 10, fromBase: 10,
toBase: 2, toBase: 2,
}); }).padStart(32, '0');
const end = convertBase({ const end = convertBase({
value: ipv4ToInt({ ip: endIp }).toString(), value: ipv4ToInt({ ip: endIp }).toString(),
fromBase: 10, fromBase: 10,
toBase: 2, toBase: 2,
}); }).padStart(32, '0');
const cidr = getCidr(start, end); const cidr = getCidr(start, end);
if (cidr != null) { if (cidr != null) {