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.

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

Change AJV allErrors default and support user setting #955

Merged
merged 3 commits into from
Aug 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/framework/ajv/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ function createAjv(
const { ajvFormats, ...ajvOptions } = options;
const ajv = new AjvDraft4({
...ajvOptions,
allErrors: true,
formats: formats,
});

Expand Down
18 changes: 13 additions & 5 deletions src/framework/ajv/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,31 @@ export class AjvOptions {
constructor(options: NormalizedOpenApiValidatorOpts) {
this.options = options;
}

get preprocessor(): Options {
return this.baseOptions();
}

get response(): Options {
const { coerceTypes, removeAdditional } = <ValidateResponseOpts>(
const { allErrors, coerceTypes, removeAdditional } = <ValidateResponseOpts>(
this.options.validateResponses
);
return {
...this.baseOptions(),
allErrors,
useDefaults: false,
coerceTypes,
removeAdditional,
};
}

get request(): RequestValidatorOptions {
const { allowUnknownQueryParameters, coerceTypes, removeAdditional } = <
const { allErrors, allowUnknownQueryParameters, coerceTypes, removeAdditional } = <
ValidateRequestOpts
>this.options.validateRequests;
return {
...this.baseOptions(),
allErrors,
allowUnknownQueryParameters,
coerceTypes,
removeAdditional,
Expand All @@ -44,8 +47,13 @@ export class AjvOptions {
}

private baseOptions(): Options {
const { coerceTypes, formats, validateFormats, serDes, ajvFormats } =
this.options;
const {
coerceTypes,
formats,
validateFormats,
serDes,
ajvFormats,
} = this.options;
const serDesMap = {};
for (const serDesObject of serDes) {
if (!serDesMap[serDesObject.format]) {
Expand All @@ -69,7 +77,7 @@ export class AjvOptions {
coerceTypes,
useDefaults: true,
removeAdditional: false,
validateFormats: validateFormats,
validateFormats,
formats,
serDesMap,
ajvFormats,
Expand Down
14 changes: 14 additions & 0 deletions src/framework/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,26 @@ export interface Options extends ajv.Options {
export interface RequestValidatorOptions extends Options, ValidateRequestOpts { }

export type ValidateRequestOpts = {
/**
* Whether AJV should check all rules and collect all errors or return after the first error.
*
* This should not be set to `true` in production. See [AJV: Security risks of trusted
* schemas](https://ajv.js.org/security.html#security-risks-of-trusted-schemas).
*/
allErrors?: boolean;
allowUnknownQueryParameters?: boolean;
coerceTypes?: boolean | 'array';
removeAdditional?: boolean | 'all' | 'failing';
};

export type ValidateResponseOpts = {
/**
* Whether AJV should check all rules and collect all errors or return after the first error.
*
* This should not be set to `true` in production. See [AJV: Security risks of trusted
* schemas](https://ajv.js.org/security.html#security-risks-of-trusted-schemas).
*/
allErrors?: boolean;
removeAdditional?: boolean | 'all' | 'failing';
coerceTypes?: boolean | 'array';
onError?: (err: InternalServerError, json: any, req: Request) => void;
Expand Down
1 change: 0 additions & 1 deletion test/699.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ describe('699 serialize response components only', () => {
3005,
(app) => {
app.get([`${app.basePath}/users/:id?`], (req, res) => {
debugger;
if (typeof req.params.id !== 'string') {
throw new Error("Should be not be deserialized to ObjectId object");
}
Expand Down
3 changes: 3 additions & 0 deletions test/881.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ function createServer() {
app.use(
OpenApiValidator.middleware({
apiSpec,
validateRequests: {
allErrors: true,
},
validateResponses: true,
}),
);
Expand Down
24 changes: 16 additions & 8 deletions test/additional.props.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,22 @@ describe(packageJson.name, () => {
'resources',
'additional.properties.yaml',
);
app = await createApp({ apiSpec }, 3005, (app) =>
app.use(
`${app.basePath}/additional_props`,
express
.Router()
.post(`/false`, (req, res) => res.json(req.body))
.post(`/true`, (req, res) => res.json(req.body)),
),
app = await createApp(
{
apiSpec,
validateRequests: {
allErrors: true,
},
},
3005,
(app) =>
app.use(
`${app.basePath}/additional_props`,
express
.Router()
.post(`/false`, (req, res) => res.json(req.body))
.post(`/true`, (req, res) => res.json(req.body)),
),
);
});

Expand Down
14 changes: 7 additions & 7 deletions test/ajv.options.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ describe('AjvOptions', () => {
apiSpec: './spec',
validateApiSpec: false,
validateRequests: {
allowUnknownQueryParameters: false,
coerceTypes: false,
allowUnknownQueryParameters: false,
coerceTypes: false,
},
validateResponses: {
coerceTypes: false,
Expand Down Expand Up @@ -44,7 +44,7 @@ describe('AjvOptions', () => {
expect(options.validateSchema).to.be.false;
});

it('should not validate schema for multipar since schema is validated on startup', async () => {
it('should not validate schema for multipart since schema is validated on startup', async () => {
const ajv = new AjvOptions(baseOptions);
const options = ajv.multipart;
expect(options.validateSchema).to.be.false;
Expand All @@ -60,7 +60,7 @@ describe('AjvOptions', () => {
},
],
});
const options = ajv.multipart;
const options = ajv.preprocessor;
expect(options.serDesMap['custom-1']).has.property('deserialize');
expect(options.serDesMap['custom-1']).does.not.have.property('serialize');
});
Expand All @@ -75,7 +75,7 @@ describe('AjvOptions', () => {
},
],
});
const options = ajv.multipart;
const options = ajv.preprocessor;
expect(options.serDesMap).has.property('custom-1');
expect(options.serDesMap['custom-1']).has.property('serialize');
expect(options.serDesMap['custom-1']).does.not.have.property('deserialize');
Expand All @@ -92,7 +92,7 @@ describe('AjvOptions', () => {
},
],
});
const options = ajv.multipart;
const options = ajv.preprocessor;
expect(options.serDesMap).has.property('custom-1');
expect(options.serDesMap['custom-1']).has.property('serialize');
expect(options.serDesMap['custom-1']).has.property('deserialize');
Expand All @@ -116,7 +116,7 @@ describe('AjvOptions', () => {
},
],
});
const options = ajv.multipart;
const options = ajv.preprocessor;
expect(options.serDesMap).has.property('custom-1');
expect(options.serDesMap['custom-1']).has.property('serialize');
expect(options.serDesMap['custom-1']).has.property('deserialize');
Expand Down
106 changes: 106 additions & 0 deletions test/all-errors.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import * as path from 'path';
import * as request from 'supertest';
import { expect } from 'chai';
import { createApp } from './common/app';

describe('request body validation with and without allErrors', () => {
let allErrorsApp;
let notAllErrorsApp;

const defineRoutes = (app) => {
app.post(`${app.basePath}/persons`, (req, res) => {
res.send({ success: true });
});
app.get(`${app.basePath}/persons`, (req, res) => {
res.send({ bname: req.query.bname });
});
};

before(async () => {
const apiSpec = path.join('test', 'resources', 'multiple-validations.yaml');

allErrorsApp = await createApp(
{
apiSpec,
formats: {
'starts-with-b': (v) => /^b/i.test(v),
},
validateRequests: {
allErrors: true,
},
validateResponses: {
allErrors: true,
},
},
3005,
defineRoutes,
true,
);

notAllErrorsApp = await createApp(
{
apiSpec,
formats: {
'starts-with-b': (v) => /^b/i.test(v),
},
validateResponses: true,
},
3006,
defineRoutes,
true,
);
});

after(() => {
allErrorsApp.server.close();
notAllErrorsApp.server.close();
});

it('should return 200 if short b-name is posted', async () =>
request(allErrorsApp)
.post(`${allErrorsApp.basePath}/persons`)
.set('content-type', 'application/json')
.send({ bname: 'Bob' })
.expect(200));

it('should return 200 if short b-name is fetched', async () =>
request(allErrorsApp)
.get(`${allErrorsApp.basePath}/persons?bname=Bob`)
.expect(200));

it('should include all request validation errors when allErrors=true', async () =>
request(allErrorsApp)
.post(`${allErrorsApp.basePath}/persons`)
.set('content-type', 'application/json')
.send({ bname: 'Maximillian' })
.expect(400)
.then((res) => {
expect(res.body.errors).to.have.lengthOf(2);
}));

it('should include only first request validation error when allErrors=false', async () =>
request(notAllErrorsApp)
.post(`${notAllErrorsApp.basePath}/persons`)
.set('content-type', 'application/json')
.send({ bname: 'Maximillian' })
.expect(400)
.then((res) => {
expect(res.body.errors).to.have.lengthOf(1);
}));

it('should include all response validation errors when allErrors=true', async () =>
request(allErrorsApp)
.get(`${allErrorsApp.basePath}/persons?bname=Maximillian`)
.expect(500)
.then((res) => {
expect(res.body.errors).to.have.lengthOf(2);
}));

it('should include only first response validation error when allErrors=false', async () =>
request(notAllErrorsApp)
.get(`${notAllErrorsApp.basePath}/persons?bname=Maximillian`)
.expect(500)
.then((res) => {
expect(res.body.errors).to.have.lengthOf(1);
}));
});
18 changes: 13 additions & 5 deletions test/all.of.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,19 @@ describe(packageJson.name, () => {
before(async () => {
// Set up the express app
const apiSpec = path.join('test', 'resources', 'all.of.yaml');
app = await createApp({ apiSpec }, 3005, (app) =>
app.use(
`${app.basePath}`,
express.Router().post(`/all_of`, (req, res) => res.json(req.body)),
),
app = await createApp(
{
apiSpec,
validateRequests: {
allErrors: true,
},
},
3005,
(app) =>
app.use(
`${app.basePath}`,
express.Router().post(`/all_of`, (req, res) => res.json(req.body)),
),
);
});

Expand Down
22 changes: 14 additions & 8 deletions test/empty.servers.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,19 @@ describe('empty servers', () => {
before(async () => {
// Set up the express app
const apiSpec = path.join('test', 'resources', 'empty.servers.yaml');
app = await createApp({ apiSpec }, 3007, app =>
app.use(
``,
express
.Router()
.get(`/pets`, (req, res) => res.json(req.body)),
),
app = await createApp(
{
apiSpec,
validateRequests: {
allErrors: true,
},
},
3007,
(app) =>
app.use(
``,
express.Router().get(`/pets`, (req, res) => res.json(req.body)),
),
);
});

Expand All @@ -28,7 +34,7 @@ describe('empty servers', () => {
request(app)
.get(`/pets`)
.expect(400)
.then(r => {
.then((r) => {
expect(r.body.errors).to.be.an('array');
expect(r.body.errors).to.have.length(2);
}));
Expand Down
3 changes: 3 additions & 0 deletions test/multi.spec.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ function createServer() {
app.use(
OpenApiValidator.middleware({
apiSpec,
validateRequests: {
allErrors: true,
},
}),
);

Expand Down
Loading
Loading