From 2f1dc375067719f92755867d09998fcb73384ee7 Mon Sep 17 00:00:00 2001 From: Prathmesh Borle <65400885+cx-prathmesh-borle@users.noreply.github.com> Date: Tue, 8 Sep 2026 22:41:57 +0530 Subject: [PATCH 1/3] disable go-keyring Signed-off-by: Prathmesh Borle <65400885+cx-prathmesh-borle@users.noreply.github.com> --- internal/credentialstore/policy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/credentialstore/policy.go b/internal/credentialstore/policy.go index f00ad6be..76051185 100644 --- a/internal/credentialstore/policy.go +++ b/internal/credentialstore/policy.go @@ -23,7 +23,7 @@ const ( const KeyringModeEnvVar = "CX_KEYRING_MODE" const ( - policyValueAuto = "auto" + policyValueAuto = "disabled" policyValueRequired = "required" policyValueDisabled = "disabled" ) From f0b043736c05d0763dd22966971248f084d18c18 Mon Sep 17 00:00:00 2001 From: Prathmesh Borle <65400885+cx-prathmesh-borle@users.noreply.github.com> Date: Tue, 8 Sep 2026 23:54:45 +0530 Subject: [PATCH 2/3] disabled go-keyring for os other than windows and darwin Signed-off-by: Prathmesh Borle <65400885+cx-prathmesh-borle@users.noreply.github.com> --- cmd/main.go | 9 +++++++++ internal/credentialstore/policy.go | 2 +- internal/wrappers/configuration/configuration.go | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index aae6c2c2..3e6fec0b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -5,10 +5,12 @@ import ( "os" "os/exec" "os/signal" + "runtime" "strings" "syscall" "github.com/checkmarx/ast-cli/internal/commands" + "github.com/checkmarx/ast-cli/internal/credentialstore" "github.com/checkmarx/ast-cli/internal/kicsshutdown" "github.com/checkmarx/ast-cli/internal/logger" "github.com/checkmarx/ast-cli/internal/params" @@ -27,6 +29,7 @@ const ( func main() { var err error bindProxy() + disableKeyringMode() bindKeysToEnvAndDefault() err = configuration.LoadConfiguration() exitIfError(err) @@ -184,6 +187,12 @@ func bindProxy() { } } +func disableKeyringMode() { + if runtime.GOOS != "windows" && runtime.GOOS != "darwin" { + _ = os.Setenv(credentialstore.KeyringModeEnvVar, "disabled") + } +} + func exitListener() { signalChanel := make(chan os.Signal, 1) signal.Notify( diff --git a/internal/credentialstore/policy.go b/internal/credentialstore/policy.go index 76051185..f00ad6be 100644 --- a/internal/credentialstore/policy.go +++ b/internal/credentialstore/policy.go @@ -23,7 +23,7 @@ const ( const KeyringModeEnvVar = "CX_KEYRING_MODE" const ( - policyValueAuto = "disabled" + policyValueAuto = "auto" policyValueRequired = "required" policyValueDisabled = "disabled" ) diff --git a/internal/wrappers/configuration/configuration.go b/internal/wrappers/configuration/configuration.go index 28f902e0..cd0727dc 100644 --- a/internal/wrappers/configuration/configuration.go +++ b/internal/wrappers/configuration/configuration.go @@ -70,8 +70,8 @@ func PromptConfiguration() { accessAPIKey = strings.Replace(accessAPIKey, "\n", "", -1) accessAPIKey = strings.Replace(accessAPIKey, "\r", "", -1) if len(accessAPIKey) > 0 { - storeProperty(params.AstAPIKey, accessAPIKey) setConfigPropertyQuiet(params.AccessKeyIDConfigKey, "") + storeProperty(params.AstAPIKey, accessAPIKey) storeProperty(params.AccessKeySecretConfigKey, "") } } else { From 05a0be0989f8e4410e0e820d38ff599e8a53333b Mon Sep 17 00:00:00 2001 From: Prathmesh Borle <65400885+cx-prathmesh-borle@users.noreply.github.com> Date: Thu, 10 Sep 2026 15:43:48 +0530 Subject: [PATCH 3/3] Update containerd dependency to v1.7.35 in go.mod and go.sum --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index da1e38c8..b53b1645 100644 --- a/go.mod +++ b/go.mod @@ -121,7 +121,7 @@ require ( github.com/charmbracelet/x/term v0.2.2 // indirect github.com/cloudflare/circl v1.6.3 // indirect github.com/containerd/cgroups/v3 v3.1.3 // indirect - github.com/containerd/containerd v1.7.33 // indirect + github.com/containerd/containerd v1.7.35 // indirect github.com/containerd/containerd/api v1.10.0 // indirect github.com/containerd/continuity v0.5.0 // indirect github.com/containerd/errdefs v1.0.0 // indirect diff --git a/go.sum b/go.sum index 412578e4..9d8de4a0 100644 --- a/go.sum +++ b/go.sum @@ -255,8 +255,8 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/containerd/cgroups/v3 v3.1.3 h1:eUNflyMddm18+yrDmZPn3jI7C5hJ9ahABE5q6dyLYXQ= github.com/containerd/cgroups/v3 v3.1.3/go.mod h1:PKZ2AcWmSBsY/tJUVhtS/rluX0b1uq1GmPO1ElCmbOw= -github.com/containerd/containerd v1.7.33 h1:iAkYGC/ifR/V+0eR4iXWHNGYUF0DF2PmGV5iz4Irj5M= -github.com/containerd/containerd v1.7.33/go.mod h1:gSbSCVjPCdkfJCjyrzz7aRC+xFlqVbatNpfHfVCYGUM= +github.com/containerd/containerd v1.7.35 h1:7AU2T1qI2OdNBmKkreWZ7kASHUNFItN5Hgejd9sY938= +github.com/containerd/containerd v1.7.35/go.mod h1:ozI//0TomTCLPhQREnx0IXDIQMg+Fk7yTtg9fNvU8EQ= github.com/containerd/containerd/api v1.10.0 h1:5n0oHYVBwN4VhoX9fFykCV9dF1/BvAXeg2F8W6UYq1o= github.com/containerd/containerd/api v1.10.0/go.mod h1:NBm1OAk8ZL+LG8R0ceObGxT5hbUYj7CzTmR3xh0DlMM= github.com/containerd/continuity v0.5.0 h1:7a85HZpCSs+1Zps0Ee3DPSuAWY+0SJM1JNM51nlEVDg=