From ab948ceabe25a8aab03bafb6ae224956906baab2 Mon Sep 17 00:00:00 2001 From: Albert Tregnaghi Date: Mon, 13 Feb 2023 10:29:09 +0100 Subject: [PATCH] Netsparker config values have now defaults with "deprecated" #1932 - it is now possible to startup sechub without configuring netsparker values - the default "deprecated" makes this possible - added deprecated annotations --- .../README.md | 1 + .../netsparker/NetsparkerInstallSetup.java | 1 + .../NetsparkerInstallSetupImpl.java | 19 ++++++++++--------- .../netsparker/NetsparkerProductExecutor.java | 1 + 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/deprecated-sechub-adapter-netsparker/README.md b/deprecated-sechub-adapter-netsparker/README.md index d8a8e760c7..33f838ab2e 100644 --- a/deprecated-sechub-adapter-netsparker/README.md +++ b/deprecated-sechub-adapter-netsparker/README.md @@ -1,6 +1,7 @@ About this project ================== +ATTENTION: The netsparker product support is deprecated and will be removed in future! This an adapter project to access product NETSPARKER. It has no dependency to any sechub part and can be used as a single command line program too (for test purpose). diff --git a/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerInstallSetup.java b/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerInstallSetup.java index 39f08e3655..3088139a0c 100644 --- a/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerInstallSetup.java +++ b/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerInstallSetup.java @@ -3,6 +3,7 @@ import com.mercedesbenz.sechub.domain.scan.NetworkTargetProductServerDataProvider; +@Deprecated // will be removed in future public interface NetsparkerInstallSetup extends NetworkTargetProductServerDataProvider { public int getScanResultCheckPeriodInMinutes(); diff --git a/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerInstallSetupImpl.java b/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerInstallSetupImpl.java index 9f98c6c211..37682e4016 100644 --- a/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerInstallSetupImpl.java +++ b/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerInstallSetupImpl.java @@ -7,42 +7,43 @@ import com.mercedesbenz.sechub.adapter.AbstractAdapterConfigBuilder; import com.mercedesbenz.sechub.sharedkernel.MustBeDocumented; +@Deprecated // will be removed in future @Component public class NetsparkerInstallSetupImpl implements NetsparkerInstallSetup { - @Value("${sechub.adapter.netsparker.intranet.agentgroupname:}") + @Value("${sechub.adapter.netsparker.intranet.agentgroupname:deprecated}") @MustBeDocumented("The name of the agent group to be used by netsparker for *intranet scans*. If not set no agent group will be used.") private String intranetAgentGroupName; - @Value("${sechub.adapter.netsparker.internet.agentgroupname:}") + @Value("${sechub.adapter.netsparker.internet.agentgroupname:deprecated}") @MustBeDocumented("The name of the agent group to be used by netsparker for *intranet scans*. If not set no agent group will be used.") private String internetAgentGroupName; - @Value("${sechub.adapter.netsparker.userid}") + @Value("${sechub.adapter.netsparker.userid:deprecated}") @MustBeDocumented(value = "user id of netsparker user", secret = true) String netsparkerUserId; - @Value("${sechub.adapter.netsparker.apitoken}") + @Value("${sechub.adapter.netsparker.apitoken:deprecated}") @MustBeDocumented(value = "API token for netsparker user", secret = true) String netsparkerAPIToken; - @Value("${sechub.adapter.netsparker.baseurl}") + @Value("${sechub.adapter.netsparker.baseurl:deprecated}") @MustBeDocumented(value = "Base url for netsparker installation") String netsparkerBaseURL; - @Value("${sechub.adapter.netsparker.defaultpolicyid}") + @Value("${sechub.adapter.netsparker.defaultpolicyid:deprecated}") @MustBeDocumented("Default policy ID for netsparker scans") private String defaultPolicyId; - @Value("${sechub.adapter.netsparker.trustall:false}") + @Value("${sechub.adapter.netsparker.trustall:true}") @MustBeDocumented(AbstractAdapterConfigBuilder.DOCUMENT_INFO_TRUSTALL) private boolean trustAllCertificatesNecessary; - @Value("${sechub.adapter.netsparker.licenseid}") + @Value("${sechub.adapter.netsparker.licenseid:deprecated}") @MustBeDocumented String netsparkerLicenseId; - @Value("${sechub.adapter.netsparker.agentname:}") + @Value("${sechub.adapter.netsparker.agentname:deprecated}") @MustBeDocumented("The name of the agent to be used by netsparker. If a agent group name is already defined the group will be superiour. If no group set and no agent name netsparker will use a agent but seems to be unpredictable which agent will be used.") private String agentName; diff --git a/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerProductExecutor.java b/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerProductExecutor.java index 62cf9270ad..e758b7e5da 100644 --- a/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerProductExecutor.java +++ b/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerProductExecutor.java @@ -31,6 +31,7 @@ import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.sharedkernel.configuration.SecHubConfiguration; +@Deprecated // will be removed in future @Service public class NetsparkerProductExecutor extends AbstractProductExecutor {