Skip to content

Commit 1031a52

Browse files
sreyasreya
committed
chore: add auditing to workspace dormancy
- Adds an audit log for workspaces automatically transitioned to the dormant state. - Imposes a mininum of 1 minute on cleanup-related fields. This is to prevent accidental API misuse from resulting in catastrophe.
1 parent 4ab5276 commit 1031a52

File tree

9 files changed

+212
-62
lines changed

9 files changed

+212
-62
lines changed

‎cli/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
938938
autobuildTicker := time.NewTicker(vals.AutobuildPollInterval.Value())
939939
defer autobuildTicker.Stop()
940940
autobuildExecutor := autobuild.NewExecutor(
941-
ctx, options.Database, options.Pubsub, coderAPI.TemplateScheduleStore, logger, autobuildTicker.C)
941+
ctx, options.Database, options.Pubsub, coderAPI.TemplateScheduleStore, &coderAPI.Auditor, logger, autobuildTicker.C)
942942
autobuildExecutor.Run()
943943

944944
hangDetectorTicker := time.NewTicker(vals.JobHangDetectorInterval.Value())

‎coderd/autobuild/lifecycle_executor.go

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ package autobuild
33
import (
44
"context"
55
"database/sql"
6+
"encoding/json"
7+
"net/http"
8+
"strconv"
69
"sync"
710
"sync/atomic"
811
"time"
@@ -12,6 +15,7 @@ import (
1215
"golang.org/x/xerrors"
1316

1417
"cdr.dev/slog"
18+
"github.com/coder/coder/v2/coderd/audit"
1519
"github.com/coder/coder/v2/coderd/database"
1620
"github.com/coder/coder/v2/coderd/database/db2sdk"
1721
"github.com/coder/coder/v2/coderd/database/dbauthz"
@@ -30,6 +34,7 @@ type Executor struct {
3034
db database.Store
3135
ps pubsub.Pubsub
3236
templateScheduleStore *atomic.Pointer[schedule.TemplateScheduleStore]
37+
auditor *atomic.Pointer[audit.Auditor]
3338
log slog.Logger
3439
tick <-chan time.Time
3540
statsCh chan<- Stats
@@ -43,7 +48,7 @@ type Stats struct {
4348
}
4449

4550
// New returns a new wsactions executor.
46-
func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, tss *atomic.Pointer[schedule.TemplateScheduleStore], log slog.Logger, tick <-chan time.Time) *Executor {
51+
func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, tss *atomic.Pointer[schedule.TemplateScheduleStore], auditor *atomic.Pointer[audit.Auditor], log slog.Logger, tick <-chan time.Time) *Executor {
4752
le := &Executor{
4853
//nolint:gocritic // Autostart has a limited set of permissions.
4954
ctx: dbauthz.AsAutostart(ctx),
@@ -52,6 +57,7 @@ func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, tss *
5257
templateScheduleStore: tss,
5358
tick: tick,
5459
log: log.Named("autobuild"),
60+
auditor: auditor,
5561
}
5662
return le
5763
}
@@ -167,13 +173,14 @@ func (e *Executor) runOnce(t time.Time) Stats {
167173
return nil
168174
}
169175

176+
var build *database.WorkspaceBuild
170177
if nextTransition != "" {
171178
builder := wsbuilder.New(ws, nextTransition).
172179
SetLastWorkspaceBuildInTx(&latestBuild).
173180
SetLastWorkspaceBuildJobInTx(&latestJob).
174181
Reason(reason)
175182

176-
_, job, err = builder.Build(e.ctx, tx, nil)
183+
build, job, err = builder.Build(e.ctx, tx, nil)
177184
if err != nil {
178185
log.Error(e.ctx, "unable to transition workspace",
179186
slog.F("transition", nextTransition),
@@ -186,13 +193,41 @@ func (e *Executor) runOnce(t time.Time) Stats {
186193
// Transition the workspace to dormant if it has breached the template's
187194
// threshold for inactivity.
188195
if reason == database.BuildReasonAutolock {
196+
wsOld := ws
189197
ws, err = tx.UpdateWorkspaceDormantDeletingAt(e.ctx, database.UpdateWorkspaceDormantDeletingAtParams{
190198
ID: ws.ID,
191199
DormantAt: sql.NullTime{
192200
Time: dbtime.Now(),
193201
Valid: true,
194202
},
195203
})
204+
205+
fields := audit.AdditionalFields{
206+
WorkspaceName: ws.Name,
207+
BuildReason: reason,
208+
}
209+
if build != nil {
210+
fields.BuildNumber = strconv.FormatInt(int64(latestBuild.BuildNumber), 10)
211+
}
212+
213+
raw, err := json.Marshal(fields)
214+
if err != nil {
215+
e.log.Error(e.ctx, "marshal resource info for successful job", slog.Error(err))
216+
}
217+
218+
audit.WorkspaceBuildAudit(e.ctx, &audit.BuildAuditParams[database.Workspace]{
219+
Audit: *e.auditor.Load(),
220+
Log: e.log,
221+
UserID: job.InitiatorID,
222+
OrganizationID: ws.OrganizationID,
223+
JobID: job.ID,
224+
Action: database.AuditActionWrite,
225+
Old: wsOld,
226+
New: ws,
227+
Status: http.StatusOK,
228+
AdditionalFields: raw,
229+
})
230+
196231
if err != nil {
197232
log.Error(e.ctx, "unable to transition workspace to dormant",
198233
slog.F("transition", nextTransition),

‎coderd/coderdtest/coderdtest.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,19 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
262262
}
263263
templateScheduleStore.Store(&options.TemplateScheduleStore)
264264

265+
var auditor atomic.Pointer[audit.Auditor]
266+
if options.Auditor == nil {
267+
options.Auditor = audit.NewNop()
268+
}
269+
auditor.Store(&options.Auditor)
270+
265271
ctx, cancelFunc := context.WithCancel(context.Background())
266272
lifecycleExecutor := autobuild.NewExecutor(
267273
ctx,
268274
options.Database,
269275
options.Pubsub,
270276
&templateScheduleStore,
277+
&auditor,
271278
slogtest.Make(t, nil).Named("autobuild.executor").Leveled(slog.LevelDebug),
272279
options.AutobuildTicker,
273280
).WithStatsChannel(options.AutobuildStats)

‎coderd/templates.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -537,17 +537,19 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
537537
if req.AutostopRequirement.Weeks > schedule.MaxTemplateAutostopRequirementWeeks {
538538
validErrs = append(validErrs, codersdk.ValidationError{Field: "autostop_requirement.weeks", Detail: fmt.Sprintf("Must be less than %d.", schedule.MaxTemplateAutostopRequirementWeeks)})
539539
}
540-
if req.FailureTTLMillis < 0 {
541-
validErrs = append(validErrs, codersdk.ValidationError{Field: "failure_ttl_ms", Detail: "Must be a positive integer."})
542-
}
543-
if req.TimeTilDormantMillis < 0 {
544-
validErrs = append(validErrs, codersdk.ValidationError{Field: "inactivity_ttl_ms", Detail: "Must be a positive integer."})
540+
541+
// The minimum valid value for a dormant TTL is 1 minute. This is
542+
// to ensure an uninformed user does not send an unintentionally
543+
// small number resulting in potentially catastrophic consequences.
544+
const minTTL = 1000 * 60
545+
if req.FailureTTLMillis < 0 || (req.FailureTTLMillis > 0 && req.FailureTTLMillis < minTTL) {
546+
validErrs = append(validErrs, codersdk.ValidationError{Field: "failure_ttl_ms", Detail: "Value must be at least one minute."})
545547
}
546-
if req.TimeTilDormantMillis < 0 {
547-
validErrs = append(validErrs, codersdk.ValidationError{Field: "inactivity_ttl_ms", Detail: "Must be a positive integer."})
548+
if req.TimeTilDormantMillis < 0 || (req.TimeTilDormantMillis > 0 && req.TimeTilDormantMillis < minTTL) {
549+
validErrs = append(validErrs, codersdk.ValidationError{Field: "time_til_dormant_ms", Detail: "Value must be at least one minute."})
548550
}
549-
if req.TimeTilDormantAutoDeleteMillis < 0 {
550-
validErrs = append(validErrs, codersdk.ValidationError{Field: "locked_ttl_ms", Detail: "Must be a positive integer."})
551+
if req.TimeTilDormantAutoDeleteMillis < 0 || (req.TimeTilDormantAutoDeleteMillis > 0 && req.TimeTilDormantAutoDeleteMillis < minTTL) {
552+
validErrs = append(validErrs, codersdk.ValidationError{Field: "time_til_dormant_autodelete_ms", Detail: "Value must be at least one minute."})
551553
}
552554

553555
if len(validErrs) > 0 {

‎coderd/workspaces.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -816,8 +816,20 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
816816
// @Success 200 {object} codersdk.Workspace
817817
// @Router /workspaces/{workspace}/dormant [put]
818818
func (api *API) putWorkspaceDormant(rw http.ResponseWriter, r *http.Request) {
819-
ctx := r.Context()
820-
workspace := httpmw.WorkspaceParam(r)
819+
var (
820+
ctx = r.Context()
821+
workspace = httpmw.WorkspaceParam(r)
822+
oldWorkspace = workspace
823+
auditor = api.Auditor.Load()
824+
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
825+
Audit: *auditor,
826+
Log: api.Logger,
827+
Request: r,
828+
Action: database.AuditActionWrite,
829+
})
830+
)
831+
aReq.Old = oldWorkspace
832+
defer commitAudit()
821833

822834
var req codersdk.UpdateWorkspaceDormancy
823835
if !httpapi.Read(ctx, rw, r, &req) {
@@ -865,6 +877,7 @@ func (api *API) putWorkspaceDormant(rw http.ResponseWriter, r *http.Request) {
865877
return
866878
}
867879

880+
aReq.New = workspace
868881
httpapi.Write(ctx, rw, http.StatusOK, convertWorkspace(
869882
workspace,
870883
data.builds[0],

‎coderd/workspaces_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2825,7 +2825,10 @@ func TestWorkspaceDormant(t *testing.T) {
28252825
t.Run("OK", func(t *testing.T) {
28262826
t.Parallel()
28272827
var (
2828-
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
2828+
auditRecorder = audit.NewMock()
2829+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true,
2830+
Auditor: auditRecorder,
2831+
})
28292832
user = coderdtest.CreateFirstUser(t, client)
28302833
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
28312834
_ = coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
@@ -2842,10 +2845,12 @@ func TestWorkspaceDormant(t *testing.T) {
28422845
defer cancel()
28432846

28442847
lastUsedAt := workspace.LastUsedAt
2848+
auditRecorder.ResetLogs()
28452849
err := client.UpdateWorkspaceDormancy(ctx, workspace.ID, codersdk.UpdateWorkspaceDormancy{
28462850
Dormant: true,
28472851
})
28482852
require.NoError(t, err)
2853+
require.Len(t, auditRecorder.AuditLogs(), 1)
28492854

28502855
workspace = coderdtest.MustWorkspace(t, client, workspace.ID)
28512856
require.NoError(t, err, "fetch provisioned workspace")

‎codersdk/audit.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ const (
7272
AuditActionLogin AuditAction = "login"
7373
AuditActionLogout AuditAction = "logout"
7474
AuditActionRegister AuditAction = "register"
75+
AuditActionDormant AuditAction = "dormant"
7576
)
7677

7778
func (a AuditAction) Friendly() string {
@@ -92,6 +93,8 @@ func (a AuditAction) Friendly() string {
9293
return "logged out"
9394
case AuditActionRegister:
9495
return "registered"
96+
case AuditActionDormant:
97+
return "has gone dormant"
9598
default:
9699
return "unknown"
97100
}

‎enterprise/coderd/templates_test.go

Lines changed: 110 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -185,55 +185,123 @@ func TestTemplates(t *testing.T) {
185185
})
186186

187187
t.Run("CleanupTTLs", func(t *testing.T) {
188-
t.Parallel()
188+
t.Run("OK", func(t *testing.T) {
189+
t.Parallel()
189190

190-
ctx := testutil.Context(t, testutil.WaitMedium)
191-
client, user := coderdenttest.New(t, &coderdenttest.Options{
192-
Options: &coderdtest.Options{
193-
IncludeProvisionerDaemon: true,
194-
},
195-
LicenseOptions: &coderdenttest.LicenseOptions{
196-
Features: license.Features{
197-
codersdk.FeatureAdvancedTemplateScheduling: 1,
191+
ctx := testutil.Context(t, testutil.WaitMedium)
192+
client, user := coderdenttest.New(t, &coderdenttest.Options{
193+
Options: &coderdtest.Options{
194+
IncludeProvisionerDaemon: true,
198195
},
199-
},
196+
LicenseOptions: &coderdenttest.LicenseOptions{
197+
Features: license.Features{
198+
codersdk.FeatureAdvancedTemplateScheduling: 1,
199+
},
200+
},
201+
})
202+
203+
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
204+
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
205+
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
206+
require.EqualValues(t, 0, template.TimeTilDormantMillis)
207+
require.EqualValues(t, 0, template.FailureTTLMillis)
208+
require.EqualValues(t, 0, template.TimeTilDormantAutoDeleteMillis)
209+
210+
var (
211+
failureTTL time.Duration = 1 * time.Minute
212+
inactivityTTL time.Duration = 2 * time.Minute
213+
dormantTTL time.Duration = 3 * time.Minute
214+
)
215+
216+
updated, err := client.UpdateTemplateMeta(ctx, template.ID, codersdk.UpdateTemplateMeta{
217+
Name: template.Name,
218+
DisplayName: template.DisplayName,
219+
Description: template.Description,
220+
Icon: template.Icon,
221+
AllowUserCancelWorkspaceJobs: template.AllowUserCancelWorkspaceJobs,
222+
TimeTilDormantMillis: inactivityTTL.Milliseconds(),
223+
FailureTTLMillis: failureTTL.Milliseconds(),
224+
TimeTilDormantAutoDeleteMillis: dormantTTL.Milliseconds(),
225+
})
226+
require.NoError(t, err)
227+
require.Equal(t, failureTTL.Milliseconds(), updated.FailureTTLMillis)
228+
require.Equal(t, inactivityTTL.Milliseconds(), updated.TimeTilDormantMillis)
229+
require.Equal(t, dormantTTL.Milliseconds(), updated.TimeTilDormantAutoDeleteMillis)
230+
231+
// Validate fetching the template returns the same values as updating
232+
// the template.
233+
template, err = client.Template(ctx, template.ID)
234+
require.NoError(t, err)
235+
require.Equal(t, failureTTL.Milliseconds(), updated.FailureTTLMillis)
236+
require.Equal(t, inactivityTTL.Milliseconds(), updated.TimeTilDormantMillis)
237+
require.Equal(t, dormantTTL.Milliseconds(), updated.TimeTilDormantAutoDeleteMillis)
200238
})
201239

202-
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
203-
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
204-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
205-
require.EqualValues(t, 0, template.TimeTilDormantMillis)
206-
require.EqualValues(t, 0, template.FailureTTLMillis)
207-
require.EqualValues(t, 0, template.TimeTilDormantAutoDeleteMillis)
240+
t.Run("BadRequest", func(t *testing.T) {
241+
t.Parallel()
208242

209-
var (
210-
failureTTL int64 = 1
211-
inactivityTTL int64 = 2
212-
dormantTTL int64 = 3
213-
)
243+
ctx := testutil.Context(t, testutil.WaitMedium)
244+
client, user := coderdenttest.New(t, &coderdenttest.Options{
245+
Options: &coderdtest.Options{
246+
IncludeProvisionerDaemon: true,
247+
},
248+
LicenseOptions: &coderdenttest.LicenseOptions{
249+
Features: license.Features{
250+
codersdk.FeatureAdvancedTemplateScheduling: 1,
251+
},
252+
},
253+
})
214254

215-
updated, err := client.UpdateTemplateMeta(ctx, template.ID, codersdk.UpdateTemplateMeta{
216-
Name: template.Name,
217-
DisplayName: template.DisplayName,
218-
Description: template.Description,
219-
Icon: template.Icon,
220-
AllowUserCancelWorkspaceJobs: template.AllowUserCancelWorkspaceJobs,
221-
TimeTilDormantMillis: inactivityTTL,
222-
FailureTTLMillis: failureTTL,
223-
TimeTilDormantAutoDeleteMillis: dormantTTL,
224-
})
225-
require.NoError(t, err)
226-
require.Equal(t, failureTTL, updated.FailureTTLMillis)
227-
require.Equal(t, inactivityTTL, updated.TimeTilDormantMillis)
228-
require.Equal(t, dormantTTL, updated.TimeTilDormantAutoDeleteMillis)
255+
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
256+
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
257+
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
229258

230-
// Validate fetching the template returns the same values as updating
231-
// the template.
232-
template, err = client.Template(ctx, template.ID)
233-
require.NoError(t, err)
234-
require.Equal(t, failureTTL, updated.FailureTTLMillis)
235-
require.Equal(t, inactivityTTL, updated.TimeTilDormantMillis)
236-
require.Equal(t, dormantTTL, updated.TimeTilDormantAutoDeleteMillis)
259+
type testcase struct {
260+
Name string
261+
TimeTilDormantMS int64
262+
FailureTTLMS int64
263+
DormantAutoDeleteMS int64
264+
}
265+
266+
cases := []testcase{
267+
{
268+
Name: "NegativeValue",
269+
TimeTilDormantMS: -1,
270+
FailureTTLMS: -2,
271+
DormantAutoDeleteMS: -3,
272+
},
273+
{
274+
Name: "ValueTooSmall",
275+
TimeTilDormantMS: 1,
276+
FailureTTLMS: 999,
277+
DormantAutoDeleteMS: 500,
278+
},
279+
}
280+
281+
for _, c := range cases {
282+
c := c
283+
284+
t.Run(c.Name, func(t *testing.T) {
285+
t.Parallel()
286+
287+
_, err := client.UpdateTemplateMeta(ctx, template.ID, codersdk.UpdateTemplateMeta{
288+
Name: template.Name,
289+
DisplayName: template.DisplayName,
290+
Description: template.Description,
291+
Icon: template.Icon,
292+
AllowUserCancelWorkspaceJobs: template.AllowUserCancelWorkspaceJobs,
293+
TimeTilDormantMillis: c.TimeTilDormantMS,
294+
FailureTTLMillis: c.FailureTTLMS,
295+
TimeTilDormantAutoDeleteMillis: c.DormantAutoDeleteMS,
296+
})
297+
require.Error(t, err)
298+
cerr, ok := codersdk.AsError(err)
299+
require.True(t, ok)
300+
require.Len(t, cerr.Validations, 3)
301+
require.Equal(t, "Value must be at least one minute.", cerr.Validations[0].Detail)
302+
})
303+
}
304+
})
237305
})
238306

239307
t.Run("UpdateTimeTilDormantAutoDelete", func(t *testing.T) {

0 commit comments

Comments
 (0)