Skip to content

refactor(backend): validate cookie-derived values in lastfm/spotify routes #1729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LucasSantana-Dev merged 6 commits into from
Jul 9, 2026
Merged

refactor(backend): validate cookie-derived values in lastfm/spotify routes #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
699c15f
refactor(backend): validate cookie-derived values in lastfm/spotify r…
LucasSantana-Dev Jul 9, 2026
61ab5be
fix(backend): restore optional chaining on cookie access in oauth cal…
LucasSantana-Dev Jul 9, 2026
5cdffde
fix(lint): type raw cookie extraction as unknown to satisfy eslint
LucasSantana-Dev Jul 9, 2026
d805d13
Merge branch 'main' into fix-1627-route-casts
LucasSantana-Dev Jul 9, 2026
b2c2aa4
Merge branch 'main' into fix-1627-route-casts
LucasSantana-Dev Jul 9, 2026
098cb67
Merge branch 'main' into fix-1627-route-casts
LucasSantana-Dev Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions packages/backend/src/routes/lastfm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@

const LASTFM_STATE_COOKIE = 'lastfm_state'
const STATE_MAX_AGE_SEC = 600

const lastFmCallbackQuery = z.object({
token: z.string().min(1),
state: z.string().min(1).optional(),
})

// Schema for validating the state value extracted from cookies
const stateCookieSchema = z.string().min(1, 'State cookie must be non-empty')

function getLinkSecret(): string {
const secret =
process.env.LASTFM_LINK_SECRET || process.env.WEBAPP_SESSION_SECRET
Expand Down Expand Up @@ -197,8 +201,7 @@
app.get('/api/lastfm/callback', apiLimiter, async (req: Request, res: Response) => {
const frontendUrl = getFrontendUrl()
try {
const cookies = req.cookies as Record<string, unknown> | undefined
const stateFromCookie = cookies?.[LASTFM_STATE_COOKIE]
// Validate query parameters
const parsedQuery = lastFmCallbackQuery.safeParse(req.query)
res.clearCookie(LASTFM_STATE_COOKIE, { path: '/' })

Expand All @@ -208,12 +211,18 @@
)
}

// Extract and validate state from query or cookies
const stateFromQuery = parsedQuery.data.state
const stateFromCookieRaw: unknown =
req.cookies?.[LASTFM_STATE_COOKIE]
const stateFromCookieValidated = stateCookieSchema.safeParse(stateFromCookieRaw)

const state =
typeof parsedQuery.data.state === 'string'
? parsedQuery.data.state
: typeof stateFromCookie === 'string'
? stateFromCookie
typeof stateFromQuery === 'string'
? stateFromQuery
: stateFromCookieValidated.success
? stateFromCookieValidated.data
: null

Check warning on line 225 in packages/backend/src/routes/lastfm.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested ternary operation into an independent statement. 


See more on https://sonarcloud.io/project/issues?id=LucasSantana-Dev_Lucky&issues=AZ9F91Mg2PX0OknjLEVb&open=AZ9F91Mg2PX0OknjLEVb&pullRequest=1729

if (!state) {
return res.redirect(
Expand Down
20 changes: 14 additions & 6 deletions packages/backend/src/routes/spotify.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
state: z.string().min(1).optional(),
})

// Schema for validating the state value extracted from cookies
const stateCookieSchema = z.string().min(1, 'State cookie must be non-empty')

function getLinkSecret(): string {
const secret =
process.env.SPOTIFY_LINK_SECRET || process.env.WEBAPP_SESSION_SECRET
Expand Down Expand Up @@ -196,8 +199,7 @@
apiLimiter,
asyncHandler(async (req: Request, res: Response) => {
const frontendUrl = getFrontendUrl()
const cookies = req.cookies as Record<string, unknown> | undefined
const stateFromCookie = cookies?.[SPOTIFY_STATE_COOKIE]
// Validate query parameters
const parsedQuery = spotifyCallbackQuery.safeParse(req.query)
res.clearCookie(SPOTIFY_STATE_COOKIE, { path: '/' })

Expand All @@ -207,12 +209,18 @@
)
}

// Extract and validate state from query or cookies
const stateFromQuery = parsedQuery.data.state
const stateFromCookieRaw: unknown =
req.cookies?.[SPOTIFY_STATE_COOKIE]
const stateFromCookieValidated = stateCookieSchema.safeParse(stateFromCookieRaw)

const state =
typeof parsedQuery.data.state === 'string'
? parsedQuery.data.state
: typeof stateFromCookie === 'string'
? stateFromCookie
typeof stateFromQuery === 'string'
? stateFromQuery
: stateFromCookieValidated.success
? stateFromCookieValidated.data
: null

Check warning on line 223 in packages/backend/src/routes/spotify.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested ternary operation into an independent statement. 


See more on https://sonarcloud.io/project/issues?id=LucasSantana-Dev_Lucky&issues=AZ9F91FU2PX0OknjLEVa&open=AZ9F91FU2PX0OknjLEVa&pullRequest=1729

if (!state) {
return res.redirect(
Expand Down
Loading