Merge pull request #836 from k2io/dev

Post security configuration on UI
newrelic · Dec 14, 2023 · 02cae21 · 02cae21
2 parents 7d91b51 + 4c3f82f
commit 02cae21
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/v3/integrations/nrsecurityagent/go.mod b/v3/integrations/nrsecurityagent/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/newrelic/csec-go-agent v0.5.1
-	github.com/newrelic/go-agent/v3 v3.28.1
+	github.com/newrelic/go-agent/v3 v3.29.0
 	github.com/newrelic/go-agent/v3/integrations/nrsqlite3 v1.2.0
 	gopkg.in/yaml.v2 v2.4.0
 )

diff --git a/v3/integrations/nrsecurityagent/nrsecurityagent.go b/v3/integrations/nrsecurityagent/nrsecurityagent.go
@@ -65,6 +65,7 @@ func InitSecurityAgent(app *newrelic.Application, opts ...ConfigOption) error {
 	if !isValid {
 		return fmt.Errorf("Newrelic application value cannot be read; did you call newrelic.NewApplication?")
 	}
+	app.UpdateSecurityConfig(c.Security)
 	if !appConfig.HighSecurity && isSecurityAgentEnabled() {
 		secureAgent := securityAgent.InitSecurityAgent(c.Security, appConfig.AppName, appConfig.License, appConfig.Logger.DebugEnabled())
 		app.RegisterSecurityAgent(secureAgent)

diff --git a/v3/newrelic/config.go b/v3/newrelic/config.go
@@ -448,6 +448,8 @@ type Config struct {
 		// This list of ignored prefixes itself is not reported outside the agent.
 		IgnoredPrefixes []string
 	}
+	// Security is used to post security configuration on UI.
+	Security interface{} `json:"Security,omitempty"`
 }
 
 // CodeLevelMetricsScope is a bit-encoded value. Each such value describes

diff --git a/v3/newrelic/secure_agent.go b/v3/newrelic/secure_agent.go
@@ -46,6 +46,13 @@ func (app *Application) RegisterSecurityAgent(s securityAgent) {
 	}
 }
 
+func (app *Application) UpdateSecurityConfig(s interface{}) {
+	if app == nil || app.app == nil {
+		return
+	}
+	app.app.config.Config.Security = s
+}
+
 func getLinkedMetaData(app *app) map[string]string {
 	runningAppData := make(map[string]string)
 	if app != nil && app.run != nil {