Integration branch (#25)

* GA Changes

GA

* GA changes 1.0.11

* code changes for encryption and decryption of access_token

* code changes for encryption and decryption of access_token

* code changes for encryption and decryption of access_token

* updated scan summary name and update set

* change log level to basic

* Update Update_Set_GA_1.0.11.xml

* Added Update set From Vendor Instance

* Added changes for CxOne release 1.0.14 (#19)

* CheckmarxOne Devops changes

* CxOne 1.0.18 changes

* Rename UpdateSet_GA.xml to UpdateSet_GA_1.0.18.xml

* Cx_One_1.0.19 Features (#24)

* Cx_One_1.0.19 Features

* Updated resultHash in AVITID

* Updated Update set

* Updated update set and code changes

---------

Co-authored-by: Nidhi Jaiswal <[email protected]>
Co-authored-by: Nidhi Jaiswal <[email protected]>

Author: apoorvasingh5

Diff for: Scripts/CheckmarxOneAppListIntegration_sys_script_include_f60f0ee047131110328ca368436d43ba.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<unload unload_date="2024-02-05 11:24:07">
+<unload unload_date="2024-02-14 13:27:23">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>public</access>
 <active>true</active>
@@ -65,26 +65,36 @@ CheckmarxOneAppListIntegration.prototype = Object.extendsObject(sn_vul.Applicati
             var response = this.UTIL.getNextProjectList(this.IMPLEMENTATION, newoffset);
             var groups = '';
             var groupval = ' ';
+            var isPrimaryBranchEnabled = this.UTIL._getConfig(this.IMPLEMENTATION).sync_only_primary_branch.toString();
             for (var item in response.projects) {
                 var projectTags = this._getProjectTags(JSON.stringify(response.projects[item].tags));
                 var applicationIds = '';
+                var primaryBranch = '';
+                var isProjectAllowed = 'true';
                 groups = +response.projects[item].groups.toString();
                 var projectResponse = this.UTIL.getProjectById(this.IMPLEMENTATION, response.projects[item].id);
                 if (null != projectResponse.applicationIds && projectResponse.applicationIds.length > 0)
-                    applicationIds = projectResponse.applicationIds.toString(); {
+                    applicationIds = projectResponse.applicationIds.toString();
+                if (null != projectResponse.mainBranch && projectResponse.mainBranch.length > 0)
+                    primaryBranch = projectResponse.mainBranch.toString();
+                if (isPrimaryBranchEnabled == 'true' && (primaryBranch == null || primaryBranch == ''))
+                    isProjectAllowed = 'false';
+                if (isProjectAllowed == 'true') {
                     if (groups == 0) {
                         appListAll += '<project id="' + response.projects[item].id +
                             '" createdAt="' + response.projects[item].createdAt +
                             '" applicationIds="' + applicationIds +
-                            '" groups="' + groupval + '"><projectTags><' +
+                            '" groups="' + groupval + '"><primaryBranch><' +
+                            '![CDATA[' + primaryBranch + ']]' + '></primaryBranch><projectTags><' +
                             '![CDATA[' + projectTags + ']]' + '></projectTags><name><' +
                             '![CDATA[' + response.projects[item].name + ']]' + '></name></project>';
 
                     } else {
                         appListAll += '<project id="' + response.projects[item].id +
                             '" createdAt="' + response.projects[item].createdAt +
                             '" applicationIds="' + applicationIds +
-                            '" groups="' + response.projects[item].groups.toString() + '"><projectTags><' +
+                            '" groups="' + response.projects[item].groups.toString() + '"><primaryBranch><' +
+                            '![CDATA[' + primaryBranch + ']]' + '></primaryBranch><projectTags><' +
                             '![CDATA[' + projectTags + ']]' + '></projectTags><name><' +
                             '![CDATA[' + response.projects[item].name + ']]' + '></name></project>';
                     }
@@ -123,12 +133,14 @@ CheckmarxOneAppListIntegration.prototype = Object.extendsObject(sn_vul.Applicati
             } else {
                 this.LATEST = new GlideDateTime();
                 var offsetId;
+                var filteredCount;
                 var list_projects = this.UTIL.getConfigProjectList(this.IMPLEMENTATION);
                 if (list_projects && list_projects.length > 0) {
                     offsetId = '0';
+                    filteredCount = '' + list_projects.length;
                 } else {
                     var projectJSON = this.UTIL.getNewProjectList(this.IMPLEMENTATION);
-                    var filteredCount = projectJSON.filteredTotalCount;
+                    filteredCount = projectJSON.filteredTotalCount;
                     var totalCount = projectJSON.totalCount;
                     if (filteredCount !== "undefined") {
                         offsetId = this._getoffsets(filteredCount, totalCount);
@@ -212,13 +224,13 @@ CheckmarxOneAppListIntegration.prototype = Object.extendsObject(sn_vul.Applicati
 <sys_created_by>admin</sys_created_by>
 <sys_created_on>2022-11-18 05:11:38</sys_created_on>
 <sys_id>f60f0ee047131110328ca368436d43ba</sys_id>
-<sys_mod_count>173</sys_mod_count>
+<sys_mod_count>179</sys_mod_count>
 <sys_name>CheckmarxOneAppListIntegration</sys_name>
 <sys_package display_value="Checkmarx One Vulnerability Integration" source="x_chec3_chexone">3d20e92d47471110328ca368436d436a</sys_package>
 <sys_policy/>
 <sys_scope display_value="Checkmarx One Vulnerability Integration">3d20e92d47471110328ca368436d436a</sys_scope>
 <sys_update_name>sys_script_include_f60f0ee047131110328ca368436d43ba</sys_update_name>
 <sys_updated_by>admin</sys_updated_by>
-<sys_updated_on>2024-01-05 14:48:25</sys_updated_on>
+<sys_updated_on>2024-02-08 16:03:48</sys_updated_on>
 </sys_script_include>
 </unload>

Diff for: Scripts/CheckmarxOneAppListProcessor_sys_script_include_716c87ad471f1110328ca368436d438a.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<unload unload_date="2024-02-05 11:24:12">
+<unload unload_date="2024-02-14 13:27:27">
 <sys_script_include action="INSERT_OR_UPDATE">
 <access>public</access>
 <active>true</active>
@@ -41,42 +41,45 @@ CheckmarxOneAppListProcessor.prototype = Object.extendsObject(sn_vul.Application
                 var attributes = appNode.getAttributes();
                 var applicationId = '';
                 var appId;
-				var projectTags = '';	
-				
-               var childIter = appNode.getChildNodeIterator();
+                var projectTags = '';
+                var primaryBranch = '';
+                var infoObj = {};
+
+                var childIter = appNode.getChildNodeIterator();
+				var projectTagsFlag = 'false';
+				var primaryBranchFlag = 'false';
                 while (childIter.hasNext) {
                     var childNode = childIter.next();
                     if (childNode.getNodeName() == "projectTags") {
                         projectTags = childNode.getTextContent();
-                        break;
+						projectTagsFlag = 'true';
                     }
-                }
-               /* if (projectTags != null && projectTags != '') {
-                    var sourceAPMIDObj = {};
-                    var projectTagsArr = projectTags.split(',', -1);
-                    for (var item in projectTagsArr) {
-                        var projectTagArr = projectTagsArr[item].split(':', -1);
-                        sourceAPMIDObj[projectTagArr[0]] = projectTagArr[1];
+                    if (childNode.getNodeName() == "primaryBranch") {
+                        primaryBranch = childNode.getTextContent();
+						primaryBranchFlag = 'true';
                     }
-                    if (sourceAPMIDObj != null)
-                        appObj['apm_app_id'] = sourceAPMIDObj.toString();
-				
-				}	*/			
-                if (appNode.getAttribute('applicationIds') && appNode.getAttribute('applicationIds') != {}) {
-					appId ={};
-                    appId[gs.getMessage("Application Id: ")] = appNode.getAttribute('applicationIds').toString();
-                } else
-                    appId = '';
+					if(projectTagsFlag == 'true' && primaryBranchFlag == 'true')
+						break;
+                }
+                if (appNode.getAttribute('applicationIds') && appNode.getAttribute('applicationIds') != {}) 
+                    infoObj[gs.getMessage("Application Id ")] = appNode.getAttribute('applicationIds').toString();
+					
+                if (null != primaryBranch && '' != primaryBranch) 
+                    infoObj[gs.getMessage("Primary Branch ")] = primaryBranch.toString();
 				
+                if (infoObj == {})
+                    infoObj = "";				
+
                 //map attributes from Checkmarx into the servicenow expected format'
                 var appObj = {
                     source_app_id: attributes.id,
                     app_name: appNode.getLastChild().getTextContent().toString(),
-					apm_app_id: projectTags,
+                    apm_app_id: projectTags,
                     source_assigned_teams: attributes.groups,
                     description: 'created at' + attributes.createdAt,
-                    source_additional_info: JSON.stringify(appId),
-					
+                    source_additional_info: JSON.stringify(infoObj),
+					source_app_guid : primaryBranch.toString()
+
                 };
                 //Updating the project information in ServiceNow table
                 var result = this.AVR_API.createOrUpdateApp(appObj);
@@ -107,13 +110,13 @@ CheckmarxOneAppListProcessor.prototype = Object.extendsObject(sn_vul.Application
 <sys_created_by>admin</sys_created_by>
 <sys_created_on>2022-11-21 12:03:00</sys_created_on>
 <sys_id>716c87ad471f1110328ca368436d438a</sys_id>
-<sys_mod_count>62</sys_mod_count>
+<sys_mod_count>74</sys_mod_count>
 <sys_name>CheckmarxOneAppListProcessor</sys_name>
 <sys_package display_value="Checkmarx One Vulnerability Integration" source="x_chec3_chexone">3d20e92d47471110328ca368436d436a</sys_package>
 <sys_policy/>
 <sys_scope display_value="Checkmarx One Vulnerability Integration">3d20e92d47471110328ca368436d436a</sys_scope>
 <sys_update_name>sys_script_include_716c87ad471f1110328ca368436d438a</sys_update_name>
 <sys_updated_by>admin</sys_updated_by>
-<sys_updated_on>2023-12-21 15:21:18</sys_updated_on>
+<sys_updated_on>2024-02-08 06:23:20</sys_updated_on>
 </sys_script_include>
 </unload>