Merge pull request #75 from newrelic/ci_cd

CI-CD integration
newrelic · Dec 11, 2024 · 9765399 · 9765399
2 parents 6d4d2d9 + 6ff8bae
commit 9765399
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 0 deletions.
diff --git a/security_config/global_config.go b/security_config/global_config.go
@@ -231,6 +231,17 @@ func (info *Info_struct) SetscanControllersIastLoadInterval(iastLoadInterval int
 	info.security.ScanControllers.IastScanRequestRateLimit = iastLoadInterval
 }
 
+func (info *Info_struct) ScanInstanceCount() int {
+	return info.security.ScanControllers.ScanInstanceCount
+}
+func (info *Info_struct) SetScanInstanceCount(scanInstanceCount int) {
+	info.security.ScanControllers.ScanInstanceCount = scanInstanceCount
+}
+
+func (info *Info_struct) GetIastTestIdentifier() string {
+	return info.security.IastTestIdentifier
+}
+
 func (info *Info_struct) GetApiData() []any {
 	urlmappings := []any{}
 

diff --git a/security_config/secure_config.go b/security_config/secure_config.go
@@ -7,6 +7,7 @@ type Security struct {
 	Enabled               bool   `json:"enabled"`
 	Mode                  string `json:"mode"`
 	Validator_service_url string `json:"validator_service_url"`
+	IastTestIdentifier    string `json:"iast_test_identifier" yaml:"iast_test_identifier"`
 	Agent                 struct {
 		Enabled bool `json:"enabled"`
 	} `json:"agent"`
@@ -53,6 +54,7 @@ type Security struct {
 	} `yaml:"scan_schedule"`
 	ScanControllers struct {
 		IastScanRequestRateLimit int `yaml:"iast_scan_request_rate_limit"`
+		ScanInstanceCount        int `yaml:"scan_instance_count"`
 	} `yaml:"scan_controllers"`
 }
 

diff --git a/security_event_generation/event_generation.go b/security_event_generation/event_generation.go
@@ -143,6 +143,7 @@ func SendSecHealthCheck() {
 	hc.WebSocketConnectionStats = secConfig.GlobalInfo.WebSocketConnectionStats
 	hc.IastReplayRequest = secConfig.GlobalInfo.IastReplayRequest
 	hc.EventStats = secConfig.GlobalInfo.EventStats
+	hc.IastTestIdentifier = secConfig.GlobalInfo.GetIastTestIdentifier()
 
 	hc.ProcStartTime = secConfig.GlobalInfo.ApplicationInfo.GetStarttimestr().Unix() * 1000
 	hc.TrafficStartedTime = secConfig.GlobalInfo.ApplicationInfo.GetTrafficStartedTime()

diff --git a/security_event_generation/event_generation_utils.go b/security_event_generation/event_generation_utils.go
@@ -121,6 +121,7 @@ type healthcheck struct {
 	ProcStartTime            int64                              `json:"procStartTime"`
 	TrafficStartedTime       int64                              `json:"trafficStartedTime"`
 	ScanStartTime            int64                              `json:"scanStartTime"`
+	IastTestIdentifier       string                             `json:"iastTestIdentifer"`
 }
 
 type ThreadPoolStats struct {

diff --git a/security_handlers/web_socket.go b/security_handlers/web_socket.go
@@ -380,6 +380,13 @@ func getConnectionHeader() http.Header {
 		"NR-CSEC-PROCESS-START-TIME":      []string{secUtils.Int64ToString(secConfig.GlobalInfo.ApplicationInfo.GetStarttimestr().Unix() * 1000)},
 	}
 
+	if env := secConfig.GlobalInfo.GetIastTestIdentifier(); env != "" {
+		connectionHeader.Add("NR-CSEC-IAST-TEST-IDENTIFIER", env)
+		connectionHeader.Add("NR-CSEC-IAST-SCAN-INSTANCE-COUNT", secUtils.IntToString(1))
+	} else {
+		connectionHeader.Add("NR-CSEC-IAST-SCAN-INSTANCE-COUNT", secUtils.IntToString(secConfig.GlobalInfo.ScanInstanceCount()))
+	}
+
 	printConnectionHeader(connectionHeader)
 	return connectionHeader
 }