Remove session id round 4 #134
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ const test = require('tap').test | |
| const Signer = require('@fastify/cookie').Signer | ||
| const fastifyPlugin = require('fastify-plugin') | ||
| const { DEFAULT_OPTIONS, DEFAULT_COOKIE, DEFAULT_SESSION_ID, DEFAULT_SECRET, DEFAULT_ENCRYPTED_SESSION_ID, buildFastify } = require('./util') | ||
| const Store = require('../lib/fastifySession').Store | ||
|
|
||
| test('should not set session cookie on post without params', async (t) => { | ||
| t.plan(3) | ||
|
|
@@ -20,6 +21,36 @@ test('should not set session cookie on post without params', async (t) => { | |
| t.same(response.headers['set-cookie'], undefined) | ||
| }) | ||
|
|
||
| test('should save the session properly', async (t) => { | ||
|
Uzlopak marked this conversation as resolved.
|
||
| t.plan(6) | ||
| const store = new Store() | ||
| const fastify = await buildFastify((request, reply) => { | ||
| request.session.test = true | ||
|
|
||
| request.session.save(() => { | ||
| const storeMap = store.store | ||
| // Only one session | ||
| t.equal(storeMap.size, 1) | ||
|
|
||
| const session = [...storeMap.entries()][0][1] | ||
| const keys = Object.keys(session) | ||
|
|
||
| // Only storing three keys: cookie, encryptedSessionId and test | ||
| t.equal(keys.length, 3) | ||
| t.ok(session.cookie) | ||
| t.ok(session.encryptedSessionId) | ||
| t.equal(session.test, true) | ||
| }) | ||
| reply.send() | ||
| }, { ...DEFAULT_OPTIONS, store }) | ||
| t.teardown(() => fastify.close()) | ||
|
|
||
| const response = await fastify.inject({ | ||
| url: '/' | ||
| }) | ||
| t.equal(response.statusCode, 200) | ||
| }) | ||
|
|
||
| test('should set session cookie', async (t) => { | ||
| t.plan(4) | ||
| const fastify = await buildFastify((request, reply) => { | ||
|
|
@@ -46,35 +77,62 @@ test('should set session cookie', async (t) => { | |
| }) | ||
|
|
||
| test('should support multiple secrets', async (t) => { | ||
| t.plan(10) | ||
| const sign = require('@fastify/cookie/signer').sign | ||
|
|
||
| const newSecret = 'geheim' | ||
|
|
||
| const sessionId = 'aYb4uTIhdBXCfk_ylik4QN6-u26K0u0e' | ||
| const sessionIdSignedWithOldSecret = sign(sessionId, DEFAULT_SECRET) | ||
| const sessionIdSignedWithNewSecret = sign(sessionId, newSecret) | ||
|
|
||
| const storeMap = new Map() | ||
| const store = new Store(storeMap) | ||
|
|
||
| storeMap.set(sessionId, { | ||
| test: 0, | ||
| cookie: {} | ||
| }) | ||
|
|
||
| const options = { | ||
| secret: [newSecret, DEFAULT_SECRET], | ||
| store | ||
| } | ||
|
|
||
| let counter = 0 | ||
| const fastify = await buildFastify( | ||
| async function handler (request, reply) { | ||
| t.equal(request.session.sessionId, sessionId) | ||
| t.equal(request.session.test, counter) | ||
|
|
||
| request.session.test = ++counter | ||
| await request.session.save() | ||
| reply.send(200) | ||
| }, options) | ||
|
|
||
| t.teardown(() => fastify.close()) | ||
|
|
||
| const response1 = await fastify.inject({ | ||
| url: '/', | ||
| headers: { | ||
| 'x-forwarded-proto': 'https', | ||
| cookie: `sessionId=${sessionIdSignedWithOldSecret}; Path=/; HttpOnly; Secure` | ||
| } | ||
| }) | ||
| t.equal(response1.statusCode, 200) | ||
| t.ok(response1.headers['set-cookie'].includes(encodeURIComponent(sessionIdSignedWithNewSecret))) | ||
|
|
||
|
Uzlopak marked this conversation as resolved.
|
||
| const response2 = await fastify.inject({ | ||
| url: '/', | ||
| headers: { | ||
| 'x-forwarded-proto': 'https', | ||
| cookie: `sessionId=${sessionIdSignedWithNewSecret}; Path=/; HttpOnly; Secure` | ||
| } | ||
| }) | ||
| t.not(storeMap.get(sessionId).sessionId) | ||
| t.equal(storeMap.get(sessionId).test, 2) | ||
| t.equal(response2.statusCode, 200) | ||
| t.equal(response2.headers['set-cookie'].includes(sessionId), true) | ||
| }) | ||
|
|
||
| test('should set session cookie using the specified cookie name', async (t) => { | ||
|
|
@@ -100,20 +158,11 @@ test('should set session cookie using the specified cookie name', async (t) => { | |
|
|
||
| test('should set session cookie using the default cookie name', async (t) => { | ||
| t.plan(2) | ||
|
Uzlopak marked this conversation as resolved.
|
||
| function handler (request, reply) { | ||
| request.session.test = {} | ||
| reply.send(200) | ||
| } | ||
| const fastify = await buildFastify(handler, DEFAULT_OPTIONS) | ||
|
Uzlopak marked this conversation as resolved.
|
||
| t.teardown(() => fastify.close()) | ||
|
|
||
| const response = await fastify.inject({ | ||
|
|
@@ -125,7 +174,7 @@ test('should set session cookie using the default cookie name', async (t) => { | |
| }) | ||
|
|
||
| t.equal(response.statusCode, 200) | ||
| t.match(response.headers['set-cookie'], /sessionId=[\w-]{32}.[\w-%]{43,57}; Path=\/; HttpOnly; Secure/) | ||
| }) | ||
|
|
||
| test('should set express sessions using the specified cookiePrefix', async (t) => { | ||
|
|
@@ -163,11 +212,14 @@ test('should set express sessions using the specified cookiePrefix', async (t) = | |
| }) | ||
|
|
||
| test('should create new session on expired session', async (t) => { | ||
| t.plan(3) | ||
|
|
||
| const DateNow = Date.now | ||
| const now = Date.now() | ||
| Date.now = () => now | ||
| const plugin = fastifyPlugin(async (fastify, opts) => { | ||
| fastify.addHook('onRequest', (request, reply, done) => { | ||
| request.sessionStore.set(DEFAULT_SESSION_ID, { | ||
| cookie: { secure: true, httpOnly: true, path: '/', expires: Date.now() - 1000 } | ||
| }, done) | ||
| }) | ||
|
|
@@ -180,7 +232,10 @@ test('should create new session on expired session', async (t) => { | |
| cookie: { maxAge: 100 } | ||
| } | ||
| const fastify = await buildFastify(handler, options, plugin) | ||
| t.teardown(() => { | ||
| fastify.close() | ||
| Date.now = DateNow | ||
| }) | ||
|
|
||
| const response = await fastify.inject({ | ||
| url: '/', | ||
|
|
@@ -191,7 +246,8 @@ test('should create new session on expired session', async (t) => { | |
| }) | ||
|
|
||
| t.equal(response.statusCode, 200) | ||
| t.not(response.headers['set-cookie'].includes(DEFAULT_SESSION_ID)) | ||
| t.match(response.headers['set-cookie'], RegExp(`sessionId=.*; Path=/; Expires=${new Date(now + 100).toUTCString()}; HttpOnly; Secure`)) | ||
| }) | ||
|
|
||
| test('should set session.cookie.expires if maxAge', async (t) => { | ||
|
|
@@ -223,7 +279,7 @@ test('should set new session cookie if expired', async (t) => { | |
| fastify.addHook('onRequest', (request, reply, done) => { | ||
| request.sessionStore.set(DEFAULT_SESSION_ID, { | ||
| cookie: { | ||
|
Contributor
Author
There was a problem hiding this comment. This test was wrong and passed due to a bug, as explained here: |
||
| expires: Date.now() - 1000 | ||
| } | ||
| }, done) | ||
| }) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.