add new flag to ignore proxy (#572)

* add new flag to ignore proxy * add new flag to ignore proxy * remove chat from integration tests * Update chat.go * change ignore proxy validation
Checkmarx · Sep 7, 2023 · 6f52362 · 6f52362
1 parent 66b8fda
commit 6f52362
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/internal/commands/root.go b/internal/commands/root.go
@@ -77,6 +77,7 @@ func NewAstCLI(
 	rootCmd.PersistentFlags().String(params.AccessKeySecretFlag, "", params.AccessKeySecretFlagUsage)
 	rootCmd.PersistentFlags().Bool(params.InsecureFlag, false, params.InsecureFlagUsage)
 	rootCmd.PersistentFlags().String(params.ProxyFlag, "", params.ProxyFlagUsage)
+	rootCmd.PersistentFlags().Bool(params.IgnoreProxyFlag, false, params.IgnoreProxyFlagUsage)
 	rootCmd.PersistentFlags().String(params.ProxyTypeFlag, "", params.ProxyTypeFlagUsage)
 	rootCmd.PersistentFlags().String(params.NtlmProxyDomainFlag, "", params.NtlmProxyDomainFlagUsage)
 	rootCmd.PersistentFlags().String(params.TimeoutFlag, "", params.TimeoutFlagUsage)
@@ -124,6 +125,7 @@ func NewAstCLI(
 	_ = viper.BindPFlag(params.BaseAuthURIKey, rootCmd.PersistentFlags().Lookup(params.BaseAuthURIFlag))
 	_ = viper.BindPFlag(params.AstAPIKey, rootCmd.PersistentFlags().Lookup(params.AstAPIKeyFlag))
 	_ = viper.BindPFlag(params.AgentNameKey, rootCmd.PersistentFlags().Lookup(params.AgentFlag))
+	_ = viper.BindPFlag(params.IgnoreProxyKey, rootCmd.PersistentFlags().Lookup(params.IgnoreProxyFlag))
 	// Key here is the actual flag since it doesn't use an environment variable
 	_ = viper.BindPFlag(params.DebugFlag, rootCmd.PersistentFlags().Lookup(params.DebugFlag))
 	_ = viper.BindPFlag(params.InsecureFlag, rootCmd.PersistentFlags().Lookup(params.InsecureFlag))

diff --git a/internal/params/binds.go b/internal/params/binds.go
@@ -10,6 +10,7 @@ var EnvVarsBinds = []struct {
 	{ProxyDomainKey, ProxyDomainEnv, ""},
 	{BaseAuthURIKey, BaseAuthURIEnv, ""},
 	{AstAPIKey, AstAPIKeyEnv, ""},
+	{IgnoreProxyKey, IgnoreProxyEnv, ""},
 	{AgentNameKey, AgentNameEnv, "ASTCLI"},
 	{CodeBashingPathKey, ScansPathEnv, "api/codebashing/lessons"},
 	{ScansPathKey, ScansPathEnv, "api/scans"},

diff --git a/internal/params/envs.go b/internal/params/envs.go
@@ -56,4 +56,5 @@ const (
 	FeatureFlagsEnv                     = "CX_FEATURE_FLAGS_PATH"
 	UploadURLEnv                        = "CX_UPLOAD_URL"
 	PolicyEvaluationPathEnv             = "CX_POLICY_EVALUATION_PATH"
+	IgnoreProxyEnv                      = "CX_IGNORE_PROXY"
 )
diff --git a/internal/params/flags.go b/internal/params/flags.go
@@ -48,6 +48,8 @@ const (
 	BaseURIFlag                   = "base-uri"
 	ProxyFlag                     = "proxy"
 	ProxyFlagUsage                = "Proxy server to send communication through"
+	IgnoreProxyFlag               = "ignore-proxy"
+	IgnoreProxyFlagUsage          = "Ignore proxy configuration"
 	ProxyTypeFlag                 = "proxy-auth-type"
 	ProxyTypeFlagUsage            = "Proxy authentication type, (basic or ntlm)"
 	TimeoutFlag                   = "timeout"

diff --git a/internal/params/keys.go b/internal/params/keys.go
@@ -15,6 +15,7 @@ var (
 	ScansPathKey                        = strings.ToLower(ScansPathEnv)
 	GroupsPathKey                       = strings.ToLower(GroupsPathEnv)
 	AgentNameKey                        = strings.ToLower(AgentNameEnv)
+	IgnoreProxyKey                      = strings.ToLower(IgnoreProxyEnv)
 	CodeBashingPathKey                  = strings.ToLower(CodeBashingPathEnv)
 	ProjectsPathKey                     = strings.ToLower(ProjectsPathEnv)
 	ResultsPathKey                      = strings.ToLower(ResultsPathEnv)

diff --git a/internal/wrappers/client.go b/internal/wrappers/client.go
@@ -70,9 +70,12 @@ func setAgentName(req *http.Request) {
 func GetClient(timeout uint) *http.Client {
 	proxyTypeStr := viper.GetString(commonParams.ProxyTypeKey)
 	proxyStr := viper.GetString(commonParams.ProxyKey)
+	ignoreProxy := viper.GetBool(commonParams.IgnoreProxyKey)
 
 	var client *http.Client
-	if proxyTypeStr == ntlmProxyToken {
+	if ignoreProxy {
+		client = basicProxyClient(timeout, "")
+	} else if proxyTypeStr == ntlmProxyToken {
 		client = ntmlProxyClient(timeout, proxyStr)
 	} else {
 		client = basicProxyClient(timeout, proxyStr)