add unprivileged mode flag (#116)

elastic · Jun 21, 2024 · 1f92439 · 1f92439
1 parent 5895004
commit 1f92439
Show file tree

Hide file tree

Showing 5 changed files with 276 additions and 256 deletions.
diff --git a/elastic-agent-client.proto b/elastic-agent-client.proto
@@ -215,6 +215,8 @@ message AgentInfo {
     bool snapshot = 3;
     // AgentManagedMode reports what config mode agent is running in.
     AgentManagedMode mode = 4;
+    // Unprivileged reports if agent is running in Unprivileged mode
+    bool Unprivileged = 5;
 }
 
 // Feature flags configurations.

diff --git a/pkg/client/client_v2.go b/pkg/client/client_v2.go
@@ -145,6 +145,8 @@ type AgentInfo struct {
 	Snapshot bool
 	// IsStandalone reports if the agent is running in standalone or managed mode
 	ManagedMode proto.AgentManagedMode
+	// Unprivileged reports if the agent is running in unprivileged mode.
+	Unprivileged bool
 }
 
 // VersionInfo is the version information for the connecting client.
@@ -575,10 +577,11 @@ func (c *clientV2) applyExpected(expected *proto.CheckinExpected) {
 	if expected.AgentInfo != nil {
 		c.agentInfoMu.Lock()
 		c.agentInfo = &AgentInfo{
-			ID:          expected.AgentInfo.Id,
-			Version:     expected.AgentInfo.Version,
-			Snapshot:    expected.AgentInfo.Snapshot,
-			ManagedMode: expected.AgentInfo.Mode,
+			ID:           expected.AgentInfo.Id,
+			Version:      expected.AgentInfo.Version,
+			Snapshot:     expected.AgentInfo.Snapshot,
+			ManagedMode:  expected.AgentInfo.Mode,
+			Unprivileged: expected.AgentInfo.Unprivileged,
 		}
 		c.agentInfoMu.Unlock()
 	}

diff --git a/pkg/client/client_v2_test.go b/pkg/client/client_v2_test.go
@@ -158,10 +158,11 @@ func testClientV2CheckinInitial(t *testing.T, localRPC string, serverCreds, clie
 	packageVersion := "8.13.0+build20060102"
 	wantBuildHash := "build_hash"
 	wantAgentInfo := AgentInfo{
-		ID:          "elastic-agent-id",
-		Version:     packageVersion,
-		Snapshot:    true,
-		ManagedMode: proto.AgentManagedMode_STANDALONE,
+		ID:           "elastic-agent-id",
+		Version:      packageVersion,
+		Snapshot:     true,
+		ManagedMode:  proto.AgentManagedMode_STANDALONE,
+		Unprivileged: true,
 	}
 	vInfo := VersionInfo{
 		Name:      "program",
@@ -183,10 +184,11 @@ func testClientV2CheckinInitial(t *testing.T, localRPC string, serverCreds, clie
 
 			return &proto.CheckinExpected{
 				AgentInfo: &proto.AgentInfo{
-					Id:       wantAgentInfo.ID,
-					Version:  wantAgentInfo.Version,
-					Snapshot: wantAgentInfo.Snapshot,
-					Mode:     wantAgentInfo.ManagedMode,
+					Id:           wantAgentInfo.ID,
+					Version:      wantAgentInfo.Version,
+					Snapshot:     wantAgentInfo.Snapshot,
+					Mode:         wantAgentInfo.ManagedMode,
+					Unprivileged: wantAgentInfo.Unprivileged,
 				},
 				Features: &proto.Features{
 					Fqdn: &proto.FQDNFeature{Enabled: wantFQDN},
@@ -306,6 +308,7 @@ func testClientV2CheckinInitial(t *testing.T, localRPC string, serverCreds, clie
 		assert.Equal(t, wantAgentInfo.Version, agentInfo.Version)
 		assert.True(t, wantAgentInfo.Snapshot, agentInfo.Snapshot)
 		assert.Equal(t, wantAgentInfo.ManagedMode, agentInfo.ManagedMode)
+		assert.Equal(t, wantAgentInfo.Unprivileged, agentInfo.Unprivileged)
 	}
 
 	assert.Truef(t, gotFQDN, "FQND should be true")

diff --git a/pkg/client/reader.go b/pkg/client/reader.go
@@ -76,10 +76,11 @@ func NewV2FromReader(reader io.Reader, ver VersionInfo, opts ...V2ClientOption)
 
 	if info.AgentInfo != nil {
 		opts = append(opts, WithAgentInfo(AgentInfo{
-			ID:          info.AgentInfo.Id,
-			Version:     info.AgentInfo.Version,
-			Snapshot:    info.AgentInfo.Snapshot,
-			ManagedMode: info.AgentInfo.Mode,
+			ID:           info.AgentInfo.Id,
+			Version:      info.AgentInfo.Version,
+			Snapshot:     info.AgentInfo.Snapshot,
+			ManagedMode:  info.AgentInfo.Mode,
+			Unprivileged: info.AgentInfo.Unprivileged,
 		}))
 	}