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 8404 (#158) #159

Merged
merged 6 commits into from
Jun 24, 2024
Merged

ASA 8404 (#158) #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aabbba7
ASA 8404 (#158)
vishalhcl-5960 Jun 12, 2024
9b5a123
review comments (#160)
vishalhcl-5960 Jun 13, 2024
4168bd0
Update ASoCScan.java
vishalhcl-5960 Jun 13, 2024
bfd28ff
white space handling
vishalhcl-5960 Jun 13, 2024
d93246d
Update SAClient.java
vishalhcl-5960 Jun 13, 2024
a745198
Update CoreConstants.java
vishalhcl-5960 Jun 13, 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
3 changes: 2 additions & 1 deletion src/main/java/com/hcl/appscan/sdk/CoreConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public interface CoreConstants {
String SCANNER_TYPE = "type"; //$NON-NLS-1$
String STATUS = "Status"; //$NON-NLS-1$
String TARGET = "target"; //$NON-NLS-1$
String OPEN_SOURCE_ONLY = "openSourceOnly"; //$NON-NLS-1$
String OPEN_SOURCE_ONLY = "openSourceOnly"; //$NON-NLS-1$
String INCLUDE_SCA = "includeSCA"; //$NON-NLS-1$
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The OPEN_SOURCE_ONLY constant is still used in various places within the code, so we should not be removing it. It could also be used by different plugins, so we should keep that constant in place.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, Matt.

String VERSION_NUMBER = "VersionNumber"; //$NON-NLS-1$
String USER_MESSAGE = "UserMessage"; //$NON-NLS-1$
String IS_VALID = "IsValid"; //$NON-NLS-1$
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/hcl/appscan/sdk/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# \u00c2\u00a9 Copyright IBM Corporation 2016.
# \u00c2\u00a9 Copyright HCL Technologies Ltd. 2017, 2020.
# \u00c2\u00a9 Copyright HCL Technologies Ltd. 2017, 2020, 2024.
# LICENSE: Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0
#
# NLS_MESSAGEFORMAT_VAR
Expand All @@ -9,7 +9,7 @@
transfer.progress={0}% transferred

message.created.scan=Successfully submitted scan for analysis.
message.running.scan=Creating and executing scan...
message.running.scan=Creating and executing {0} scan...
message.uploading.file=Uploading {0} to the analysis service...
message.done=Done.
message.downloading.client=Downloading the latest SAClientUtil package...
Expand Down
9 changes: 2 additions & 7 deletions src/main/java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,15 @@ public String createAndExecuteScan(String type, Map<String, String> params) {
return null;
}

m_progress.setStatus(new Message(Message.INFO, Messages.getMessage(EXECUTING_SCAN)));
m_progress.setStatus(new Message(Message.INFO, Messages.getMessage(EXECUTING_SCAN, params.get(CoreConstants.SCANNER_TYPE))));
Map<String, String> request_headers = m_authProvider.getAuthorizationHeader(true);
HttpClient client = new HttpClient(m_authProvider.getProxy(), m_authProvider.getacceptInvalidCerts());

try {
HttpResponse response;
request_headers.put("Content-Type", "application/json");
request_headers.put("accept", "application/json");
String request_url;
if(type.equals(SASTConstants.STATIC_ANALYZER) && !params.containsKey(UPLOAD_DIRECT) && params.containsKey(OPEN_SOURCE_ONLY)) {
request_url = m_authProvider.getServer() + String.format(API_SCANNER, SCA);
} else {
request_url = m_authProvider.getServer() + String.format(API_SCANNER, type);
}
String request_url = m_authProvider.getServer() + String.format(API_SCANNER, type);
response = client.post(request_url,request_headers,params);

int status = response.getResponseCode();
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/com/hcl/appscan/sdk/scanners/sast/SAClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,13 +329,19 @@ private List<String> getClientArgs(Map<String, String> properties) {
if(properties.containsKey(THIRD_PARTY) || System.getProperty(THIRD_PARTY) != null) {
args.add(OPT_THIRD_PARTY);
}
if (properties.containsKey(OPEN_SOURCE_ONLY) || System.getProperty(OPEN_SOURCE_ONLY) != null || properties.getOrDefault(CoreConstants.SCANNER_TYPE, "").equals(CoreConstants.SOFTWARE_COMPOSITION_ANALYZER)) {
if (properties.containsKey(OPEN_SOURCE_ONLY) || System.getProperty(OPEN_SOURCE_ONLY) != null) {
args.add(OPT_OPEN_SOURCE_ONLY);
}
if (properties.containsKey(SOURCE_CODE_ONLY) || System.getProperty(SOURCE_CODE_ONLY) != null) {
args.add(OPT_SOURCE_CODE_ONLY);
}
if(properties.containsKey(SCAN_SPEED)) {
if (!properties.containsKey(CoreConstants.INCLUDE_SCA) && properties.get(CoreConstants.SCANNER_TYPE).equals(SAST)) {
args.add(OPT_STATIC_ANALYSIS_ONLY);
}
if (properties.get(CoreConstants.SCANNER_TYPE).equals(CoreConstants.SOFTWARE_COMPOSITION_ANALYZER)) {
args.add(OPT_OPEN_SOURCE_ONLY);
}
if(properties.containsKey(SCAN_SPEED)){
args.add(OPT_SCAN_SPEED);
if(properties.get(SCAN_SPEED).equals(NORMAL)){
args.add(THOROUGH);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/hcl/appscan/sdk/scanners/sast/SASTConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ public interface SASTConstants {
String OPT_VERBOSE = "-v"; //$NON-NLS-1$
String OPT_DEBUG = "-X"; //$NON-NLS-1$
String OPT_OPEN_SOURCE_ONLY = "-oso"; //$NON-NLS-1$
String OPT_SOURCE_CODE_ONLY = "-sco"; //$NON-NLS-1$
String OPT_SOURCE_CODE_ONLY = "-sco"; //$NON-NLS-1$
String OPT_STATIC_ANALYSIS_ONLY = "-sao"; //$NON-NLS-1$
String OPT_SECRETS_ENABLED = "-es"; //$NON-NLS-1$
String OPT_SECRETS_ONLY = "-so"; //$NON-NLS-1$

Expand Down
10 changes: 7 additions & 3 deletions src/main/java/com/hcl/appscan/sdk/scanners/sca/SCAScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* © Copyright HCL Technologies Ltd. 2023.
* © Copyright HCL Technologies Ltd. 2023, 2024.
* LICENSE: Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0
*/

Expand Down Expand Up @@ -34,8 +34,12 @@ public void run() throws ScannerException, InvalidTargetException {
throw new InvalidTargetException(Messages.getMessage(TARGET_INVALID, target));

try {
generateIR();
analyzeIR();
if(getProperties().containsKey("ApplicationFileId")) {
submitScan();
} else {
generateIR();
analyzeIR();
}
} catch(IOException e) {
throw new ScannerException(Messages.getMessage(SCAN_FAILED, e.getLocalizedMessage()));
}
Expand Down
Loading