Merge pull request #55 from checkmarx-ltd/2025_Q4_Integration_Branch

Visual Studio 2025 Q4 PR

Author: cx-rakesh-kadu

CxActionShared/Entities/LoginData.cs

@@ -19,6 +19,13 @@ public class LoginData : IEntity
         /// </summary>
         public const int DEFAULT_LANGUAGE_CODE = 1033;
 
+        /// <summary>
+        /// Proxy type constants
+        /// </summary>
+        public const string PROXY_TYPE_NONE = "None";
+        public const string PROXY_TYPE_HTTP = "http";
+        public const string PROXY_TYPE_PAC = "pac";
+
         #endregion
 
         #region [Private Constants]
@@ -39,6 +46,11 @@ public class LoginData : IEntity
         private bool _ssl = false;
         private string _authenticationType = "access_control";
 
+        private string _proxyType = PROXY_TYPE_NONE;
+        private string _proxyLocation = null;
+        private string _noProxyList = null;
+ 
+
         private EntityId _id;
         private bool _isLogging;
         string unboundRunID;
@@ -49,8 +61,8 @@ public class LoginData : IEntity
         private SimpleDecision _isRunScanInBackground;
         private SimpleDecision _isOpenPerspective;
 
-        private string[] _excludeFileExt = "bak,tmp,aac,aif,iff,m3u,mid,mp3,mpa,ra,wav,wma,3g2,3gp,asf,asx,avi,flv,mov,mp4,mpg,rm,swf,vob,wmv,bmp,gif,jpg,png,psd,tif,swf,jar,zip,rar,exe,dll,pdb,7z,gz,tar.gz,tar,gz,ahtm,ahtml,fhtml,hdm,hdml,hsql,ht,hta,htc,htd,htmls,ihtml,mht,mhtm,mhtml,ssi,stm,stml,ttml,txn,xhtm,xhtml".Split(',');
-        private string[] _excludeFolder = "bin,obj,.svn,_svn,backup".Split(',');
+        private string[] _excludeFileExt = "bak,tmp,aac,aif,iff,m3u,mid,mp3,mpa,ra,wav,wma,3g2,3gp,asf,asx,avi,flv,mov,mp4,mpg,rm,swf,vob,wmv,bmp,gif,jpg,png,psd,tif,swf,jar,zip,rar,exe,dll,pdb,7z,gz,tar.gz,tar,gz,ahtm,ahtml,fhtml,hdm,hdml,hsql,ht,hta,htc,htd,htmls,ihtml,mht,mhtm,mhtml,ssi,stm,stml,ttml,txn,xhtm,xhtml,log,CxVsPlugin.conf".Split(',');
+        private string[] _excludeFolder = "bin,obj,.svn,_svn,backup,GpuCache,DawnCache,.vs".Split(',');
 
         private int _reconnectInterval = 15;
         private int _reconnectCount = 3;
@@ -183,6 +195,35 @@ public string AuthenticationType
             set { _authenticationType = value; }
         }
 
+        /// <summary>
+        /// Gets or sets value indicating the type of the proxy server none, http or pac
+        /// </summary>
+        public string ProxyType
+        {
+            get { return _proxyType; }
+            set { _proxyType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets value indicating the url of the http or pac proxy.
+        /// </summary>
+        public string ProxyLocation
+        {
+            get { return _proxyLocation; }
+            set { _proxyLocation = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets value indicating the hosts that should be excluded from the proxy
+        /// </summary>
+        public string NoProxyList
+        {
+            get { return _noProxyList; }
+            set { _noProxyList = value; }
+        }
+
+
+
 
         /// <summary>
         /// Get or set Entity prorepty
@@ -387,5 +428,6 @@ public bool IsPublic
             public List<ScanReportInfo> ScanReports { get { return scanReports; } set { scanReports = value; } }
         }
 
+    
     }
 }

CxActionShared/Helpers/LoginHelper.cs

@@ -180,6 +180,7 @@ internal static LoginData Load(int tryNum)
             {
                 Logger.Create().Error(ex);
             }
+            _oidcLoginHelper.PluginConfiguration = login;
 
             return login;
         }

CxActionShared/Helpers/OIDCLoginHelper.cs

@@ -15,10 +15,11 @@ public class OIDCLoginHelper
         public static bool errorWasShown = false;
 
         private OidcLoginResult _latestResult;
+        private LoginData _pluginConfiguration = null;
 
         public OIDCLoginHelper()
         {
-
+            _pluginConfiguration = null;
         }
 
         public void resetLatestResult()
@@ -55,7 +56,7 @@ private void ConectAndWait(string baseServerUri, string AuthenticationType)
                 var browserForm = new BrowserForm();
                 BrowserForm.NavigationCompleted += OidcLoginCtrlOnNavigationCompleted;
                 BrowserForm.NavigationError += OidcLoginCtrlOnNavigationError;
-                BrowserForm.IsbrowserIntialized();
+                BrowserForm.IsbrowserIntialized(_pluginConfiguration);
                 browserForm.Show();
                 string txturl = "about:blank";
                 browserForm.Invoke(new MethodInvoker(() =>
@@ -99,5 +100,14 @@ public void CloseLoginWindow()
                 _oidcLoginFrm.CloseForm();
             }
         }
+
+        /// <summary>
+        /// plugin's configuration
+        /// </summary>
+        public LoginData PluginConfiguration
+        {
+            get { return _pluginConfiguration; }
+            set { _pluginConfiguration = value; }
+        }
     }
 }

CxActionShared/Views/BrowserForm.cs

@@ -37,11 +37,41 @@ public BrowserForm()
         ChromiumWebBrowser browser;
         static bool IsIntialized = false;
         public static void IsbrowserIntialized()
+        {
+            CefSettings settings = new CefSettings();
+            initializeCefBrowserWithSettings(settings);
+        }
+
+        public static void IsbrowserIntialized(LoginData pluginConfiguration)
+        {
+            CefSettings settings = new CefSettings();
+
+            if (!string.IsNullOrEmpty(pluginConfiguration.ProxyType) &&
+                    pluginConfiguration.ProxyType != LoginData.PROXY_TYPE_NONE)
+            {
+                if (pluginConfiguration.ProxyType == LoginData.PROXY_TYPE_HTTP)
+                {
+                    settings.CefCommandLineArgs.Add("proxy-server", pluginConfiguration.ProxyLocation);
+
+                    if (!string.IsNullOrEmpty(pluginConfiguration.NoProxyList))
+                    {
+                        settings.CefCommandLineArgs.Add("proxy-bypass-list", pluginConfiguration.NoProxyList);
+                    }
+                }
+                else if (pluginConfiguration.ProxyType == LoginData.PROXY_TYPE_PAC)
+                {
+                    settings.CefCommandLineArgs.Add("proxy-pac-url", pluginConfiguration.ProxyLocation);
+                }
+            }
+
+            initializeCefBrowserWithSettings(settings);            
+        }
+
+        private static void initializeCefBrowserWithSettings(CefSettings settings)
         {
             if (IsIntialized == false)
             {
-                CefSharpSettings.ShutdownOnExit = false;
-                CefSettings settings = new CefSettings();
+                CefSharpSettings.ShutdownOnExit = false;              
                 Cef.Initialize(settings);
                 IsIntialized = true;
             }

CxViewer2022/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ade162dc-e470-4fc9-9868-2a878fb23422" Version="9.00.31" Language="en-US" Publisher="Checkmarx" />
+        <Identity Id="ade162dc-e470-4fc9-9868-2a878fb23422" Version="9.00.35" Language="en-US" Publisher="Checkmarx" />
         <DisplayName>CxViewer</DisplayName>
         <Description xml:space="preserve">Checkmarx Visual Studio Plugin</Description>
         <MoreInfo>https://checkmarx.atlassian.net/wiki/spaces/SD/pages/1339392185/Visual+Studio+Plugin</MoreInfo>

CxViewerVSIX/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="37506746-5265-481e-ac06-32f67910eedd" Publisher="Checkmarx" Version="9.00.31" Language="en-US" />
+        <Identity Id="37506746-5265-481e-ac06-32f67910eedd" Publisher="Checkmarx" Version="9.00.35" Language="en-US" />
         <DisplayName>CxViewer</DisplayName>
         <Description xml:space="preserve" >Checkmarx Visual Studio Plugin</Description>
         <MoreInfo>https://checkmarx.atlassian.net/wiki/spaces/SD/pages/1339392185/Visual+Studio+Plugin</MoreInfo>
@@ -21,3 +21,4 @@
         <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,17.0)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
 </PackageManifest>
+

Jenkinsfile

@@ -1,31 +1,64 @@
 #!/groovy
 @Library('cx-jenkins-pipeline-kit')
+import groovy.xml.DOMBuilder
+import groovy.xml.XmlUtil
+import javax.xml.parsers.DocumentBuilderFactory
+import org.w3c.dom.Document
 
 def ipAddress
 def vmName = "Plugin-VisualStudio-" + UUID.randomUUID().toString()
-def msbuildLocationVS2019 = "\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin\\MSBuild.exe\""
+def msbuildLocationVS2019 = "\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\MSBuild\\Current\\Bin\\MSBuild.exe\""
 def msbuildLocationVS2022 = "\"C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\MSBuild\\Current\\Bin\\MSBuild.exe\""
+def versionOfVS2022
+def versionOfVS2019
+def decommissionPeriod =  "3 hour"
 
 pipeline {
     parameters {
-        string(name: "decommissionPeriod", defaultValue: "3 hour", description: "Decommission period")
 		choice(name: "templateName", choices: ["VisualStudio2019-Template","VisualStudio2022-Template"], description: "Template name, if not specified then \"VisualStudio2019-Template\" template will be chosen")
         booleanParam(name: 'doNotDeleteVM', defaultValue: false, description: 'If selected, VM will not be deleted after process finished')
 		gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'branch', type: 'PT_BRANCH'
     }
     agent { node { label 'install01' } }
     stages {
+		stage('Checkout') {
+            steps {
+                checkout([$class: 'GitSCM',
+                          branches: [[name: "${branch}"]],
+                          userRemoteConfigs: [[url: 'https://github.com/checkmarx-ltd/VisualStudio.git']]])
+            }
+        }
+	stage('Extract Version') {
+            steps {
+                script {
+			if(templateName == "VisualStudio2019-Template")
+			{
+				def vs2019ManifestPath = 'CxViewerVSIX/source.extension.vsixmanifest'
+				// Extract versions using a helper function
+	                    	versionOfVS2019 = extractVersionUsingDOMBuilder(vs2019ManifestPath)
+				echo "VS2019 version: ${versionOfVS2019}"
+			}
+			else 
+			{
+				def vs2022ManifestPath = 'CxViewer2022/source.extension.vsixmanifest'
+				// Extract versions using a helper function
+	                    	versionOfVS2022 = extractVersionUsingDOMBuilder(vs2022ManifestPath)
+				 echo "VS2022 version: ${versionOfVS2022}"
+			}
+                }
+            }
+        }
         stage('Create VM') {
             steps {
                 script {
                     kit.Create_Vm_Terraform(vmName, templateName, "18000", "8", "VMWARE", decommissionPeriod, "Auto", "Plugins-Developers")
                     ipAddress = kit.getIpAddress(vmName, "VMWARE")
-                    kit.Create_Jenkins_Slave_On_Master(vmName)
-                    kit.Start_Jenkins_Slave_On_Windows_Pstools(ipAddress, vmName)
+                    kit.Create_Jenkins_Slave_On_Master_cx_operation(vmName)
+                    kit.Start_Jenkins_Slave_On_Windows_Pstools_cx_operation(ipAddress, vmName)
                 }
             }
         }
-
+	
         stage('Build and Pack') {
             agent { node { label vmName } }
             steps {
@@ -41,19 +74,17 @@ pipeline {
             }
         }
 
-		stage('Upload To Artifactory') {
+	stage('Upload To Artifactory') {
             agent { node { label vmName } }
             steps {
                 script {
 		    	if(templateName == "VisualStudio2019-Template")
 			{
-				fileOperations([folderRenameOperation(source: "${WORKSPACE}\\Artifacts\\CxViewerVSIX-2019.vsix", destination: "${WORKSPACE}\\Artifacts\\CxViewerVSIX-9.00.19.vsix")])
-				kit.Upload_To_Artifactory("${WORKSPACE}\\Artifacts\\CxViewerVSIX-9.00.19.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
+				kit.Upload_To_Artifactory("${WORKSPACE}\\Artifacts\\CxViewerVSIX-2019.vsix", "plugins-release-local/com/checkmarx/visual-studio/${versionOfVS2019}/")
 			}
 			else 
 			{
-				fileOperations([folderRenameOperation(source: "${WORKSPACE}\\Artifacts\\CxViewerVSIX-2022.vsix", destination: "${WORKSPACE}\\Artifacts\\CxViewerVSIX-9.00.19.vsix")])
-				kit.Upload_To_Artifactory("${WORKSPACE}\\Artifacts\\CxViewerVSIX-9.00.19.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
+				kit.Upload_To_Artifactory("${WORKSPACE}\\Artifacts\\CxViewerVSIX-2022.vsix", "plugins-release-local/com/checkmarx/visual-studio/${versionOfVS2022}/")
 			}
                 }
             }
@@ -83,3 +114,28 @@ pipeline {
         }
     }
 }
+def extractVersionUsingDOMBuilder(manifestPath) {
+    def manifestContent = readFile(manifestPath)
+    manifestContent = manifestContent.replaceFirst(/^\xEF\xBB\xBF/, '').trim()
+
+    def version = ''
+    try {
+        // Create DocumentBuilderFactory and parse the XML content
+        def factory = DocumentBuilderFactory.newInstance()
+        def builder = factory.newDocumentBuilder()
+        def inputStream = new ByteArrayInputStream(manifestContent.getBytes("UTF-8"))
+        
+        // Parse the input stream into a Document
+        Document document = builder.parse(inputStream)
+
+        // Use DOM to extract the Version attribute
+        def node = document.getElementsByTagName("Identity").item(0)
+        version = node?.getAttribute("Version")
+        if (!version) {
+            error "Version attribute not found in ${manifestPath}"
+        }
+        return version
+    } catch (Exception e) {
+        error "Failed to parse XML using DOMBuilder for ${manifestPath}: ${e.message}"
+    }
+}