Skip to content

Commit 8eab0d0

Browse files
Kira-PilotKira-Pilot
committed
no need to pass through each handler
1 parent 850735e commit 8eab0d0

File tree

9 files changed

+93
-118
lines changed

9 files changed

+93
-118
lines changed

‎coderd/audit/request.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ func InitRequest[T Auditable](w http.ResponseWriter, p *RequestParams) (*Request
137137
}
138138
}
139139

140+
if p.AdditionalFields == nil {
141+
p.AdditionalFields = json.RawMessage("{}")
142+
}
143+
140144
ip := parseIP(p.Request.RemoteAddr)
141145
err := p.Audit.Export(ctx, database.AuditLog{
142146
ID: uuid.New(),

‎coderd/gitsshkey.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package coderd
22

33
import (
4-
"encoding/json"
54
"net/http"
65

76
"github.com/coder/coder/coderd/audit"
@@ -19,11 +18,10 @@ func (api *API) regenerateGitSSHKey(rw http.ResponseWriter, r *http.Request) {
1918
user = httpmw.UserParam(r)
2019
auditor = api.Auditor.Load()
2120
aReq, commitAudit = audit.InitRequest[database.GitSSHKey](rw, &audit.RequestParams{
22-
Audit: *auditor,
23-
Log: api.Logger,
24-
Request: r,
25-
Action: database.AuditActionWrite,
26-
AdditionalFields: json.RawMessage("{}"),
21+
Audit: *auditor,
22+
Log: api.Logger,
23+
Request: r,
24+
Action: database.AuditActionWrite,
2725
})
2826
)
2927
defer commitAudit()

‎coderd/templates.go

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"crypto/sha256"
66
"database/sql"
77
"encoding/hex"
8-
"encoding/json"
98
"errors"
109
"fmt"
1110
"net/http"
@@ -85,11 +84,10 @@ func (api *API) deleteTemplate(rw http.ResponseWriter, r *http.Request) {
8584
template = httpmw.TemplateParam(r)
8685
auditor = *api.Auditor.Load()
8786
aReq, commitAudit = audit.InitRequest[database.Template](rw, &audit.RequestParams{
88-
Audit: auditor,
89-
Log: api.Logger,
90-
Request: r,
91-
Action: database.AuditActionDelete,
92-
AdditionalFields: json.RawMessage("{}"),
87+
Audit: auditor,
88+
Log: api.Logger,
89+
Request: r,
90+
Action: database.AuditActionDelete,
9391
})
9492
)
9593
defer commitAudit()
@@ -446,11 +444,10 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
446444
template = httpmw.TemplateParam(r)
447445
auditor = *api.Auditor.Load()
448446
aReq, commitAudit = audit.InitRequest[database.Template](rw, &audit.RequestParams{
449-
Audit: auditor,
450-
Log: api.Logger,
451-
Request: r,
452-
Action: database.AuditActionWrite,
453-
AdditionalFields: json.RawMessage("{}"),
447+
Audit: auditor,
448+
Log: api.Logger,
449+
Request: r,
450+
Action: database.AuditActionWrite,
454451
})
455452
)
456453
defer commitAudit()

‎coderd/templateversions.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -599,11 +599,10 @@ func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Reque
599599
template = httpmw.TemplateParam(r)
600600
auditor = *api.Auditor.Load()
601601
aReq, commitAudit = audit.InitRequest[database.Template](rw, &audit.RequestParams{
602-
Audit: auditor,
603-
Log: api.Logger,
604-
Request: r,
605-
Action: database.AuditActionWrite,
606-
AdditionalFields: json.RawMessage("{}"),
602+
Audit: auditor,
603+
Log: api.Logger,
604+
Request: r,
605+
Action: database.AuditActionWrite,
607606
})
608607
)
609608
defer commitAudit()
@@ -674,11 +673,10 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
674673
organization = httpmw.OrganizationParam(r)
675674
auditor = *api.Auditor.Load()
676675
aReq, commitAudit = audit.InitRequest[database.TemplateVersion](rw, &audit.RequestParams{
677-
Audit: auditor,
678-
Log: api.Logger,
679-
Request: r,
680-
Action: database.AuditActionCreate,
681-
AdditionalFields: json.RawMessage("{}"),
676+
Audit: auditor,
677+
Log: api.Logger,
678+
Request: r,
679+
Action: database.AuditActionCreate,
682680
})
683681

684682
req codersdk.CreateTemplateVersionRequest

‎coderd/users.go

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"context"
66
"database/sql"
7-
"encoding/json"
87
"errors"
98
"fmt"
109
"net/http"
@@ -257,11 +256,10 @@ func (api *API) postUser(rw http.ResponseWriter, r *http.Request) {
257256
ctx := r.Context()
258257
auditor := *api.Auditor.Load()
259258
aReq, commitAudit := audit.InitRequest[database.User](rw, &audit.RequestParams{
260-
Audit: auditor,
261-
Log: api.Logger,
262-
Request: r,
263-
Action: database.AuditActionCreate,
264-
AdditionalFields: json.RawMessage("{}"),
259+
Audit: auditor,
260+
Log: api.Logger,
261+
Request: r,
262+
Action: database.AuditActionCreate,
265263
})
266264
defer commitAudit()
267265

@@ -345,11 +343,10 @@ func (api *API) deleteUser(rw http.ResponseWriter, r *http.Request) {
345343
auditor := *api.Auditor.Load()
346344
user := httpmw.UserParam(r)
347345
aReq, commitAudit := audit.InitRequest[database.User](rw, &audit.RequestParams{
348-
Audit: auditor,
349-
Log: api.Logger,
350-
Request: r,
351-
Action: database.AuditActionDelete,
352-
AdditionalFields: json.RawMessage("{}"),
346+
Audit: auditor,
347+
Log: api.Logger,
348+
Request: r,
349+
Action: database.AuditActionDelete,
353350
})
354351
aReq.Old = user
355352
defer commitAudit()
@@ -423,11 +420,10 @@ func (api *API) putUserProfile(rw http.ResponseWriter, r *http.Request) {
423420
user = httpmw.UserParam(r)
424421
auditor = *api.Auditor.Load()
425422
aReq, commitAudit = audit.InitRequest[database.User](rw, &audit.RequestParams{
426-
Audit: auditor,
427-
Log: api.Logger,
428-
Request: r,
429-
Action: database.AuditActionWrite,
430-
AdditionalFields: json.RawMessage("{}"),
423+
Audit: auditor,
424+
Log: api.Logger,
425+
Request: r,
426+
Action: database.AuditActionWrite,
431427
})
432428
)
433429
defer commitAudit()
@@ -506,11 +502,10 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW
506502
apiKey = httpmw.APIKey(r)
507503
auditor = *api.Auditor.Load()
508504
aReq, commitAudit = audit.InitRequest[database.User](rw, &audit.RequestParams{
509-
Audit: auditor,
510-
Log: api.Logger,
511-
Request: r,
512-
Action: database.AuditActionWrite,
513-
AdditionalFields: json.RawMessage("{}"),
505+
Audit: auditor,
506+
Log: api.Logger,
507+
Request: r,
508+
Action: database.AuditActionWrite,
514509
})
515510
)
516511
defer commitAudit()
@@ -575,11 +570,10 @@ func (api *API) putUserPassword(rw http.ResponseWriter, r *http.Request) {
575570
params codersdk.UpdateUserPasswordRequest
576571
auditor = *api.Auditor.Load()
577572
aReq, commitAudit = audit.InitRequest[database.User](rw, &audit.RequestParams{
578-
Audit: auditor,
579-
Log: api.Logger,
580-
Request: r,
581-
Action: database.AuditActionWrite,
582-
AdditionalFields: json.RawMessage("{}"),
573+
Audit: auditor,
574+
Log: api.Logger,
575+
Request: r,
576+
Action: database.AuditActionWrite,
583577
})
584578
)
585579
defer commitAudit()
@@ -738,11 +732,10 @@ func (api *API) putUserRoles(rw http.ResponseWriter, r *http.Request) {
738732
apiKey = httpmw.APIKey(r)
739733
auditor = *api.Auditor.Load()
740734
aReq, commitAudit = audit.InitRequest[database.User](rw, &audit.RequestParams{
741-
Audit: auditor,
742-
Log: api.Logger,
743-
Request: r,
744-
Action: database.AuditActionWrite,
745-
AdditionalFields: json.RawMessage("{}"),
735+
Audit: auditor,
736+
Log: api.Logger,
737+
Request: r,
738+
Action: database.AuditActionWrite,
746739
})
747740
)
748741
defer commitAudit()

‎coderd/workspacebuilds.go

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,12 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
282282

283283
// if user deletes a workspace, audit the workspace
284284
if action == rbac.ActionDelete {
285-
var (
286-
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
287-
Audit: *auditor,
288-
Log: api.Logger,
289-
Request: r,
290-
Action: database.AuditActionDelete,
291-
AdditionalFields: json.RawMessage("{}"),
292-
})
293-
)
285+
aReq, commitAudit := audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
286+
Audit: *auditor,
287+
Log: api.Logger,
288+
Request: r,
289+
Action: database.AuditActionDelete,
290+
})
294291

295292
defer commitAudit()
296293
aReq.Old = workspace
@@ -317,15 +314,13 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
317314

318315
wriBytes, _ := json.Marshal(workspaceResourceInfo)
319316

320-
var (
321-
aReq, commitAudit = audit.InitRequest[database.WorkspaceBuild](rw, &audit.RequestParams{
322-
Audit: *auditor,
323-
Log: api.Logger,
324-
Request: r,
325-
Action: auditAction,
326-
AdditionalFields: wriBytes,
327-
})
328-
)
317+
aReq, commitAudit := audit.InitRequest[database.WorkspaceBuild](rw, &audit.RequestParams{
318+
Audit: *auditor,
319+
Log: api.Logger,
320+
Request: r,
321+
Action: auditAction,
322+
AdditionalFields: wriBytes,
323+
})
329324

330325
defer commitAudit()
331326
aReq.Old = latestBuild

‎coderd/workspaces.go

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,10 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
282282
auditor = api.Auditor.Load()
283283
user = httpmw.UserParam(r)
284284
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
285-
Audit: *auditor,
286-
Log: api.Logger,
287-
Request: r,
288-
Action: database.AuditActionCreate,
289-
AdditionalFields: json.RawMessage("{}"),
285+
Audit: *auditor,
286+
Log: api.Logger,
287+
Request: r,
288+
Action: database.AuditActionCreate,
290289
})
291290
)
292291
defer commitAudit()
@@ -567,11 +566,10 @@ func (api *API) patchWorkspace(rw http.ResponseWriter, r *http.Request) {
567566
workspace = httpmw.WorkspaceParam(r)
568567
auditor = api.Auditor.Load()
569568
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
570-
Audit: *auditor,
571-
Log: api.Logger,
572-
Request: r,
573-
Action: database.AuditActionWrite,
574-
AdditionalFields: json.RawMessage("{}"),
569+
Audit: *auditor,
570+
Log: api.Logger,
571+
Request: r,
572+
Action: database.AuditActionWrite,
575573
})
576574
)
577575
defer commitAudit()
@@ -646,11 +644,10 @@ func (api *API) putWorkspaceAutostart(rw http.ResponseWriter, r *http.Request) {
646644
workspace = httpmw.WorkspaceParam(r)
647645
auditor = api.Auditor.Load()
648646
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
649-
Audit: *auditor,
650-
Log: api.Logger,
651-
Request: r,
652-
Action: database.AuditActionWrite,
653-
AdditionalFields: json.RawMessage("{}"),
647+
Audit: *auditor,
648+
Log: api.Logger,
649+
Request: r,
650+
Action: database.AuditActionWrite,
654651
})
655652
)
656653
defer commitAudit()
@@ -709,11 +706,10 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
709706
workspace = httpmw.WorkspaceParam(r)
710707
auditor = api.Auditor.Load()
711708
aReq, commitAudit = audit.InitRequest[database.Workspace](rw, &audit.RequestParams{
712-
Audit: *auditor,
713-
Log: api.Logger,
714-
Request: r,
715-
Action: database.AuditActionWrite,
716-
AdditionalFields: json.RawMessage("{}"),
709+
Audit: *auditor,
710+
Log: api.Logger,
711+
Request: r,
712+
Action: database.AuditActionWrite,
717713
})
718714
)
719715
defer commitAudit()

‎enterprise/coderd/groups.go

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package coderd
22

33
import (
44
"database/sql"
5-
"encoding/json"
65
"fmt"
76
"net/http"
87

@@ -24,11 +23,10 @@ func (api *API) postGroupByOrganization(rw http.ResponseWriter, r *http.Request)
2423
org = httpmw.OrganizationParam(r)
2524
auditor = api.AGPL.Auditor.Load()
2625
aReq, commitAudit = audit.InitRequest[database.Group](rw, &audit.RequestParams{
27-
Audit: *auditor,
28-
Log: api.Logger,
29-
Request: r,
30-
Action: database.AuditActionCreate,
31-
AdditionalFields: json.RawMessage("{}"),
26+
Audit: *auditor,
27+
Log: api.Logger,
28+
Request: r,
29+
Action: database.AuditActionCreate,
3230
})
3331
)
3432
defer commitAudit()
@@ -77,11 +75,10 @@ func (api *API) patchGroup(rw http.ResponseWriter, r *http.Request) {
7775
group = httpmw.GroupParam(r)
7876
auditor = api.AGPL.Auditor.Load()
7977
aReq, commitAudit = audit.InitRequest[database.Group](rw, &audit.RequestParams{
80-
Audit: *auditor,
81-
Log: api.Logger,
82-
Request: r,
83-
Action: database.AuditActionWrite,
84-
AdditionalFields: json.RawMessage("{}"),
78+
Audit: *auditor,
79+
Log: api.Logger,
80+
Request: r,
81+
Action: database.AuditActionWrite,
8582
})
8683
)
8784
defer commitAudit()
@@ -228,11 +225,10 @@ func (api *API) deleteGroup(rw http.ResponseWriter, r *http.Request) {
228225
group = httpmw.GroupParam(r)
229226
auditor = api.AGPL.Auditor.Load()
230227
aReq, commitAudit = audit.InitRequest[database.Group](rw, &audit.RequestParams{
231-
Audit: *auditor,
232-
Log: api.Logger,
233-
Request: r,
234-
Action: database.AuditActionDelete,
235-
AdditionalFields: json.RawMessage("{}"),
228+
Audit: *auditor,
229+
Log: api.Logger,
230+
Request: r,
231+
Action: database.AuditActionDelete,
236232
})
237233
)
238234
defer commitAudit()

‎enterprise/coderd/templates.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package coderd
33
import (
44
"context"
55
"database/sql"
6-
"encoding/json"
76
"fmt"
87
"net/http"
98

@@ -99,11 +98,10 @@ func (api *API) patchTemplateACL(rw http.ResponseWriter, r *http.Request) {
9998
template = httpmw.TemplateParam(r)
10099
auditor = api.AGPL.Auditor.Load()
101100
aReq, commitAudit = audit.InitRequest[database.Template](rw, &audit.RequestParams{
102-
Audit: *auditor,
103-
Log: api.Logger,
104-
Request: r,
105-
Action: database.AuditActionWrite,
106-
AdditionalFields: json.RawMessage("{}"),
101+
Audit: *auditor,
102+
Log: api.Logger,
103+
Request: r,
104+
Action: database.AuditActionWrite,
107105
})
108106
)
109107
defer commitAudit()

0 commit comments

Comments
 (0)