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

ASA 8392 #155

Merged
merged 10 commits into from
Jun 4, 2024
Merged

ASA 8392 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
37a84d1
Update DASTScan.java
vishalhcl-5960 May 8, 2024
343705f
Update ServiceUtil.java
vishalhcl-5960 May 8, 2024
a9a61bf
Update ServiceUtil.java
vishalhcl-5960 May 13, 2024
705eeb3
Merge branch 'HCL-TECH-SOFTWARE:master' into ASA-8392
vishalhcl-5960 May 14, 2024
97eb9fa
DAST-A360
vishalhcl-5960 May 21, 2024
e1c866c
updated the error statement
vishalhcl-5960 May 28, 2024
45f46b9
Merge branch 'HCL-TECH-SOFTWARE:ASA-8392' into ASA-8392
vishalhcl-5960 Jun 3, 2024
e194c95
Suggested changes
vishalhcl-5960 Jun 4, 2024
c0b8c89
Update ASoCScan.java
vishalhcl-5960 Jun 4, 2024
764514c
copyright updates
vishalhcl-5960 Jun 4, 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
4 changes: 2 additions & 2 deletions src/main/java/com/hcl/appscan/sdk/scanners/ASoCScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* © Copyright IBM Corporation 2016.
* © Copyright HCL Technologies Ltd. 2017.
* © Copyright HCL Technologies Ltd. 2017, 2024.
* LICENSE: Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0
*/

Expand Down Expand Up @@ -33,7 +33,7 @@ public ASoCScan(Map<String, String> properties, IScanServiceProvider provider) {
}

public ASoCScan(Map<String, String> properties, IProgress progress, IScanServiceProvider provider) {
m_target = properties.remove(CoreConstants.TARGET);
m_target = properties.get(CoreConstants.TARGET);
m_properties = properties;
if(!m_properties.containsKey(CoreConstants.SCAN_NAME))
m_properties.put(CoreConstants.SCAN_NAME, getType() + SystemUtil.getTimeStamp());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/hcl/appscan/sdk/scanners/dynamic/DASTScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void run() throws ScannerException, InvalidTargetException {
params.put(STARTING_URL, target);

IAuthenticationProvider authProvider = getServiceProvider().getAuthenticationProvider();
if(params.get(PRESENCE_ID)!=null && params.get(PRESENCE_ID).isEmpty() && !ServiceUtil.isValidUrl(target, authProvider, authProvider.getProxy())) {
if(!params.containsKey(PRESENCE_ID) && !ServiceUtil.isValidUrl(target, authProvider, authProvider.getProxy())) {
throw new ScannerException(Messages.getMessage(CoreConstants.ERROR_URL_VALIDATION, target));
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/hcl/appscan/sdk/utils/ServiceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* © Copyright IBM Corporation 2016.
* © Copyright HCL Technologies Ltd. 2017, 2020, 2023.
* © Copyright HCL Technologies Ltd. 2017, 2020, 2024.
* LICENSE: Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0
*/

Expand Down Expand Up @@ -142,9 +142,9 @@ public static boolean isValidUrl(String url, IAuthenticationProvider provider, P
JSONObject body = new JSONObject();
body.put(URL, url);

HttpClient client = new HttpClient(proxy);
Map<String,String> requestHeaders= provider.getAuthorizationHeader(false);
requestHeaders.put("Content-Type", "application/json");
HttpClient client = new HttpClient(proxy, provider.getacceptInvalidCerts());
Map<String,String> requestHeaders= provider.getAuthorizationHeader(false);
requestHeaders.put("Content-Type", "application/json");
HttpResponse response = client.post(request_url, requestHeaders, body.toString());

if (response.isSuccess()) {
Expand Down
Loading