Merge pull request #67 from Qualys/feature/QINT-18550

QINT-18550: GitHub Action WAS: Update WAS Scan Report URL

Author: Qjyadav

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.6</version>
+		<version>3.3.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -25,10 +25,6 @@
 					<artifactId>snakeyaml</artifactId>
 					<groupId>org.yaml</groupId>
 				</exclusion>
-				<exclusion>
-					<artifactId>logback-classic</artifactId>
-					<groupId>ch.qos.logback</groupId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -64,22 +60,6 @@
 			<artifactId>snakeyaml</artifactId>
 			<version>2.2</version>
 		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.4.14</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>logback-core</artifactId>
-					<groupId>ch.qos.logback</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-			<version>1.4.14</version>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>

src/main/java/com/example/GitHubActionsQWas/service/QualysWASScanBuilder.java

@@ -244,8 +244,8 @@ public void launchWebApplicationScan() {
                         message1 += ", 'CANCEL_OPTION:" + cancelOptions + "', 'CANCEL_HOURS:" + cancelHours + " hrs'";
                     }
                     String message2 = "Scan successfully launched with scan id: " + scanId + " and scan name: " + service.getScanName();
-                    String message3 = "Please switch to WAS Classic UI and Check for report...";
-                    String message4 = "To check scan result, please follow the url: " + portalServer + "/portal-front/module/was/#forward=/module/was/&scan-report=" + scanId;
+                    String message3 = "To check scan result on Qualys UI, please follow the url. Note that, scan result URL will work with New WAS UI only: " + portalServer + "/was/#/reports/online-reports/email-report/scan/" + scanId;
+                    
                     logger.info(message1);
                     logger.info(message2);
                     if (this.waitForResult) {
@@ -273,7 +273,6 @@ public void launchWebApplicationScan() {
                                         buildPassed = failurePolicyEvaluationResult.get("passed").getAsBoolean();
                                         if (!buildPassed) {
                                             logger.info(message3);
-                                            logger.info(message4);
                                             String failureMessage = failurePolicyEvaluationResult.get("failureMessage").getAsString();
                                             logger.error(failureMessage);
 
@@ -296,13 +295,11 @@ public void launchWebApplicationScan() {
                                     System.exit(1);
                                 }
                                 logger.info(message3);
-                                logger.info(message4);
                             }
                         }
                     } else {
                         logger.info(message3);
-                        logger.info(message4);
-                        String message = message1 + "\n" + message2 + "\n" + message3 + "\n" + message4;
+                        String message = message1 + "\n" + message2 + "\n" + message3;
                         String fileName = "Qualys_Wasscan_" + webAppId + ".txt";
                         Helper.dumpDataIntoFile(message, fileName);
                     }

src/main/java/com/example/GitHubActionsQWas/service/QualysWASScanStatusService.java

@@ -31,16 +31,15 @@ public String fetchScanStatus(String scanId, String scanType, boolean severityCh
                 long endTime = System.currentTimeMillis();
                 if ((endTime - startTime) > timeoutInMillis) {
                     String message1 = "Failed to get scan result; timeout of " + TimeUnit.SECONDS.toMinutes(TIMEOUT) + " minutes reached.";
-                    String message2 = "Please switch to WAS Classic UI and Check for report...";
-                    String message3 = "To check scan result, please follow the url: " + portalUrl + "/portal-front/module/was/#forward=/module/was/&scan-report=" + scanId;
+                    String message2 = "To check scan result on Qualys UI, please follow the url. Note that, scan result URL will work with New WAS UI only: " + portalUrl + "/was/#/reports/online-reports/email-report/scan/" + scanId;
+
                     logger.info(message1);
                     logger.info(message2);
-                    logger.info(message3);
                     if (scanType.equalsIgnoreCase("vulnerability") && severityCheck) {
                         failed = true;
                     }
                     if (failed) {
-                        String message = message1 + "\n" + message2 + "\n" + message3;
+                        String message = message1 + "\n" + message2;
                         Helper.dumpDataIntoFile(message, "Qualys_Wasscan_" + scanId + ".txt");
                         System.exit(1);
                     }