feat(auth): httpsig request validation #387
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -45,6 +45,6 @@ | |
| "jest-openapi": "^0.14.2", | ||
| "nock": "^13.2.4", | ||
| "openapi-types": "^12.0.0", | ||
| "typescript": "^4.3.0" | ||
| } | ||
| } | ||
This file contains 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 |
|---|---|---|
|
|
@@ -16,27 +16,11 @@ import { AccessToken } from './model' | |
| import { Access } from '../access/model' | ||
| import { AccessTokenRoutes } from './routes' | ||
| import { createContext } from '../tests/context' | ||
| import { | ||
| KID_PATH, | ||
| KEY_REGISTRY_ORIGIN, | ||
| TEST_CLIENT_KEY | ||
| } from '../grant/routes.test' | ||
|
|
||
| describe('Access Token Routes', (): void => { | ||
| let deps: IocContract<AppServices> | ||
|
|
@@ -71,7 +55,7 @@ describe('Access Token Routes', (): void => { | |
| finishMethod: FinishMethod.Redirect, | ||
| finishUri: 'https://example.com/finish', | ||
| clientNonce: crypto.randomBytes(8).toString('hex').toUpperCase(), | ||
| clientKeyId: KEY_REGISTRY_ORIGIN + KID_PATH, | ||
| interactId: v4(), | ||
| interactRef: crypto.randomBytes(8).toString('hex').toUpperCase(), | ||
| interactNonce: crypto.randomBytes(8).toString('hex').toUpperCase() | ||
|
|
@@ -92,14 +76,18 @@ describe('Access Token Routes', (): void => { | |
|
|
||
| const BASE_TOKEN = { | ||
| value: crypto.randomBytes(8).toString('hex').toUpperCase(), | ||
| managementId: v4(), | ||
|
There was a problem hiding this comment. Does that not have a path? Or is that already the parsed There was a problem hiding this comment. This is supposed to represent a row in the |
||
| expiresIn: 3600 | ||
| } | ||
|
|
||
| describe('Introspect', (): void => { | ||
| let grant: Grant | ||
| let access: Access | ||
| let token: AccessToken | ||
|
|
||
| const url = '/introspect' | ||
| const method = 'POST' | ||
|
|
||
| beforeEach(async (): Promise<void> => { | ||
| grant = await Grant.query(trx).insertAndFetch({ | ||
| ...BASE_GRANT | ||
|
|
@@ -116,61 +104,48 @@ describe('Access Token Routes', (): void => { | |
| test('Cannot introspect fake token', async (): Promise<void> => { | ||
| const ctx = createContext( | ||
| { | ||
| headers: { | ||
| Accept: 'application/json' | ||
| }, | ||
| url, | ||
| method | ||
| }, | ||
| {} | ||
| ) | ||
| ctx.request.body = { | ||
| access_token: v4(), | ||
| resource_server: 'test' | ||
| } | ||
| await expect(accessTokenRoutes.introspect(ctx)).resolves.toBeUndefined() | ||
| expect(ctx.status).toBe(404) | ||
| expect(ctx.body).toMatchObject({ | ||
| error: 'invalid_request', | ||
| message: 'token not found' | ||
| }) | ||
| }) | ||
|
|
||
| test('Successfully introspects valid token', async (): Promise<void> => { | ||
| const clientId = crypto | ||
| .createHash('sha256') | ||
| .update(TEST_CLIENT_KEY.jwk.client.id) | ||
| .digest('hex') | ||
| const scope = nock(KEY_REGISTRY_ORIGIN) | ||
| .get(KID_PATH) | ||
| .reply(200, TEST_CLIENT_KEY.jwk) | ||
|
|
||
| const ctx = createContext( | ||
| { | ||
| headers: { | ||
| Accept: 'application/json' | ||
| }, | ||
| url: '/introspect', | ||
| method: 'POST' | ||
| }, | ||
| {} | ||
| ) | ||
|
|
||
| ctx.request.body = { | ||
| access_token: token.value, | ||
| resource_server: 'test' | ||
| } | ||
| await expect(accessTokenRoutes.introspect(ctx)).resolves.toBeUndefined() | ||
|
|
@@ -179,6 +154,9 @@ describe('Access Token Routes', (): void => { | |
| expect(ctx.response.get('Content-Type')).toBe( | ||
| 'application/json; charset=utf-8' | ||
| ) | ||
|
|
||
| const testKeyWithoutClient = TEST_CLIENT_KEY.jwk | ||
| delete testKeyWithoutClient.client | ||
| expect(ctx.body).toEqual({ | ||
| active: true, | ||
| grant: grant.id, | ||
|
|
@@ -189,27 +167,41 @@ describe('Access Token Routes', (): void => { | |
| limits: access.limits | ||
| } | ||
| ], | ||
| key: { | ||
| proof: 'httpsig', | ||
| jwk: { | ||
| ...testKeyWithoutClient, | ||
| exp: expect.any(Number), | ||
| nbf: expect.any(Number), | ||
| revoked: false | ||
| } | ||
| }, | ||
| client_id: clientId | ||
| }) | ||
| scope.isDone() | ||
| }) | ||
|
|
||
| test('Successfully introspects expired token', async (): Promise<void> => { | ||
| const scope = nock(KEY_REGISTRY_ORIGIN) | ||
| .get(KID_PATH) | ||
| .reply(200, TEST_CLIENT_KEY.jwk) | ||
| const now = new Date(new Date().getTime() + 4000) | ||
| jest.useFakeTimers() | ||
| jest.setSystemTime(now) | ||
|
|
||
| const ctx = createContext( | ||
| { | ||
| headers: { | ||
| Accept: 'application/json' | ||
| }, | ||
| url: '/introspect', | ||
| method: 'POST' | ||
| }, | ||
| {} | ||
| ) | ||
|
|
||
| ctx.request.body = { | ||
| access_token: token.value, | ||
| resource_server: 'test' | ||
| } | ||
| await expect(accessTokenRoutes.introspect(ctx)).resolves.toBeUndefined() | ||
|
|
@@ -221,13 +213,18 @@ describe('Access Token Routes', (): void => { | |
| expect(ctx.body).toEqual({ | ||
| active: false | ||
| }) | ||
|
|
||
| scope.isDone() | ||
| }) | ||
| }) | ||
|
|
||
| describe('Revocation', (): void => { | ||
| let grant: Grant | ||
| let token: AccessToken | ||
| let managementId: string | ||
| let url: string | ||
|
|
||
| const method = 'DELETE' | ||
|
|
||
| beforeEach(async (): Promise<void> => { | ||
| grant = await Grant.query(trx).insertAndFetch({ | ||
|
|
@@ -237,52 +234,79 @@ describe('Access Token Routes', (): void => { | |
| grantId: grant.id, | ||
| ...BASE_TOKEN | ||
| }) | ||
| managementId = token.managementId | ||
| url = `/token/${managementId}` | ||
| }) | ||
|
|
||
| test('Returns status 204 even if token does not exist', async (): Promise<void> => { | ||
| managementId = v4() | ||
| const ctx = createContext( | ||
| { | ||
| headers: { | ||
| Accept: 'application/json' | ||
| }, | ||
| url: `/token/${managementId}`, | ||
| method | ||
| }, | ||
| { id: managementId } | ||
| ) | ||
|
|
||
| await accessTokenRoutes.revoke(ctx) | ||
| expect(ctx.response.status).toBe(204) | ||
| }) | ||
|
|
||
| test('Returns status 204 if token has not expired', async (): Promise<void> => { | ||
| const scope = nock(KEY_REGISTRY_ORIGIN) | ||
| .get(KID_PATH) | ||
| .reply(200, TEST_CLIENT_KEY.jwk) | ||
|
|
||
| const ctx = createContext( | ||
| { | ||
| headers: { | ||
| Accept: 'application/json' | ||
| }, | ||
| url, | ||
| method | ||
| }, | ||
| { id: managementId } | ||
| ) | ||
|
|
||
| ctx.request.body = { | ||
| access_token: token.value, | ||
| proof: 'httpsig', | ||
| resource_server: 'test' | ||
| } | ||
| await token.$query(trx).patch({ expiresIn: 10000 }) | ||
| await accessTokenRoutes.revoke(ctx) | ||
| expect(ctx.response.status).toBe(204) | ||
| scope.isDone() | ||
| }) | ||
|
|
||
| test('Returns status 204 if token has expired', async (): Promise<void> => { | ||
| const scope = nock(KEY_REGISTRY_ORIGIN) | ||
| .get(KID_PATH) | ||
| .reply(200, TEST_CLIENT_KEY.jwk) | ||
|
|
||
| const ctx = createContext( | ||
| { | ||
| headers: { | ||
| Accept: 'application/json' | ||
| }, | ||
| url, | ||
| method | ||
| }, | ||
| { id: managementId } | ||
| ) | ||
|
|
||
| ctx.request.body = { | ||
| access_token: token.value, | ||
| proof: 'httpsig', | ||
| resource_server: 'test' | ||
| } | ||
| await token.$query(trx).patch({ expiresIn: -1 }) | ||
| await accessTokenRoutes.revoke(ctx) | ||
| expect(ctx.response.status).toBe(204) | ||
| scope.isDone() | ||
| }) | ||
| }) | ||
|
|
||
|
|
||
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm still getting the warning and so is GitHub Actions
#387 (comment)
https://github.com/interledger/rafiki/runs/7682195245?check_suite_focus=true
I wonder if typescript should be updated in the root
package.jsonThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll try it and see what happens
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bumping typescript breaks a lot of stuff
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That doesn't make any sense because
^4.2.4actually installs4.7.2currently as the caret means any non breaking changes.