coder · jscottmiller · Apr 29, 2026 · Apr 29, 2026 · May 18, 2026 · May 20, 2026
diff --git a/cli/testdata/coder_provisioner_list_--output_json.golden b/cli/testdata/coder_provisioner_list_--output_json.golden
@@ -7,7 +7,7 @@
     "last_seen_at": "====[timestamp]=====",
     "name": "test-daemon",
     "version": "v0.0.0-devel",
-    "api_version": "1.17",
+    "api_version": "1.18",
     "provisioners": [
       "echo"
     ],

diff --git a/coderd/agentapi/subagent.go b/coderd/agentapi/subagent.go
@@ -150,6 +150,7 @@ func (a *SubAgentAPI) CreateSubAgent(ctx context.Context, req *agentproto.Create
 		DisplayApps:              displayApps,
 		DisplayOrder:             0,
 		APIKeyScope:              parentAgent.APIKeyScope,
+		DlpPolicyID:              parentAgent.DlpPolicyID,
 	})
 	if err != nil {
 		return nil, xerrors.Errorf("insert sub agent: %w", err)

diff --git a/coderd/agentapi/subagent_test.go b/coderd/agentapi/subagent_test.go
@@ -20,6 +20,8 @@ import (
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
+	"github.com/coder/coder/v2/coderd/database/dbtime"
+	"github.com/coder/coder/v2/coderd/dlppolicy"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/codersdk"
@@ -220,6 +222,72 @@ func TestSubAgentAPI(t *testing.T) {
 		assert.Equal(t, parentAgent.ID, lookedUp.ID, "instance ID lookup should still return the parent agent")
 	})
 
+	t.Run("CreateSubAgentInheritsDLPPolicy", func(t *testing.T) {
+		t.Parallel()
+
+		var (
+			log   = testutil.Logger(t)
+			clock = quartz.NewMock(t)
+
+			db, org     = newDatabaseWithOrg(t)
+			user, agent = newUserWithWorkspaceAgent(t, db, org)
+		)
+
+		ctx := testutil.Context(t, testutil.WaitShort)
+
+		// Attach a DLP policy with ssh_access disabled to the parent agent.
+		ao, err := db.GetAuthenticatedWorkspaceAgentAndBuildByAuthToken(dbauthz.AsSystemRestricted(ctx), agent.AuthToken)
+		require.NoError(t, err)
+		build, err := db.GetWorkspaceBuildByID(dbauthz.AsSystemRestricted(ctx), ao.WorkspaceBuild.ID)
+		require.NoError(t, err)
+
+		policy, err := db.InsertTemplateVersionDLPPolicy(dbauthz.AsProvisionerd(ctx), database.InsertTemplateVersionDLPPolicyParams{
+			ID:                   uuid.New(),
+			TemplateVersionID:    build.TemplateVersionID,
+			Name:                 "strict",
+			SshAccess:            false,
+			WebTerminalAccess:    true,
+			PortForwardingAccess: true,
+			AllowedApplications:  []string{},
+			CreatedAt:            dbtime.Now(),
+		})
+		require.NoError(t, err)
+		dbgen.SetWorkspaceAgentDLPPolicy(t, db, agent.ID, policy.ID)
+
+		// Re-fetch the parent so the API sees the updated DlpPolicyID.
+		parentAgent, err := db.GetWorkspaceAgentByID(dbauthz.AsSystemRestricted(ctx), agent.ID)
+		require.NoError(t, err)
+		require.True(t, parentAgent.DlpPolicyID.Valid, "parent should have the DLP policy attached")
+
+		api := newAgentAPI(t, log, db, clock, user, org, parentAgent)
+
+		createResp, err := api.CreateSubAgent(ctx, &proto.CreateSubAgentRequest{
+			Name:            "sub-agent",
+			Directory:       "/workspaces/test",
+			Architecture:    "amd64",
+			OperatingSystem: "linux",
+		})
+		require.NoError(t, err)
+
+		subAgentID, err := uuid.FromBytes(createResp.Agent.Id)
+		require.NoError(t, err)
+
+		// The sub-agent row must carry the parent's DLP policy id so that
+		// gates keyed on the agent ID return the same policy.
+		subAgent, err := db.GetWorkspaceAgentByID(dbauthz.AsSystemRestricted(ctx), subAgentID)
+		require.NoError(t, err)
+		require.True(t, subAgent.DlpPolicyID.Valid, "sub-agent should inherit the parent's DLP policy")
+		require.Equal(t, parentAgent.DlpPolicyID.UUID, subAgent.DlpPolicyID.UUID)
+
+		// And dlppolicy.ForAgent must resolve the same policy when looked up
+		// via the sub-agent's id, which is what the enforcement gates do.
+		resolved, err := dlppolicy.ForAgent(ctx, db, subAgentID)
+		require.NoError(t, err)
+		require.NotNil(t, resolved)
+		require.Equal(t, policy.ID, resolved.ID)
+		require.False(t, resolved.SshAccess, "sub-agent must inherit ssh_access=false")
+	})
+
 	type expectedAppError struct {
 		index int32
 		field string

diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -4268,6 +4268,27 @@ func (q *querier) GetTemplateVersionByTemplateIDAndName(ctx context.Context, arg
 	return tv, nil
 }
 
+func (q *querier) GetTemplateVersionDLPPoliciesByTemplateVersionID(ctx context.Context, templateVersionID uuid.UUID) ([]database.TemplateVersionDlpPolicy, error) {
+	if _, err := q.GetTemplateVersionByID(ctx, templateVersionID); err != nil {
+		return nil, err
+	}
+	return q.db.GetTemplateVersionDLPPoliciesByTemplateVersionID(ctx, templateVersionID)
+}
+
+func (q *querier) GetTemplateVersionDLPPolicyByAgentID(ctx context.Context, agentID uuid.UUID) (database.TemplateVersionDlpPolicy, error) {
+	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceTemplate); err != nil {
+		return database.TemplateVersionDlpPolicy{}, err
+	}
+	return q.db.GetTemplateVersionDLPPolicyByAgentID(ctx, agentID)
+}
+
+func (q *querier) GetTemplateVersionDLPPolicyByVersionAndName(ctx context.Context, arg database.GetTemplateVersionDLPPolicyByVersionAndNameParams) (database.TemplateVersionDlpPolicy, error) {
+	if _, err := q.GetTemplateVersionByID(ctx, arg.TemplateVersionID); err != nil {
+		return database.TemplateVersionDlpPolicy{}, err
+	}
+	return q.db.GetTemplateVersionDLPPolicyByVersionAndName(ctx, arg)
+}
+
 func (q *querier) GetTemplateVersionParameters(ctx context.Context, templateVersionID uuid.UUID) ([]database.TemplateVersionParameter, error) {
 	// An actor can read template version parameters if they can read the related template.
 	tv, err := q.db.GetTemplateVersionByID(ctx, templateVersionID)
@@ -5672,6 +5693,13 @@ func (q *querier) InsertTemplateVersion(ctx context.Context, arg database.Insert
 	return q.db.InsertTemplateVersion(ctx, arg)
 }
 
+func (q *querier) InsertTemplateVersionDLPPolicy(ctx context.Context, arg database.InsertTemplateVersionDLPPolicyParams) (database.TemplateVersionDlpPolicy, error) {
+	if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceTemplate); err != nil {
+		return database.TemplateVersionDlpPolicy{}, err
+	}
+	return q.db.InsertTemplateVersionDLPPolicy(ctx, arg)
+}
+
 func (q *querier) InsertTemplateVersionParameter(ctx context.Context, arg database.InsertTemplateVersionParameterParams) (database.TemplateVersionParameter, error) {
 	if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
 		return database.TemplateVersionParameter{}, err
@@ -7504,6 +7532,13 @@ func (q *querier) UpdateWorkspaceAgentConnectionByID(ctx context.Context, arg da
 	return q.db.UpdateWorkspaceAgentConnectionByID(ctx, arg)
 }
 
+func (q *querier) UpdateWorkspaceAgentDLPPolicyByID(ctx context.Context, arg database.UpdateWorkspaceAgentDLPPolicyByIDParams) error {
+	if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceTemplate); err != nil {
+		return err
+	}
+	return q.db.UpdateWorkspaceAgentDLPPolicyByID(ctx, arg)
+}
+
 func (q *querier) UpdateWorkspaceAgentDirectoryByID(ctx context.Context, arg database.UpdateWorkspaceAgentDirectoryByIDParams) error {
 	workspace, err := q.db.GetWorkspaceByAgentID(ctx, arg.ID)
 	if err != nil {

diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -2131,6 +2131,42 @@ func (s *MethodTestSuite) TestOrganization() {
 		dbm.EXPECT().InsertPresetPrebuildSchedule(gomock.Any(), arg).Return(database.TemplateVersionPresetPrebuildSchedule{}, nil).AnyTimes()
 		check.Args(arg).Asserts(rbac.ResourceTemplate, policy.ActionUpdate)
 	}))
+	s.Run("InsertTemplateVersionDLPPolicy", s.Mocked(func(dbm *dbmock.MockStore, _ *gofakeit.Faker, check *expects) {
+		arg := database.InsertTemplateVersionDLPPolicyParams{ID: uuid.New(), TemplateVersionID: uuid.New(), Name: "strict"}
+		dbm.EXPECT().InsertTemplateVersionDLPPolicy(gomock.Any(), arg).Return(database.TemplateVersionDlpPolicy{}, nil).AnyTimes()
+		check.Args(arg).Asserts(rbac.ResourceTemplate, policy.ActionUpdate)
+	}))
+	s.Run("UpdateWorkspaceAgentDLPPolicyByID", s.Mocked(func(dbm *dbmock.MockStore, _ *gofakeit.Faker, check *expects) {
+		arg := database.UpdateWorkspaceAgentDLPPolicyByIDParams{ID: uuid.New(), DlpPolicyID: uuid.NullUUID{UUID: uuid.New(), Valid: true}}
+		dbm.EXPECT().UpdateWorkspaceAgentDLPPolicyByID(gomock.Any(), arg).Return(nil).AnyTimes()
+		check.Args(arg).Asserts(rbac.ResourceTemplate, policy.ActionUpdate)
+	}))
+	s.Run("GetTemplateVersionDLPPoliciesByTemplateVersionID", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
+		tpl := testutil.Fake(s.T(), faker, database.Template{})
+		tv := testutil.Fake(s.T(), faker, database.TemplateVersion{TemplateID: uuid.NullUUID{UUID: tpl.ID, Valid: true}, OrganizationID: tpl.OrganizationID, CreatedBy: tpl.CreatedBy})
+		resp := []database.TemplateVersionDlpPolicy{testutil.Fake(s.T(), faker, database.TemplateVersionDlpPolicy{TemplateVersionID: tv.ID})}
+
+		dbm.EXPECT().GetTemplateVersionByID(gomock.Any(), tv.ID).Return(tv, nil).AnyTimes()
+		dbm.EXPECT().GetTemplateByID(gomock.Any(), tpl.ID).Return(tpl, nil).AnyTimes()
+		dbm.EXPECT().GetTemplateVersionDLPPoliciesByTemplateVersionID(gomock.Any(), tv.ID).Return(resp, nil).AnyTimes()
+		check.Args(tv.ID).Asserts(tpl.RBACObject(), policy.ActionRead).Returns(resp)
+	}))
+	s.Run("GetTemplateVersionDLPPolicyByVersionAndName", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
+		tpl := testutil.Fake(s.T(), faker, database.Template{})
+		tv := testutil.Fake(s.T(), faker, database.TemplateVersion{TemplateID: uuid.NullUUID{UUID: tpl.ID, Valid: true}, OrganizationID: tpl.OrganizationID, CreatedBy: tpl.CreatedBy})
+		arg := database.GetTemplateVersionDLPPolicyByVersionAndNameParams{TemplateVersionID: tv.ID, Name: "strict"}
+		row := testutil.Fake(s.T(), faker, database.TemplateVersionDlpPolicy{TemplateVersionID: tv.ID, Name: "strict"})
+
+		dbm.EXPECT().GetTemplateVersionByID(gomock.Any(), tv.ID).Return(tv, nil).AnyTimes()
+		dbm.EXPECT().GetTemplateByID(gomock.Any(), tpl.ID).Return(tpl, nil).AnyTimes()
+		dbm.EXPECT().GetTemplateVersionDLPPolicyByVersionAndName(gomock.Any(), arg).Return(row, nil).AnyTimes()
+		check.Args(arg).Asserts(tpl.RBACObject(), policy.ActionRead).Returns(row)
+	}))
+	s.Run("GetTemplateVersionDLPPolicyByAgentID", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
+		agentID := uuid.New()
+		dbm.EXPECT().GetTemplateVersionDLPPolicyByAgentID(gomock.Any(), agentID).Return(testutil.Fake(s.T(), faker, database.TemplateVersionDlpPolicy{}), nil).AnyTimes()
+		check.Args(agentID).Asserts(rbac.ResourceTemplate, policy.ActionRead)
+	}))
 	s.Run("DeleteOrganizationMember", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
 		o := testutil.Fake(s.T(), faker, database.Organization{})
 		u := testutil.Fake(s.T(), faker, database.User{})

diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -514,6 +514,7 @@ func WorkspaceAgent(t testing.TB, db database.Store, orig database.WorkspaceAgen
 		DisplayApps:              append([]database.DisplayApp{}, orig.DisplayApps...),
 		DisplayOrder:             takeFirst(orig.DisplayOrder, 1),
 		APIKeyScope:              takeFirst(orig.APIKeyScope, database.AgentKeyScopeEnumAll),
+		DlpPolicyID:              orig.DlpPolicyID,
 	})
 	require.NoError(t, err, "insert workspace agent")
 	if orig.FirstConnectedAt.Valid || orig.LastConnectedAt.Valid || orig.DisconnectedAt.Valid || orig.LastConnectedReplicaID.Valid {
@@ -564,6 +565,7 @@ func WorkspaceAgent(t testing.TB, db database.Store, orig database.WorkspaceAgen
 			DisplayApps:              nil,
 			DisplayOrder:             agt.DisplayOrder,
 			APIKeyScope:              agt.APIKeyScope,
+			DlpPolicyID:              agt.DlpPolicyID,
 		})
 		require.NoError(t, err, "insert workspace agent subagent antagonist")
 		err = db.DeleteWorkspaceSubAgentByID(genCtx, subAgt.ID)
@@ -582,6 +584,16 @@ func WorkspaceSubAgent(t testing.TB, db database.Store, parentAgent database.Wor
 	return subAgt
 }
 
+// SetWorkspaceAgentDLPPolicy sets the DLP policy reference on an existing
+// workspace agent. Helpful for tests that need to attach a policy to an
+// agent that was created via dbfake or other helpers.
+func SetWorkspaceAgentDLPPolicy(t testing.TB, db database.Store, agentID uuid.UUID, policyID uuid.UUID) {
+	require.NoError(t, db.UpdateWorkspaceAgentDLPPolicyByID(genCtx, database.UpdateWorkspaceAgentDLPPolicyByIDParams{
+		ID:          agentID,
+		DlpPolicyID: uuid.NullUUID{UUID: policyID, Valid: true},
+	}))
+}
+
 func WorkspaceAgentScript(t testing.TB, db database.Store, orig database.WorkspaceAgentScript) database.WorkspaceAgentScript {
 	scripts, err := db.InsertWorkspaceAgentScripts(genCtx, database.InsertWorkspaceAgentScriptsParams{
 		WorkspaceAgentID: takeFirst(orig.WorkspaceAgentID, uuid.New()),

diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go