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

Jump to bottom

fix(hermes): numeric param parsing, REST middleware running before param validation #491

Merged
merged 3 commits into from
Jan 20, 2023
Merged

fix(hermes): numeric param parsing, REST middleware running before param validation #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed82edb
fix(hermes): graphql numeric param parsing
kon14 Jan 19, 2023
dd17af5
fix(hermes): rest numeric param parsing
kon14 Jan 20, 2023
c6c28cf
fix(hermes): rest middleware running before param validation
kon14 Jan 20, 2023
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
4 changes: 2 additions & 2 deletions libraries/hermes/src/GraphQl/GraphQL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@ export class GraphQLController extends ConduitRouter {
},
parseLiteral(ast) {
if (ast.kind === Kind.INT || ast.kind === Kind.FLOAT) {
return ast.value;
} else if (ast.kind == Kind.STRING) {
return Number(ast.value);
} else if (ast.kind === Kind.STRING) {
if (Number.isInteger(ast.value)) {
return Number.parseInt(ast.value);
} else if (!Number.isNaN(ast.value)) {
Expand Down
20 changes: 11 additions & 9 deletions libraries/hermes/src/Rest/Rest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,22 +144,24 @@ export class RestController extends ConduitRouter {
constructHandler(route: ConduitRoute): (req: Request, res: Response) => void {
const self = this;
return (req, res) => {
const context = extractRequestData(req);
const context = { ...extractRequestData(req), params: {} };
let hashKey: string;
const { caching, cacheAge, scope } = extractCaching(
route,
req.headers['cache-control'],
);
if (route.input.bodyParams)
validateParams(context.bodyParams, route.input.bodyParams);
if (route.input.queryParams)
validateParams(context.queryParams, route.input.queryParams);
if (route.input.urlParams) validateParams(context.urlParams, route.input.urlParams);
context.params = {
...context.bodyParams,
...context.queryParams,
...context.urlParams,
};
self
.checkMiddlewares(context, route.input.middlewares)
.then(r => {
validateParams(context.params, {
...route.input.bodyParams,
...route.input.queryParams,
...route.input.urlParams,
});
return r;
})
.then(r => {
Object.assign(context.context, r);
if (route.input.action !== ConduitRouteActions.GET) {
Expand Down
16 changes: 6 additions & 10 deletions libraries/hermes/src/Rest/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ type ConduitRequest = Request & { conduit?: Indexable };

export function extractRequestData(req: ConduitRequest) {
const context = req.conduit || {};
const params: any = {};
const urlParams: any = {};
const queryParams: any = {};
const bodyParams: any = {};
Expand All @@ -25,29 +24,26 @@ export function extractRequestData(req: ConduitRequest) {
newObj[k] = req.query[k];
}
});
Object.assign(params, newObj);
Object.assign(queryParams, newObj);
}

if (req.body) {
Object.assign(params, req.body);
Object.assign(bodyParams, req.body);
}

if (req.params) {
Object.assign(params, req.params);
Object.assign(urlParams, req.params);
}

if (params.populate) {
if (params.populate.includes(',')) {
params.populate = params.populate.split(',');
} else if (!Array.isArray(params.populate)) {
params.populate = [params.populate];
if (queryParams.populate) {
if (queryParams.populate.includes(',')) {
queryParams.populate = queryParams.populate.split(',');
} else if (!Array.isArray(queryParams.populate)) {
queryParams.populate = [queryParams.populate];
}
}
const path = req.baseUrl + req.path;
return { context, params, headers, cookies, path, urlParams, queryParams, bodyParams };
return { context, headers, cookies, path, urlParams, queryParams, bodyParams };
}

export function validateParams(params: Params, routeDefinedParams: Params) {
Expand Down