Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release-2.26.1 back into main #347

Merged
merged 2 commits into from
Jun 15, 2023
Merged

Merge release-2.26.1 back into main #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
741bb48
Fix segmentation fault during agent registration (#338)
achawla2012 Jun 13, 2023
71f7a30
Update selinux policy since the dymanic config is now in the /var/lib…
dhurley Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified scripts/selinux/nginx_agent.pp
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions scripts/selinux/nginx_agent.te
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,3 +408,14 @@ require {

#============= nginx_agent_t ==============
files_rw_etc_files(nginx_agent_t)


require {
type nginx_agent_t;
type dosfs_t;
}

#============= nginx_agent_t ==============
files_read_var_lib_files(nginx_agent_t)
allow nginx_agent_t var_lib_t:file write;
allow nginx_agent_t dosfs_t:filesystem getattr;
42 changes: 25 additions & 17 deletions src/plugins/commander.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,27 +163,19 @@ func (c *Commander) agentRegistered(cmd *proto.Command) {
}
}

for index, feature := range agtCfg.Details.Features {
agtCfg.Details.Features[index] = strings.Replace(feature, "features_", "", 1)
}
if agtCfg.Details != nil && agtCfg.Details.Features != nil {
for index, feature := range agtCfg.Details.Features {
agtCfg.Details.Features[index] = strings.Replace(feature, "features_", "", 1)
}

sort.Strings(agtCfg.Details.Features)
sort.Strings(c.config.Features)
sort.Strings(agtCfg.Details.Features)

synchronizedFeatures := reflect.DeepEqual(agtCfg.Details.Features, c.config.Features)
sort.Strings(c.config.Features)

if !synchronizedFeatures {
for _, feature := range c.config.Features {
if feature != agent_config.FeatureRegistration {
c.deRegisterPlugin(feature)
}
synchronizedFeatures := reflect.DeepEqual(agtCfg.Details.Features, c.config.Features)

}
}

if agtCfg.Details != nil && agtCfg.Details.Features != nil && !synchronizedFeatures {
for _, feature := range agtCfg.Details.Features {
c.pipeline.Process(core.NewMessage(core.EnableFeature, feature))
if !synchronizedFeatures {
c.synchronizeFeatures(agtCfg)
}
}
}
Expand All @@ -193,6 +185,22 @@ func (c *Commander) agentRegistered(cmd *proto.Command) {
}
}

func (c *Commander) synchronizeFeatures(agtCfg *proto.AgentConfig) {
if c.config != nil {
for _, feature := range c.config.Features {
if feature != agent_config.FeatureRegistration {
c.deRegisterPlugin(feature)
}
}
}

if agtCfg.Details != nil {
for _, feature := range agtCfg.Details.Features {
c.pipeline.Process(core.NewMessage(core.EnableFeature, feature))
}
}
}

func (c *Commander) deRegisterPlugin(data string) {
if data == agent_config.FeatureFileWatcher {

Expand Down
189 changes: 181 additions & 8 deletions src/plugins/commander_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,26 @@ func TestCommander_Process(t *testing.T) {
config: nil,
msgTopics: []string{},
},
{
name: "test agent config during registration",
cmd: &proto.Command{
Meta: &proto.Metadata{},
Type: proto.Command_NORMAL,
Data: &proto.Command_NginxConfigResponse{
NginxConfigResponse: &proto.NginxConfigResponse{
Status: newOKStatus("config applied successfully").CmdStatus,
Action: proto.NginxConfigAction_APPLY,
ConfigData: &proto.ConfigDescriptor{
NginxId: "12345",
},
},
},
},
topic: core.CommNginxConfig,
nginxId: "12345",
systemId: "67890",
msgTopics: []string{},
},
{
name: "test agent register",
cmd: &proto.Command{
Expand All @@ -129,25 +149,178 @@ func TestCommander_Process(t *testing.T) {
msgTopics: []string{},
},
{
name: "test agent config apply",
name: "test agent register with no details and config",
cmd: &proto.Command{
Meta: &proto.Metadata{},
Type: proto.Command_NORMAL,
Data: &proto.Command_NginxConfigResponse{
NginxConfigResponse: &proto.NginxConfigResponse{
Status: newOKStatus("config applied successfully").CmdStatus,
Action: proto.NginxConfigAction_APPLY,
ConfigData: &proto.ConfigDescriptor{
NginxId: "12345",
Data: &proto.Command_AgentConnectResponse{
AgentConnectResponse: &proto.AgentConnectResponse{
AgentConfig: &proto.AgentConfig{},
},
},
},
topic: core.AgentConnected,
nginxId: "12345",
systemId: "67890",
msgTopics: []string{},
},
{
name: "test agent register with only configs",
cmd: &proto.Command{
Meta: &proto.Metadata{},
Type: proto.Command_NORMAL,
Data: &proto.Command_AgentConnectResponse{
AgentConnectResponse: &proto.AgentConnectResponse{
AgentConfig: &proto.AgentConfig{
Configs: &proto.ConfigReport{
Configs: []*proto.ConfigDescriptor{
{
Checksum: "",
NginxId: "12345",
SystemId: "6789",
},
},
},
},
},
},
},
topic: core.CommNginxConfig,
topic: core.AgentConnected,
nginxId: "12345",
systemId: "67890",
msgTopics: []string{core.NginxConfigUpload},
},
{
name: "test agent register with only agent details",
cmd: &proto.Command{
Meta: &proto.Metadata{},
Type: proto.Command_NORMAL,
Data: &proto.Command_AgentConnectResponse{
AgentConnectResponse: &proto.AgentConnectResponse{
AgentConfig: &proto.AgentConfig{
Details: &proto.AgentDetails{
Tags: []string{"new-tag1:one"},
Features: []string{"nginx-config-async"},
},
},
},
},
},
topic: core.AgentConnected,
nginxId: "12345",
systemId: "67890",
msgTopics: []string{},
},
{
name: "test agent register with empty features in agent details",
cmd: &proto.Command{
Meta: &proto.Metadata{},
Type: proto.Command_NORMAL,
Data: &proto.Command_AgentConnectResponse{
AgentConnectResponse: &proto.AgentConnectResponse{
AgentConfig: &proto.AgentConfig{
Details: &proto.AgentDetails{
Tags: []string{"new-tag1:one"},
Features: []string{},
},
},
},
},
},
topic: core.AgentConnected,
nginxId: "12345",
systemId: "67890",
msgTopics: []string{},
},
{
name: "test agent register with nil features in agent details",
cmd: &proto.Command{
Meta: &proto.Metadata{},
Type: proto.Command_NORMAL,
Data: &proto.Command_AgentConnectResponse{
AgentConnectResponse: &proto.AgentConnectResponse{
AgentConfig: &proto.AgentConfig{
Details: &proto.AgentDetails{
Tags: []string{"new-tag1:one"},
Features: nil,
},
},
},
},
},
topic: core.AgentConnected,
nginxId: "12345",
systemId: "67890",
msgTopics: []string{},
},
{
name: "test agent register with extension and configs",
cmd: &proto.Command{
Meta: &proto.Metadata{},
Type: proto.Command_NORMAL,
Data: &proto.Command_AgentConnectResponse{
AgentConnectResponse: &proto.AgentConnectResponse{
AgentConfig: &proto.AgentConfig{
Details: &proto.AgentDetails{
Tags: []string{"new-tag1:one"},
Extensions: []string{"advanced-metrics"},
},
Configs: &proto.ConfigReport{
Configs: []*proto.ConfigDescriptor{
{
Checksum: "",
NginxId: "12345",
SystemId: "6789",
},
},
},
},
},
},
},
topic: core.AgentConnected,
nginxId: "12345",
systemId: "67890",
msgTopics: []string{
core.AgentConfigChanged,
core.NginxConfigUpload,
core.EnableExtension,
},
},
{
name: "test agent register with features and configs",
cmd: &proto.Command{
Meta: &proto.Metadata{},
Type: proto.Command_NORMAL,
Data: &proto.Command_AgentConnectResponse{
AgentConnectResponse: &proto.AgentConnectResponse{
AgentConfig: &proto.AgentConfig{
Details: &proto.AgentDetails{
Tags: []string{"new-tag1:one"},
Features: []string{"nginx-config-async"},
},
Configs: &proto.ConfigReport{
Configs: []*proto.ConfigDescriptor{
{
Checksum: "",
NginxId: "12345",
SystemId: "6789",
},
},
},
},
},
},
},
topic: core.AgentConnected,
nginxId: "12345",
systemId: "67890",
msgTopics: []string{
core.AgentConfigChanged,
core.NginxConfigUpload,
core.EnableFeature,
},
},
{
name: "test agent config force",
cmd: &proto.Command{
Expand Down
42 changes: 25 additions & 17 deletions test/performance/vendor/github.com/nginx/agent/v2/src/plugins/commander.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.