Skip to content

Refactor duplicated invalid host-service port assertions in host-access firewall tests #5350

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

Merged
lpcox merged 2 commits into from
Jun 21, 2026
+24 −37
Merged

Refactor duplicated invalid host-service port assertions in host-access firewall tests #5350

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11ca517
Initial plan
Copilot Jun 21, 2026
0c7178b
test: refactor host access invalid-port assertions
Copilot Jun 21, 2026
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
61 changes: 24 additions & 37 deletions src/host-iptables-host-access.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,25 @@ describe('host-iptables (host access)', () => {
setupHostIptablesTestSuite(iptablesSharedTestHelpers.resetIpv6State);

describe('setupHostIptables with host access', () => {
const invalidHostServicePorts = ['abc', '99999', '-1'];

const setupHostAccessWithServicePorts = async (allowHostServicePorts: string) => {
setupDefaultIptablesMocks();

setupDockerBridgeMock();

const hostAccess: HostAccessConfig = { enabled: true, allowHostServicePorts };
await setupHostIptables('172.30.0.10', 3128, ['8.8.8.8', '8.8.4.4'], undefined, undefined, hostAccess);
};

const expectInvalidHostServicePortsSkipped = (ports: string[]) => {
for (const port of ports) {
expect(mockedExeca).not.toHaveBeenCalledWith('iptables', expect.arrayContaining([
'--dport', port,
]));
}
};

it('should add gateway ACCEPT rules when hostAccess is enabled', async () => {
setupDefaultIptablesMocks();

Expand Down Expand Up @@ -137,30 +156,12 @@ describe('host-iptables (host access)', () => {
});

it('should skip invalid ports in allowHostServicePorts', async () => {
setupDefaultIptablesMocks();

setupDockerBridgeMock();
await setupHostAccessWithServicePorts(invalidHostServicePorts.join(','));

const hostAccess: HostAccessConfig = { enabled: true, allowHostServicePorts: 'abc,99999,-1' };
await setupHostIptables('172.30.0.10', 3128, ['8.8.8.8', '8.8.4.4'], undefined, undefined, hostAccess);

// Verify invalid service ports are NOT added
expect(mockedExeca).not.toHaveBeenCalledWith('iptables', expect.arrayContaining([
'--dport', 'abc',
]));
expect(mockedExeca).not.toHaveBeenCalledWith('iptables', expect.arrayContaining([
'--dport', '99999',
]));
expect(mockedExeca).not.toHaveBeenCalledWith('iptables', expect.arrayContaining([
'--dport', '-1',
]));
expectInvalidHostServicePortsSkipped(invalidHostServicePorts);

// Default ports should still be present
expect(mockedExeca).toHaveBeenCalledWith('iptables', [
'-t', 'filter', '-A', 'FW_WRAPPER',
'-p', 'tcp', '-d', '172.30.0.1', '--dport', '80',
'-j', 'ACCEPT',
]);
expectGatewayHttpAcceptRules(mockedExeca, '172.30.0.1');
});

it('should skip invalid ports in allowHostPorts', async () => {
Expand Down Expand Up @@ -247,23 +248,9 @@ describe('host-iptables (host access)', () => {
});

it('should skip invalid service ports in allowHostServicePorts', async () => {
setupDefaultIptablesMocks();
await setupHostAccessWithServicePorts(`${invalidHostServicePorts.join(',')},5432`);

setupDockerBridgeMock();

const hostAccess: HostAccessConfig = { enabled: true, allowHostServicePorts: 'abc,99999,-1,5432' };
await setupHostIptables('172.30.0.10', 3128, ['8.8.8.8', '8.8.4.4'], undefined, undefined, hostAccess);

// Verify invalid service ports are NOT added
expect(mockedExeca).not.toHaveBeenCalledWith('iptables', expect.arrayContaining([
'--dport', 'abc',
]));
expect(mockedExeca).not.toHaveBeenCalledWith('iptables', expect.arrayContaining([
'--dport', '99999',
]));
expect(mockedExeca).not.toHaveBeenCalledWith('iptables', expect.arrayContaining([
'--dport', '-1',
]));
expectInvalidHostServicePortsSkipped(invalidHostServicePorts);

// Valid service port should be present
expect(mockedExeca).toHaveBeenCalledWith('iptables', [
Expand Down
Loading