Skip to content
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

[SDK-1714] [SDK-1723] Session cookie checks #111

Merged
merged 6 commits into from
Jul 9, 2020
Merged

[SDK-1714] [SDK-1723] Session cookie checks #111

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
9828fd5
Refactor the tests a little to use a server
adamjmcgrath Jul 7, 2020
4b195be
Merge branch 'beta-2' into session-cookie-checks
adamjmcgrath Jul 7, 2020
7bf6b77
simplify test
adamjmcgrath Jul 8, 2020
0088789
tests for unordered cookie chunks
adamjmcgrath Jul 8, 2020
965e4cc
Test format changes for transient handler
adamjmcgrath Jul 9, 2020
08a7350
Update lib/transientHandler.js
adamjmcgrath Jul 9, 2020
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
11 changes: 6 additions & 5 deletions lib/appSession.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,14 @@ module.exports = (config) => {
// concat
debug.trace('reading session chunks');
existingSessionValue = Object.entries(req[COOKIES]).map(([cookie, value]) => {
if (cookie.match(`^${sessionName}(?:\\.\\d)$`)) {
return [cookie, value];
const match = cookie.match(`^${sessionName}\\.(\\d+)$`);
if (match) {
return [match[1], value];
}
}).filter(Boolean).sort(([a], [b]) => {
return parseInt(b, 10) - parseInt(a, 10);
}).map(([cookie, chunk]) => {
debug.trace(`reading session chunk from ${cookie} cookie`);
return parseInt(a, 10) - parseInt(b, 10);
}).map(([i, chunk]) => {
debug.trace(`reading session chunk from ${sessionName}.${i} cookie`);
return chunk;
}).join('');
}
Expand Down
6 changes: 3 additions & 3 deletions lib/transientHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ const { generators } = require('openid-client');
const { JWKS, JWS, JWK } = require('jose');
const { signing: deriveKey } = require('./hkdf');

const HEADER = 'eyJhbGciOiJIUzI1NiIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19';
const header = { alg: 'HS256', b64: false, crit: ['b64'] };
const getPayload = (cookie, value) => Buffer.from(`${cookie}=${value}`);
const flattenedJWSFromCookie = (cookie, value, signature) => ({
protected: HEADER,
protected: Buffer.from(JSON.stringify(header)).toString('base64').replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_'),
payload: getPayload(cookie, value),
signature
});
const generateSignature = (cookie, value, key) => {
const payload = getPayload(cookie, value);
return JWS.sign.flattened(payload, key, { alg: 'HS256', b64: false, crit: ['b64'] }).signature;
return JWS.sign.flattened(payload, key, header).signature;
};
const verifySignature = (cookie, value, signature, keystore) => {
try {
Expand Down
Loading