Skip to content

fix: header and cookie params were not returned correctly #43

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
birme merged 1 commit into from
Apr 9, 2025
Merged

fix: header and cookie params were not returned correctly #43

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
96 changes: 96 additions & 0 deletions src/validators/http.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ describe('HTTP Request CAT Validator with auto renew', () => {
type: 'automatic',
'header-name': 'cta-common-access-token',
'cookie-name': 'cta-common-access-token',
'cookie-params': ['Secure', 'HttpOnly', 'Domain=.eyevinn.technology'],
code: 301,
expadd: 120,
deadline: 60
Expand Down Expand Up @@ -374,6 +375,28 @@ describe('HTTP Request CAT Validator with auto renew', () => {
],
issuer: 'eyevinn'
});
const now = Math.floor(Date.now() / 1000);
base64encoded = await generator.generate(
{
iss: 'eyevinn',
exp: now + 60,
catr: CommonAccessTokenRenewal.fromDict({
type: 'header',
'header-name': 'cta-common-access-token',
'cookie-name': 'cta-common-access-token',
'header-params': ['Secure', 'HttpOnly', 'Domain=.eyevinn.technology'],
code: 301,
expadd: 120,
deadline: 60
}).payload
},
{
type: 'mac',
alg: 'HS256',
kid: 'Symmetric256',
generateCwtId: true
}
);
const request = createRequest({
method: 'GET',
headers: {
Expand All @@ -383,6 +406,9 @@ describe('HTTP Request CAT Validator with auto renew', () => {
const response = createResponse();
const result = await httpValidator.validateHttpRequest(request, response);
expect(result.status).toBe(200);
expect(response.getHeader('cta-common-access-token')).toMatch(
/^(\S+); Secure; HttpOnly; Domain=.eyevinn.technology/
);
expect(response.getHeader('cta-common-access-token')).toBeDefined();

const renewDisabled = new HttpValidator({
Expand All @@ -404,6 +430,75 @@ describe('HTTP Request CAT Validator with auto renew', () => {
expect(response2.getHeader('cta-common-access-token')).toBeUndefined();
});

test('can autorenew and set cookie when autorenew is enabled', async () => {
// Validate and auto renew
const httpValidator = new HttpValidator({
keys: [
{
kid: 'Symmetric256',
key: Buffer.from(
'403697de87af64611c1d32a05dab0fe1fcb715a86ab435f1ec99192d79569388',
'hex'
)
}
],
issuer: 'eyevinn'
});
const now = Math.floor(Date.now() / 1000);
base64encoded = await generator.generateFromJson(
{
iss: 'eyevinn',
exp: now + 60,
catr: {
type: 'cookie',
'header-name': 'cta-common-access-token',
'cookie-name': 'cta-common-access-token',
'cookie-params': ['Secure', 'HttpOnly', 'Domain=.eyevinn.technology'],
code: 301,
expadd: 120,
deadline: 60
}
},
{
type: 'mac',
alg: 'HS256',
kid: 'Symmetric256',
generateCwtId: true
}
);
const request = createRequest({
method: 'GET',
headers: {
'CTA-Common-Access-Token': base64encoded
}
});
const response = createResponse();
const result = await httpValidator.validateHttpRequest(request, response);
expect(result.status).toBe(200);
expect(response.getHeader('set-cookie')).toBeDefined();
expect(response.getHeader('set-cookie')).toMatch(
/^cta-common-access-token=(\S+); Secure; HttpOnly; Domain=.eyevinn.technology/
);

const renewDisabled = new HttpValidator({
keys: [
{
kid: 'Symmetric256',
key: Buffer.from(
'403697de87af64611c1d32a05dab0fe1fcb715a86ab435f1ec99192d79569388',
'hex'
)
}
],
issuer: 'eyevinn',
autoRenewEnabled: false
});
const response2 = createResponse();
const result2 = await renewDisabled.validateHttpRequest(request, response2);
expect(result2.status).toBe(200);
expect(response2.getHeader('cta-common-access-token')).toBeUndefined();
});

test('can autorenew when autorenew is enabled and only when token is about to expire', async () => {
base64encoded = await generator.generate(
{
Expand All @@ -413,6 +508,7 @@ describe('HTTP Request CAT Validator with auto renew', () => {
type: 'automatic',
'header-name': 'cta-common-access-token',
'cookie-name': 'cta-common-access-token',
'cookie-params': ['Secure', 'HttpOnly', 'Domain=.a2d.tv'],
code: 302,
expadd: 120,
deadline: 60
Expand Down
17 changes: 14 additions & 3 deletions src/validators/http.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { ICTIStore } from '../stores/interface';
import { ITokenLogger } from '../loggers/interface';
import { CatIfDictValue } from '../catif';
import { toBase64NoPadding } from '../util';
import { Log } from '../log';

interface HttpValidatorKey {
kid: string;
Expand Down Expand Up @@ -459,7 +460,13 @@ export class HttpValidator {
response.setHeader(
catr['header-name'] || headerName,
renewedToken +
(catr['header-params'] ? `;${catr['header-params']}` : '')
(catr['header-params']
? `; ${
Array.isArray(catr['header-params'])
? catr['header-params'].join('; ')
: catr['header-params']
}`
: '')
);
} else if (
catr.type === 'cookie' ||
Expand All @@ -468,8 +475,12 @@ export class HttpValidator {
const cookieName = catr['cookie-name'] || 'cta-common-access-token';
response.setHeader(
'Set-Cookie',
`${cookieName}=${renewedToken}${
catr['cookie-params'] ? '; ' + catr['cookie-params'] : ''
`${cookieName}=${renewedToken}; ${
catr['cookie-params']
? '; ' + Array.isArray(catr['cookie-params'])
? catr['cookie-params'].join('; ')
: catr['cookie-params']
: ''
}`
);
} else if (
Expand Down
Loading