Skip to content
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

SDK version update #221

Merged
merged 14 commits into from
Jun 25, 2024
Merged

SDK version update #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ec7b44c
Update AppScanEnterpriseBuildStep.java
vishalhcl-5960 Nov 24, 2023
c50be5b
Update AppScanEnterpriseBuildStep.java
vishalhcl-5960 Nov 24, 2023
5567db4
Update AppScanEnterpriseBuildStep.java
vishalhcl-5960 Nov 24, 2023
3650a0a
Merge branch 'jenkinsci:master' into master
vishalhcl-5960 Nov 30, 2023
4fb39c0
Merge branch 'jenkinsci:master' into master
vishalhcl-5960 Jan 16, 2024
2fe91d0
Merge branch 'jenkinsci:master' into master
vishalhcl-5960 Feb 14, 2024
a891d2c
Merge branch 'jenkinsci:master' into master
vishalhcl-5960 Feb 24, 2024
2f36296
Merge branch 'jenkinsci:master' into master
vishalhcl-5960 Mar 28, 2024
33c0001
Merge branch 'jenkinsci:master' into master
vishalhcl-5960 Apr 25, 2024
cc44963
Merge branch 'jenkinsci:master' into master
vishalhcl-5960 May 22, 2024
4b69bb5
Merge branch 'jenkinsci:master' into master
vishalhcl-5960 Jun 17, 2024
e522b4b
Update AppScanBuildStep.java
vishalhcl-5960 Jun 17, 2024
77e676e
Update AppScanBuildStep.java
vishalhcl-5960 Jun 22, 2024
e7f14b6
code-cleanup
vishalhcl-5960 Jun 25, 2024
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<dependency>
<groupId>com.hcl</groupId>
<artifactId>appscan.sdk</artifactId>
<version>1.1.0</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.wink</groupId>
Expand Down
30 changes: 17 additions & 13 deletions src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,37 +304,41 @@ private void shouldFailBuild(IResultsProvider provider,Run<?,?> build) throws Ab
throw new AbortException(Messages.error_checking_results(provider.getStatus()));
}
}

private void perform(Run<?,?> build, Launcher launcher, TaskListener listener) throws InterruptedException, IOException {
m_authProvider = new JenkinsAuthenticationProvider(m_credentials, build.getParent().getParent());
final IProgress progress = new ScanProgress(listener);
final boolean suspend = m_wait;
Map<String, String> properties = getScanProperties(build,listener);
String target = properties.get(CoreConstants.TARGET);
final IScan scan = ScanFactory.createScan(properties, progress, m_authProvider);
boolean isAppScan360 = ((JenkinsAuthenticationProvider) m_authProvider).isAppScan360();

private void validations(boolean isAppScan360, Map<String, String> properties, IProgress progress, String target) throws AbortException {
if(isAppScan360) {
if (m_type.equals("Dynamic Analyzer") && properties.containsKey(Scanner.PRESENCE_ID)) {
if (m_type.equals(Scanner.DYNAMIC_ANALYZER) && properties.containsKey(Scanner.PRESENCE_ID)) {
throw new AbortException(Messages.error_presence_AppScan360());
} if (m_type.equals(CoreConstants.SOFTWARE_COMPOSITION_ANALYZER)) {
throw new AbortException(Messages.error_sca_AppScan360());
} if (m_intervention) {
progress.setStatus(new Message(Message.WARNING, Messages.warning_allow_intervention_AppScan360()));
} if (properties.get("openSourceOnly") != null) {
} if (properties.get(CoreConstants.OPEN_SOURCE_ONLY) != null) {
throw new AbortException(Messages.error_sca_AppScan360());
}
} else if (m_authProvider.getacceptInvalidCerts()) {
progress.setStatus(new Message(Message.WARNING, Messages.warning_asoc_certificates()));
}

if (m_type.equals("Static Analyzer") && properties.containsKey(CoreConstants.OPEN_SOURCE_ONLY)) {
if (m_type.equals(Scanner.STATIC_ANALYZER) && properties.containsKey(CoreConstants.OPEN_SOURCE_ONLY)) {
progress.setStatus(new Message(Message.WARNING, Messages.warning_sca()));
}

if(m_type.equals("Dynamic Analyzer") && !properties.containsKey(Scanner.PRESENCE_ID) && !ServiceUtil.isValidUrl(target, m_authProvider, m_authProvider.getProxy())) {
if(!isAppScan360 && m_type.equals(Scanner.DYNAMIC_ANALYZER) && !properties.containsKey(Scanner.PRESENCE_ID) && !ServiceUtil.isValidUrl(target, m_authProvider, m_authProvider.getProxy())) {
throw new AbortException(Messages.error_url_validation(target));
}
}

private void perform(Run<?,?> build, Launcher launcher, TaskListener listener) throws InterruptedException, IOException {
m_authProvider = new JenkinsAuthenticationProvider(m_credentials, build.getParent().getParent());
final IProgress progress = new ScanProgress(listener);
final boolean suspend = m_wait;
Map<String, String> properties = getScanProperties(build,listener);
String target = properties.get(CoreConstants.TARGET);
final IScan scan = ScanFactory.createScan(properties, progress, m_authProvider);
boolean isAppScan360 = ((JenkinsAuthenticationProvider) m_authProvider).isAppScan360();

validations(isAppScan360, properties, progress, target);

IResultsProvider provider = launcher.getChannel().call(new Callable<IResultsProvider, AbortException>() {
private static final long serialVersionUID = 1L;
Expand Down
Loading