diff --git a/deepfence_agent/plugins/SecretScanner b/deepfence_agent/plugins/SecretScanner index 4a4250ebb5..819205c014 160000 --- a/deepfence_agent/plugins/SecretScanner +++ b/deepfence_agent/plugins/SecretScanner @@ -1 +1 @@ -Subproject commit 4a4250ebb57735b48f9082636cb4081ad4fda41a +Subproject commit 819205c0143cf99dfedc3f933c8bf7041e459854 diff --git a/deepfence_agent/plugins/YaraHunter b/deepfence_agent/plugins/YaraHunter index c856e00776..346816ab45 160000 --- a/deepfence_agent/plugins/YaraHunter +++ b/deepfence_agent/plugins/YaraHunter @@ -1 +1 @@ -Subproject commit c856e0077615b4032da2a5bcad550af69332e2bc +Subproject commit 346816ab455313065d76e62682df34a98b4ed247 diff --git a/deepfence_agent/plugins/cloud-scanner b/deepfence_agent/plugins/cloud-scanner index f02158820a..0c7a918b4f 160000 --- a/deepfence_agent/plugins/cloud-scanner +++ b/deepfence_agent/plugins/cloud-scanner @@ -1 +1 @@ -Subproject commit f02158820ade3ba3cd91af32dacbdeb925fa01a6 +Subproject commit 0c7a918b4fdc54e13f92246c31d38748eb4b4094 diff --git a/deepfence_agent/plugins/deepfence_shipper/output.go b/deepfence_agent/plugins/deepfence_shipper/output.go index 96d2fb3c58..e689bdc271 100644 --- a/deepfence_agent/plugins/deepfence_shipper/output.go +++ b/deepfence_agent/plugins/deepfence_shipper/output.go @@ -160,15 +160,17 @@ func NewPublisher(cfg PublisherConfig, maxRetries int, batchSize int) *Publisher return rhttp.DefaultRetryPolicy(ctx, resp, err) } + tr := http.DefaultTransport.(*http.Transport).Clone() + tr.Proxy = http.ProxyFromEnvironment + if cfg.URLSchema == "https" { - tr := http.DefaultTransport.(*http.Transport).Clone() tr.TLSClientConfig = &tls.Config{ RootCAs: x509.NewCertPool(), InsecureSkipVerify: true, } tr.DisableKeepAlives = false - rhc.HTTPClient.Transport = tr } + rhc.HTTPClient.Transport = tr hc = rhc.StandardClient() diff --git a/deepfence_agent/plugins/package-scanner b/deepfence_agent/plugins/package-scanner index a6b5cc95a0..d0c55ba6f6 160000 --- a/deepfence_agent/plugins/package-scanner +++ b/deepfence_agent/plugins/package-scanner @@ -1 +1 @@ -Subproject commit a6b5cc95a0a61d0dfc4c3a98a75b313f418e2818 +Subproject commit d0c55ba6f6ac4567a64277174a78a4dd3cc2b436 diff --git a/deepfence_agent/plugins/yara-rules b/deepfence_agent/plugins/yara-rules index 1184f0ec4e..14dab80d8f 160000 --- a/deepfence_agent/plugins/yara-rules +++ b/deepfence_agent/plugins/yara-rules @@ -1 +1 @@ -Subproject commit 1184f0ec4eb573a7c5b1b268561d151507c6609b +Subproject commit 14dab80d8f4b2032324bda267b3ec86f73dea15a diff --git a/deepfence_agent/tools/apache/deepfence/df-utils/utils.go b/deepfence_agent/tools/apache/deepfence/df-utils/utils.go index fdbefe19cd..388a35c84f 100644 --- a/deepfence_agent/tools/apache/deepfence/df-utils/utils.go +++ b/deepfence_agent/tools/apache/deepfence/df-utils/utils.go @@ -19,50 +19,11 @@ import ( "github.com/deepfence/ThreatMapper/deepfence_utils/log" ) -type PktDirection string -type PolicyAction string - -const ( - maxIdleConnsPerHost = 1024 - HostMountDir = "/fenced/mnt/host/" - CheckTypeHIPAA = "hipaa" - CheckTypePCI = "pci" - CheckTypeNIST = "nist" - CheckTypeGDPR = "gdpr" -) - -type ComplianceScan struct { - Code string `json:"code"` - Label string `json:"label"` -} - func RemoveLastCharacter(s string) string { r := []rune(s) return string(r[:len(r)-1]) } -func BuildHttpClientWithCert(certPath string) (*http.Client, error) { - // Set up our own certificate pool - tlsConfig := &tls.Config{RootCAs: x509.NewCertPool(), InsecureSkipVerify: true} - transport := &http.Transport{ - MaxIdleConnsPerHost: maxIdleConnsPerHost, - TLSHandshakeTimeout: 0 * time.Second, - TLSClientConfig: tlsConfig, - } - client := &http.Client{Transport: transport} - - // Load our trusted certificate path - pemData, err := os.ReadFile(certPath) - if err != nil { - return nil, err - } - ok := tlsConfig.RootCAs.AppendCertsFromPEM(pemData) - if !ok { - return nil, errors.New("unable to append certificates to PEM") - } - return client, nil -} - func GetKubernetesClusterId() string { var kubeSystemNamespaceUid string serviceHost := os.Getenv("KUBERNETES_SERVICE_HOST") diff --git a/deepfence_bootstrapper/router/upgrade.go b/deepfence_bootstrapper/router/upgrade.go index e236cc91a9..fb70c66c1f 100644 --- a/deepfence_bootstrapper/router/upgrade.go +++ b/deepfence_bootstrapper/router/upgrade.go @@ -110,6 +110,7 @@ func downloadFile(filepath string, url string) (err error) { tr := http.DefaultTransport.(*http.Transport).Clone() tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} + tr.Proxy = http.ProxyFromEnvironment client := &http.Client{ Timeout: 5 * time.Minute, diff --git a/deepfence_utils/threatintel/common.go b/deepfence_utils/threatintel/common.go index 372366b9bd..215b9ae170 100644 --- a/deepfence_utils/threatintel/common.go +++ b/deepfence_utils/threatintel/common.go @@ -155,6 +155,7 @@ func ExposeFile(ctx context.Context, fName string, consoleURL string, ttlCache * func downloadFile(ctx context.Context, url string) (*bytes.Buffer, error) { tr := http.DefaultTransport.(*http.Transport).Clone() + tr.Proxy = http.ProxyFromEnvironment tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} client := http.Client{Timeout: 600 * time.Second} diff --git a/deepfence_utils/utils/utils.go b/deepfence_utils/utils/utils.go index 15bf0ba1e0..8995e039f4 100644 --- a/deepfence_utils/utils/utils.go +++ b/deepfence_utils/utils/utils.go @@ -58,9 +58,12 @@ var ( func GetHTTPClient() *http.Client { once1.Do(func() { + tr := http.DefaultTransport.(*http.Transport).Clone() + tr.Proxy = http.ProxyFromEnvironment + secureClient = &http.Client{ Timeout: time.Second * 10, - Transport: http.DefaultTransport.(*http.Transport).Clone(), + Transport: tr, } }) @@ -77,6 +80,7 @@ func GetInsecureHTTPClient() *http.Client { tr := http.DefaultTransport.(*http.Transport).Clone() tr.TLSClientConfig = tlsConfig tr.WriteBufferSize = 10240 + tr.Proxy = http.ProxyFromEnvironment insecureClient = &http.Client{ Timeout: time.Second * 10, diff --git a/deepfence_worker/cronjobs/rules_fetcher.go b/deepfence_worker/cronjobs/rules_fetcher.go index 18414897c2..8349e720e6 100644 --- a/deepfence_worker/cronjobs/rules_fetcher.go +++ b/deepfence_worker/cronjobs/rules_fetcher.go @@ -50,6 +50,7 @@ func FetchThreatIntelListing(ctx context.Context, token string) (threatintel.Lis tr.TLSClientConfig = &tls.Config{ InsecureSkipVerify: true, } + tr.Proxy = http.ProxyFromEnvironment hc := http.Client{ Timeout: 10 * time.Second, Transport: tr, diff --git a/golang_deepfence_sdk b/golang_deepfence_sdk index b7fa6d0eaa..f42aabb5dc 160000 --- a/golang_deepfence_sdk +++ b/golang_deepfence_sdk @@ -1 +1 @@ -Subproject commit b7fa6d0eaae35d41df5f269a9eecc764911f63ab +Subproject commit f42aabb5dc7f51ba0f48565032944b49b033949d