Version 0.4.40 (checkmarx-ltd#106)

* Fix for soap session handler * Update to version 0.4.40
james-bostock-cx · Sep 2, 2020 · f75bb53 · f75bb53
1 parent d9bda8e
commit f75bb53
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.github.checkmarx-ts</groupId>
 	<artifactId>cx-spring-boot-sdk</artifactId>
-	<version>0.4.39</version>
+	<version>0.4.40</version>
 	<name>cx-spring-boot-sdk</name>
 	<description>Checkmarx Java Spring Boot SDK</description>
 

diff --git a/src/main/java/com/checkmarx/sdk/ShardManager/ShardSession.java b/src/main/java/com/checkmarx/sdk/ShardManager/ShardSession.java
@@ -7,6 +7,8 @@
 public class ShardSession {
     private WebServiceTemplate ws = null;
     private WebServiceTemplate shardWs = null;
+    private String soapToken = "";
+    private LocalDateTime soapTokenExpires = null;
     private String name = "";
     private String team = "";
     private String project = "";
@@ -33,6 +35,22 @@ public WebServiceTemplate getShardWs() {
         return shardWs;
     }
 
+    public String getSoapToken() {
+        return soapToken;
+    }
+
+    public void setSoapToken(String soapToken) {
+        this.soapToken = soapToken;
+    }
+
+    public LocalDateTime getSoapTokenExpires() {
+        return soapTokenExpires;
+    }
+
+    public void setSoapTokenExpires(LocalDateTime soapTokenExpires) {
+        this.soapTokenExpires = soapTokenExpires;
+    }
+
     public boolean getShardFound() {
         return shardFound;
     }

diff --git a/src/main/java/com/checkmarx/sdk/service/CxAuthService.java b/src/main/java/com/checkmarx/sdk/service/CxAuthService.java
@@ -148,6 +148,11 @@ public String getSoapAuthToken(String username, String password) {
             }
             soapToken = response.getAccessToken();
             soapTokenExpires = LocalDateTime.now().plusSeconds(response.getExpiresIn()-500); //expire 500 seconds early
+            if(cxProperties.getEnableShardManager()) {
+                ShardSession shard = sessionTracker.getShardSession();
+                shard.setSoapToken(soapToken);
+                shard.setSoapTokenExpires(soapTokenExpires);
+            }
         }
         catch (NullPointerException | HttpStatusCodeException e) {
             log.error("Error occurred white obtaining Access Token.  Possibly incorrect credentials");
@@ -198,10 +203,15 @@ private boolean isTokenExpired() {
     }
 
     private boolean isSoapTokenExpired() {
-        if (soapTokenExpires == null) {
+        LocalDateTime curTokenExpires = soapTokenExpires;
+        if(cxProperties.getEnableShardManager()) {
+            ShardSession shard = sessionTracker.getShardSession();
+            curTokenExpires = shard.getSoapTokenExpires();
+        }
+        if (curTokenExpires == null) {
             return true;
         }
-        return LocalDateTime.now().isAfter(soapTokenExpires);
+        return LocalDateTime.now().isAfter(curTokenExpires);
     }
 
     private boolean isSessionTokenExpired() {

diff --git a/src/main/java/com/checkmarx/sdk/service/CxLegacyService.java b/src/main/java/com/checkmarx/sdk/service/CxLegacyService.java
@@ -90,6 +90,10 @@ public String login(String username, String password) throws CheckmarxLegacyExce
         try {
             if(!response.getLoginV2Result().isIsSuccesfull())
                 throw new CheckmarxLegacyException("Authentication Error");
+            if(properties.getEnableShardManager()) {
+                ShardSession shard = sessionTracker.getShardSession();
+                shard.setSoapToken(response.getLoginV2Result().getSessionId());
+            }
             return response.getLoginV2Result().getSessionId();
         }
         catch(NullPointerException e){
@@ -545,13 +549,20 @@ Integer getLdapServerId(String session, String serverName) throws  CheckmarxExce
     }
 
     private WebServiceMessageCallback getWSCallback(String callbackUri, String token){
+        String curToken;
+        if(properties.getEnableShardManager()) {
+            ShardSession shard = sessionTracker.getShardSession();
+            curToken = shard.getSoapToken();
+        } else {
+            curToken = token;
+        }
         return message -> {
             SoapMessage soapMessage = (SoapMessage) message;
             soapMessage.setSoapAction(callbackUri);
             TransportContext context = TransportContextHolder.getTransportContext();
             HttpUrlConnection connection = (HttpUrlConnection) context.getConnection();
             try {
-                if(!ScanUtils.empty(token) && properties.getVersion() >= 9.0) {
+                if(!ScanUtils.empty(curToken) && properties.getVersion() >= 9.0) {
                     connection.addRequestHeader(HttpHeaders.AUTHORIZATION, "Bearer ".concat(token));
                 }
             }catch (IOException e){