add session id to signed token

mafredri · mafredri · commit 357eec2b293f · 2023-08-16T10:39:40.000Z
diff --git a/coderd/workspaceapps/stats.go b/coderd/workspaceapps/stats.go
@@ -42,7 +42,7 @@ func newStatsReportFromSignedToken(token SignedToken) StatsReport {
 		AgentID:          token.AgentID,
 		AccessMethod:     token.AccessMethod,
 		SlugOrPort:       token.AppSlugOrPort,
-		SessionID:        uuid.New(),
+		SessionID:        token.SessionID,
 		SessionStartedAt: database.Now(),
 		Requests:         1,
 	}
diff --git a/coderd/workspaceapps/token.go b/coderd/workspaceapps/token.go
@@ -27,6 +27,8 @@ type SignedToken struct {
 	// Request details.
 	Request `json:"request"`
 
+	SessionID uuid.UUID `json:"session_id"`
+
 	// Trusted resolved details.
 	Expiry      time.Time `json:"expiry"` // set by GenerateToken if unset
 	UserID      uuid.UUID `json:"user_id"`
@@ -250,6 +252,8 @@ func FromRequest(r *http.Request, key SecurityKey) (*SignedToken, bool) {
 
 			err := req.Validate()
 			if err == nil {
+				token.SessionID = uuid.New()
+
 				// The request has a valid signed app token, which is a valid
 				// token signed by us. The caller must check that it matches
 				// the request.

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func newStatsReportFromSignedToken(token SignedToken) StatsReport {`
`42`	`42`	`AgentID: token.AgentID,`
`43`	`43`	`AccessMethod: token.AccessMethod,`
`44`	`44`	`SlugOrPort: token.AppSlugOrPort,`
`45`		`- SessionID: uuid.New(),`
	`45`	`+ SessionID: token.SessionID,`
`46`	`46`	`SessionStartedAt: database.Now(),`
`47`	`47`	`Requests: 1,`
`48`	`48`	`}`