Skip to content

fix: harden auth token handling #1864

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

Open
nguyenlnp wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: harden auth token handling #1864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions storage/framework/core/auth/src/email-verification.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,26 @@ export interface EmailVerificationResult {
*/
function generateVerificationToken(userId: number): { token: string, hash: string } {
const nonce = randomBytes(32).toString('hex')
const appKey = config.app.key || 'stacks-default-key'
const appKey = getAppKey()
const payload = `${userId}:${nonce}`
const hash = createHmac('sha256', appKey).update(payload).digest('hex')
return { token: nonce, hash }
}

function getAppKey(): string {
const appKey = config.app.key
if (typeof appKey !== 'string' || appKey.length === 0) {
throw new Error('[auth/email-verification] Missing config.app.key; refusing to sign verification tokens with a fallback key')
}

return appKey
}

/**
* Verify a token matches the stored hash
*/
function verifyToken(userId: number, token: string, storedHash: string): boolean {
const appKey = config.app.key || 'stacks-default-key'
const appKey = getAppKey()
const payload = `${userId}:${token}`
const hash = createHmac('sha256', appKey).update(payload).digest('hex')
const a = Buffer.from(hash)
Expand Down
6 changes: 6 additions & 0 deletions storage/framework/core/auth/src/password/reset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ export function passwordResets(email: string): PasswordResetActions {
const token = generateResetToken()
const hashedToken = await makeHash(token, { algorithm: 'bcrypt' })

await db
.deleteFrom('password_resets')
.where('email', '=', email)
.execute()

await db
.insertInto('password_resets')
.values({
Expand Down Expand Up @@ -139,6 +144,7 @@ export function passwordResets(email: string): PasswordResetActions {
const resetRecord = await trx
.selectFrom('password_resets')
.where('email', '=', email)
.orderBy('created_at', 'desc')
.selectAll()
.executeTakeFirst()

Expand Down
Loading