Skip to content

fix: hide port field for sensor scanners #5656

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
greenbonebot merged 2 commits into from
Sep 24, 2026
+20 −14
Merged

fix: hide port field for sensor scanners #5656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f58e6d1
fix: hide port field for sensor scanners
ozgen Sep 24, 2026
ae40a39
test: fix unit tests for ScannerComponent
ozgen Sep 24, 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
20 changes: 14 additions & 6 deletions src/web/pages/scanners/ScannerDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@ const isLocalConnection = (host?: string) => host?.startsWith('/') ?? false;
const updatePort = (scannerType: ScannerType | undefined) => {
if (
scannerType === GREENBONE_SENSOR_SCANNER_TYPE ||
scannerType === AGENT_CONTROLLER_SENSOR_SCANNER_TYPE
scannerType === AGENT_CONTROLLER_SENSOR_SCANNER_TYPE ||
scannerType === OPENVASD_SENSOR_SCANNER_TYPE
) {
return 22;
return 0;
}
if (scannerType === AGENT_CONTROLLER_SCANNER_TYPE) {
return 8080;
}
if (
scannerType === OPENVASD_SCANNER_TYPE ||
scannerType === OPENVASD_SENSOR_SCANNER_TYPE ||
scannerType === CONTAINER_IMAGE_SCANNER_TYPE ||
scannerType === WEB_APPLICATION_SCANNER_TYPE
) {
Expand All @@ -98,7 +98,6 @@ export const isScannerTypeSupportingClientCertificates = (
) =>
scannerType === OPENVAS_SCANNER_TYPE ||
scannerType === OPENVASD_SCANNER_TYPE ||
scannerType === OPENVASD_SENSOR_SCANNER_TYPE ||
scannerType === CONTAINER_IMAGE_SCANNER_TYPE ||
scannerType === WEB_APPLICATION_SCANNER_TYPE ||
scannerType === AGENT_CONTROLLER_SCANNER_TYPE;
Expand Down Expand Up @@ -273,15 +272,24 @@ const ScannerDialog = ({
const isGreenboneSensorType = scannerType === GREENBONE_SENSOR_SCANNER_TYPE;
const isAgentControllerSensorScannerType =
scannerType === AGENT_CONTROLLER_SENSOR_SCANNER_TYPE;
const isOpenvasdSensorType = scannerType === OPENVASD_SENSOR_SCANNER_TYPE;
const showScannerDetails = isDefined(scannerType);
const showPort = showScannerDetails && !isGreenboneSensorType;
const showPort =
showScannerDetails &&
!isGreenboneSensorType &&
!isAgentControllerSensorScannerType &&
!isOpenvasdSensorType;
const isClientCertificateSupported =
showScannerDetails &&
isScannerTypeSupportingClientCertificates(scannerType);

const localConnection = isLocalConnection(scannerHost);

if (isGreenboneSensorType || isAgentControllerSensorScannerType) {
if (
isGreenboneSensorType ||
isAgentControllerSensorScannerType ||
isOpenvasdSensorType
) {
credentialId = undefined;
}
return (
Expand Down
4 changes: 1 addition & 3 deletions src/web/pages/scanners/__tests__/ScannerComponent.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import Scanner, {
GREENBONE_SENSOR_SCANNER_TYPE,
OPENVAS_SCANNER_TYPE,
OPENVASD_SCANNER_TYPE,
OPENVASD_SENSOR_SCANNER_TYPE,
WEB_APPLICATION_SCANNER_TYPE,
} from 'gmp/models/scanner';
import {createSession} from 'gmp/testing';
Expand Down Expand Up @@ -42,7 +41,6 @@ describe('ScannerComponent tests', () => {
OPENVAS_SCANNER_TYPE,
OPENVASD_SCANNER_TYPE,
AGENT_CONTROLLER_SCANNER_TYPE,
OPENVASD_SENSOR_SCANNER_TYPE,
CONTAINER_IMAGE_SCANNER_TYPE,
WEB_APPLICATION_SCANNER_TYPE,
])(
Expand Down Expand Up @@ -361,7 +359,7 @@ describe('ScannerComponent tests', () => {
host: 'localhost',
id: undefined,
name: 'Unnamed',
port: 22,
port: 0,
type: GREENBONE_SENSOR_SCANNER_TYPE,
});
expect(handleCreated).toHaveBeenCalledWith({id: '1234'});
Expand Down
10 changes: 5 additions & 5 deletions src/web/pages/scanners/__tests__/ScannerDialog.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ describe('ScannerDialog tests', () => {
test.each([
[OPENVAS_SCANNER_TYPE, true],
[OPENVASD_SCANNER_TYPE, true],
[OPENVASD_SENSOR_SCANNER_TYPE, true],
[AGENT_CONTROLLER_SCANNER_TYPE, true],
[CONTAINER_IMAGE_SCANNER_TYPE, true],
[WEB_APPLICATION_SCANNER_TYPE, true],
[CVE_SCANNER_TYPE, false],
[GREENBONE_SENSOR_SCANNER_TYPE, false],
[AGENT_CONTROLLER_SENSOR_SCANNER_TYPE, false],
[OPENVASD_SENSOR_SCANNER_TYPE, false],
[undefined, false],
])(
'should report whether scanner type %s supports client certificates',
Expand Down Expand Up @@ -122,7 +122,7 @@ describe('ScannerDialog tests', () => {
credentialId: undefined,
type: GREENBONE_SENSOR_SCANNER_TYPE,
id: undefined,
port: 22,
port: 0,
});
});

Expand All @@ -147,7 +147,7 @@ describe('ScannerDialog tests', () => {
const scannerType = screen.getByRole('textbox', {name: 'Scanner Type'});
expect(scannerType).toHaveValue('Agent Sensor');
expect(screen.getByName('host')).toHaveValue('localhost');
expect(screen.getByName('port')).toHaveValue('22');
expect(screen.queryByName('port')).not.toBeInTheDocument();
expect(screen.queryByName('caCertificate')).not.toBeInTheDocument();
expect(
screen.queryByRole('textbox', {name: 'Credential'}),
Expand All @@ -162,7 +162,7 @@ describe('ScannerDialog tests', () => {
credentialId: undefined,
type: AGENT_CONTROLLER_SENSOR_SCANNER_TYPE,
id: undefined,
port: 22,
port: 0,
});
});

Expand Down Expand Up @@ -452,7 +452,7 @@ describe('ScannerDialog tests', () => {
credentialId: undefined,
type: GREENBONE_SENSOR_SCANNER_TYPE,
id: '1234',
port: 22,
port: 0,
});
});

Expand Down
Loading