Added validation on empty values (#13)

* Added validation on empty values * AST-3601 Do not validate tenant as it is optional and validate project-name in scan create * AST-3601 Raise version
CheckmarxDev · Aug 23, 2021 · 8e1f081 · 8e1f081
1 parent 9f1ee99
commit 8e1f081
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.checkmarx.ast</groupId>
   <artifactId>ast-cli-java-wrapper</artifactId>
-  <version>1.0.9</version>
+  <version>1.0.10</version>
   <packaging>jar</packaging>
 
   <dependencies>

diff --git a/src/main/java/com/checkmarx/ast/scans/CxAuth.java b/src/main/java/com/checkmarx/ast/scans/CxAuth.java
@@ -46,6 +46,8 @@ public CxAuth(CxScanConfig scanConfig, Logger log) throws IOException, URISyntax
         this.secret = scanConfig.getClientSecret();
         this.apikey = scanConfig.getApiKey();
 
+        validateConfigValues();
+
         if (scanConfig.getPathToExecutable() != null && !scanConfig.getPathToExecutable().isEmpty()) {
             File file = new File(scanConfig.getPathToExecutable());
             this.executable = file.toURI();
@@ -58,6 +60,16 @@ public CxAuth(CxScanConfig scanConfig, Logger log) throws IOException, URISyntax
         }
     }
 
+    private void validateConfigValues(){
+        if (StringUtils.isEmpty(this.baseuri)) {
+            throw new CxException("Checkmarx server URL was not set");
+        }
+
+        if (StringUtils.isEmpty(this.apikey) && (StringUtils.isEmpty(this.key) && StringUtils.isEmpty(this.secret))) {
+            throw new CxException("Credentials were not set");
+        }
+    }
+
     private URI packageExecutable() throws IOException, URISyntaxException {
         String osName = System.getProperty("os.name");
 
@@ -94,7 +106,7 @@ private URI getFile(URI jarLocation, final String fileName) throws IOException {
         location = new File(jarLocation);
 
         if (location.isDirectory()) {
-            fileURI = URI.create(jarLocation.toString() + fileName);
+            fileURI = URI.create(jarLocation + fileName);
         } else {
             final ZipFile zipFile;
 
@@ -218,7 +230,7 @@ private String runResultExecutionCommands(List<String> commands) throws IOExcept
         Process process = exec.executeCommand(commands);
         BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
         StringBuilder builder = new StringBuilder();
-        String line = null;
+        String line;
         while ((line = reader.readLine()) != null) {
             builder.append(line);
             builder.append(System.getProperty("line.separator"));
@@ -235,7 +247,7 @@ private CxCommandOutput runExecutionCommands(List<String> commands) throws IOExc
         ExecutionService exec = new ExecutionService();
         Process process = exec.executeCommand(commands);
         String line;
-        CxScan scanObject = null;
+        CxScan scanObject;
         InputStream is = process.getInputStream();
         InputStreamReader isr = new InputStreamReader(is);
         BufferedReader br = new BufferedReader(isr);
@@ -347,6 +359,10 @@ public CxCommandOutput cxScanCreate(Map<CxParamType, String> params) throws IOEx
         commands.add("scan");
         commands.add("create");
 
+        if (!params.containsKey(CxParamType.PROJECT_NAME)) {
+            throw new CxException("Checkmarx project name was not set");
+        }
+
         for (Map.Entry<CxParamType, String> param : params.entrySet()) {
             if (param.getKey() == CxParamType.ADDITIONAL_PARAMETERS && param.getValue() != null) {
                 addIndividualParams(commands, param.getValue());
@@ -392,9 +408,9 @@ private void addAuthCredentials(List<String> commands) {
         }
     }
 
-    private List<CxScan> transformToCxScanList(String line) throws IOException {
+    private List<CxScan> transformToCxScanList(String line) {
         ObjectMapper objectMapper = new ObjectMapper();
-        List<CxScan> scanList = null;
+        List<CxScan> scanList;
         try {
             scanList = objectMapper.readValue(line, new TypeReference<List<CxScan>>() {
             });
@@ -409,12 +425,12 @@ public boolean isValidJSON(final String json) {
         boolean valid = false;
         try {
             final JsonParser parser = new ObjectMapper().createParser(json);
+            //noinspection StatementWithEmptyBody
             while (parser.nextToken() != null) {
             }
             valid = true;
         } catch (IOException ignored) {
         }
-        ;
         return valid;
     }