@takaro/http 0.0.1 → 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app.js.map +1 -1
- package/dist/controllers/meta.js +2 -4
- package/dist/controllers/meta.js.map +1 -1
- package/dist/main.d.ts +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/middleware/errorHandler.js +9 -1
- package/dist/middleware/errorHandler.js.map +1 -1
- package/dist/middleware/logger.js +1 -1
- package/dist/middleware/logger.js.map +1 -1
- package/dist/middleware/metrics.js +1 -4
- package/dist/middleware/metrics.js.map +1 -1
- package/dist/util/apiResponse.js +1 -2
- package/dist/util/apiResponse.js.map +1 -1
- package/package.json +1 -4
- package/src/app.ts +6 -3
- package/src/controllers/meta.ts +3 -5
- package/src/main.ts +1 -1
- package/src/middleware/__tests__/rateLimit.integration.test.ts +10 -7
- package/src/middleware/errorHandler.ts +12 -2
- package/src/middleware/logger.ts +1 -1
- package/src/middleware/metrics.ts +2 -4
- package/src/util/apiResponse.ts +8 -2
- package/dist/middleware/adminAuth.d.ts +0 -2
- package/dist/middleware/adminAuth.js +0 -27
- package/dist/middleware/adminAuth.js.map +0 -1
- package/src/middleware/__tests__/adminAuth.unit.test.ts +0 -65
- package/src/middleware/adminAuth.ts +0 -33
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,OAAwB,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAU,YAAY,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAA6B,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAO5E,MAAM,OAAO,IAAI;IAKf,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
package/dist/controllers/meta.js
CHANGED
|
@@ -7,11 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { Controller, Get } from 'routing-controllers';
|
|
11
|
-
import { getMetadataArgsStorage } from 'routing-controllers';
|
|
12
|
-
import { routingControllersToSpec } from 'routing-controllers-openapi';
|
|
10
|
+
import { Controller, Get, getMetadataArgsStorage } from 'routing-controllers';
|
|
13
11
|
import { validationMetadatasToSchemas } from 'class-validator-jsonschema';
|
|
14
|
-
import { ResponseSchema } from 'routing-controllers-openapi';
|
|
12
|
+
import { routingControllersToSpec, ResponseSchema } from 'routing-controllers-openapi';
|
|
15
13
|
import { IsBoolean } from 'class-validator';
|
|
16
14
|
import { getMetrics, health } from '@takaro/util';
|
|
17
15
|
import { PERMISSIONS } from '@takaro/auth';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meta.js","sourceRoot":"","sources":["../../src/controllers/meta.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"meta.js","sourceRoot":"","sources":["../../src/controllers/meta.ts"],"names":[],"mappings":"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"}
|
package/dist/main.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { HTTP } from './app.js';
|
|
2
2
|
export * from './middleware/metrics.js';
|
|
3
3
|
export { createRateLimitMiddleware } from './middleware/rateLimit.js';
|
|
4
|
-
export { adminAuthMiddleware } from './middleware/adminAuth.js';
|
|
5
4
|
export { paginationMiddleware } from './middleware/paginationMiddleware.js';
|
|
6
5
|
export { apiResponse, APIOutput } from './util/apiResponse.js';
|
|
6
|
+
export { ErrorHandler } from './middleware/errorHandler.js';
|
package/dist/main.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { HTTP } from './app.js';
|
|
2
2
|
export * from './middleware/metrics.js';
|
|
3
3
|
export { createRateLimitMiddleware } from './middleware/rateLimit.js';
|
|
4
|
-
export { adminAuthMiddleware } from './middleware/adminAuth.js';
|
|
5
4
|
export { paginationMiddleware } from './middleware/paginationMiddleware.js';
|
|
6
5
|
export { apiResponse, APIOutput } from './util/apiResponse.js';
|
|
6
|
+
export { ErrorHandler } from './middleware/errorHandler.js';
|
|
7
7
|
//# sourceMappingURL=main.js.map
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAEhC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAEhC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC"}
|
|
@@ -8,7 +8,7 @@ _next) {
|
|
|
8
8
|
let status = 500;
|
|
9
9
|
let parsedError = new errors.InternalServerError();
|
|
10
10
|
if (originalError.name === 'BadRequestError') {
|
|
11
|
-
if (
|
|
11
|
+
if (Object.prototype.hasOwnProperty.call(originalError, 'errors')) {
|
|
12
12
|
// @ts-expect-error Error typing is weird in ts... but we validate during runtime so should be OK
|
|
13
13
|
const validationErrors = originalError['errors'];
|
|
14
14
|
parsedError = new errors.ValidationError('Validation error', validationErrors);
|
|
@@ -26,6 +26,14 @@ _next) {
|
|
|
26
26
|
status = 400;
|
|
27
27
|
parsedError = new errors.BadRequestError('Missing required field');
|
|
28
28
|
}
|
|
29
|
+
if (originalError.name === 'CheckViolationError') {
|
|
30
|
+
status = 400;
|
|
31
|
+
parsedError = new errors.BadRequestError('Invalid data provided');
|
|
32
|
+
}
|
|
33
|
+
if ('constraint' in originalError && originalError['constraint'] === 'currency_positive') {
|
|
34
|
+
status = 400;
|
|
35
|
+
parsedError = new errors.BadRequestError('Not enough currency');
|
|
36
|
+
}
|
|
29
37
|
if (originalError instanceof errors.TakaroError) {
|
|
30
38
|
status = originalError.http;
|
|
31
39
|
parsedError = originalError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../src/middleware/errorHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,MAAM,GAAG,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAEnC,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,aAAoB,EACpB,GAAY,EACZ,GAAa;AACb,6DAA6D;AAC7D,KAAmB;IAEnB,IAAI,MAAM,GAAG,GAAG,CAAC;IACjB,IAAI,WAAW,GAAG,IAAI,MAAM,CAAC,mBAAmB,EAAE,CAAC;IAEnD,IAAI,aAAa,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAC7C,IAAI,
|
|
1
|
+
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../src/middleware/errorHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { logger, ctx } from '@takaro/util';
|
|
2
|
+
import { context, trace } from '@opentelemetry/api';
|
|
2
3
|
const SUPPRESS_BODY_KEYWORDS = ['password', 'newPassword'];
|
|
3
4
|
const HIDDEN_ROUTES = ['/metrics', '/health', '/healthz', '/ready', '/readyz', '/queues/api/queues'];
|
|
4
|
-
import { context, trace } from '@opentelemetry/api';
|
|
5
5
|
const log = logger('http');
|
|
6
6
|
/**
|
|
7
7
|
* This middleware is called very early in the request lifecycle, so it's
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,sBAAsB,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAC3D,MAAM,aAAa,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,oBAAoB,CAAC,CAAC;AACrG,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAE3B;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AAErE,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IAC9E,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACrE,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAElC,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAE9G,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,WAAW,EAAE,EAAE;QAC/C,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,IAAI,EAAE,GAAG,CAAC,WAAW;QACrB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI;KACxD,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7C,IAAI,IAAI,EAAE,CAAC;QACT,2DAA2D;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC;QAC3C,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,6CAA6C;IAC7C,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC;QAEjD,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,WAAW,EAAE,EAAE;YAC9C,YAAY;YACZ,aAAa,EAAE,GAAG,CAAC,MAAM;YACzB,UAAU,EAAE,GAAG,CAAC,WAAW;YAC3B,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC1C,MAAM,EAAE,GAAG,CAAC,UAAU;YACtB,YAAY,EAAE,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC;YAC7C,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC;YAChC,QAAQ,EAAE,GAAG,CAAC,EAAE;YAChB,QAAQ,EAAE,WAAW;YACrB,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC;YAC3B,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,KAAK;YACf,8BAA8B,EAAE,KAAK;YACrC,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACvB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,EAAE,CAAC;AACT,CAAC"}
|
|
@@ -17,10 +17,7 @@ export async function metricsMiddleware(req, res, next) {
|
|
|
17
17
|
const path = rawPath.replace(/\/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/g, '/:id');
|
|
18
18
|
const start = Date.now();
|
|
19
19
|
try {
|
|
20
|
-
|
|
21
|
-
}
|
|
22
|
-
catch (error) {
|
|
23
|
-
throw error;
|
|
20
|
+
next();
|
|
24
21
|
}
|
|
25
22
|
finally {
|
|
26
23
|
counter.inc({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/middleware/metrics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;IAC1B,IAAI,EAAE,qBAAqB;IAC3B,IAAI,EAAE,oCAAoC;IAC1C,UAAU,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC;CACzC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC;IAC9B,IAAI,EAAE,+BAA+B;IACrC,IAAI,EAAE,sCAAsC;IAC5C,UAAU,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC;IACxC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IACrF,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;IACzB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,uDAAuD;IACvD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,iEAAiE,EAAE,MAAM,CAAC,CAAC;IAExG,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEzB,IAAI,CAAC;QACH,
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/middleware/metrics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;IAC1B,IAAI,EAAE,qBAAqB;IAC3B,IAAI,EAAE,oCAAoC;IAC1C,UAAU,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC;CACzC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC;IAC9B,IAAI,EAAE,+BAA+B;IACrC,IAAI,EAAE,sCAAsC;IAC5C,UAAU,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC;IACxC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IACrF,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;IACzB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,uDAAuD;IACvD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,iEAAiE,EAAE,MAAM,CAAC,CAAC;IAExG,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEzB,IAAI,CAAC;QACH,IAAI,EAAE,CAAC;IACT,CAAC;YAAS,CAAC;QACT,OAAO,CAAC,GAAG,CAAC;YACV,IAAI;YACJ,MAAM;YACN,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE;SAClC,CAAC,CAAC;QACH,SAAS,CAAC,OAAO,CACf;YACE,IAAI;YACJ,MAAM;YACN,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE;SAClC,EACD,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,IAAI,CAC5B,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/dist/util/apiResponse.js
CHANGED
|
@@ -9,8 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
};
|
|
10
10
|
import { errors, isTakaroDTO, TakaroDTO } from '@takaro/util';
|
|
11
11
|
import { Type } from 'class-transformer';
|
|
12
|
-
import { IsISO8601, IsNumber, IsOptional, ValidateNested } from 'class-validator';
|
|
13
|
-
import { IsString } from 'class-validator';
|
|
12
|
+
import { IsISO8601, IsNumber, IsOptional, ValidateNested, IsString, } from 'class-validator';
|
|
14
13
|
class ErrorOutput {
|
|
15
14
|
}
|
|
16
15
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiResponse.js","sourceRoot":"","sources":["../../src/util/apiResponse.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"apiResponse.js","sourceRoot":"","sources":["../../src/util/apiResponse.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@takaro/http",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.5",
|
|
4
4
|
"description": "An opinionated http server",
|
|
5
5
|
"main": "dist/main.js",
|
|
6
6
|
"types": "dist/main.d.ts",
|
|
@@ -16,8 +16,6 @@
|
|
|
16
16
|
"author": "",
|
|
17
17
|
"license": "ISC",
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@takaro/config": "0.0.1",
|
|
20
|
-
"@takaro/util": "0.0.1",
|
|
21
19
|
"body-parser": "^1.20.0",
|
|
22
20
|
"class-validator-jsonschema": "^3.1.1",
|
|
23
21
|
"cookie-parser": "^1.4.6",
|
|
@@ -28,7 +26,6 @@
|
|
|
28
26
|
"zod": "^3.17.10"
|
|
29
27
|
},
|
|
30
28
|
"devDependencies": {
|
|
31
|
-
"@takaro/test": "0.0.1",
|
|
32
29
|
"@types/cookie-parser": "^1.4.3",
|
|
33
30
|
"@types/cors": "^2.8.12",
|
|
34
31
|
"@types/express": "^4.17.13",
|
package/src/app.ts
CHANGED
|
@@ -23,7 +23,10 @@ export class HTTP {
|
|
|
23
23
|
private httpServer: Server;
|
|
24
24
|
private logger;
|
|
25
25
|
|
|
26
|
-
constructor(
|
|
26
|
+
constructor(
|
|
27
|
+
options: RoutingControllersOptions = {},
|
|
28
|
+
private httpOptions: IHTTPOptions = {},
|
|
29
|
+
) {
|
|
27
30
|
this.logger = logger('http');
|
|
28
31
|
this.app = express();
|
|
29
32
|
this.httpServer = createServer(this.app);
|
|
@@ -33,7 +36,7 @@ export class HTTP {
|
|
|
33
36
|
verify: (req, res, buf) => {
|
|
34
37
|
(req as any).rawBody = buf.toString();
|
|
35
38
|
},
|
|
36
|
-
})
|
|
39
|
+
}),
|
|
37
40
|
);
|
|
38
41
|
this.app.use(LoggingMiddleware);
|
|
39
42
|
this.app.use(metricsMiddleware);
|
|
@@ -53,7 +56,7 @@ export class HTTP {
|
|
|
53
56
|
callback(new errors.BadRequestError('Not allowed by CORS'));
|
|
54
57
|
}
|
|
55
58
|
},
|
|
56
|
-
})
|
|
59
|
+
}),
|
|
57
60
|
);
|
|
58
61
|
this.app.use(cookieParser());
|
|
59
62
|
|
package/src/controllers/meta.ts
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import { Controller, Get } from 'routing-controllers';
|
|
2
|
-
import { getMetadataArgsStorage } from 'routing-controllers';
|
|
3
|
-
import { routingControllersToSpec } from 'routing-controllers-openapi';
|
|
1
|
+
import { Controller, Get, getMetadataArgsStorage } from 'routing-controllers';
|
|
4
2
|
import { validationMetadatasToSchemas } from 'class-validator-jsonschema';
|
|
5
|
-
import { ResponseSchema } from 'routing-controllers-openapi';
|
|
3
|
+
import { routingControllersToSpec, ResponseSchema } from 'routing-controllers-openapi';
|
|
6
4
|
import { IsBoolean } from 'class-validator';
|
|
7
5
|
import { getMetrics, health } from '@takaro/util';
|
|
8
6
|
import { OpenAPIObject } from 'openapi3-ts';
|
|
@@ -71,7 +69,7 @@ export class Meta {
|
|
|
71
69
|
},
|
|
72
70
|
},
|
|
73
71
|
},
|
|
74
|
-
}
|
|
72
|
+
},
|
|
75
73
|
);
|
|
76
74
|
|
|
77
75
|
// Add required permissions to operation descriptions
|
package/src/main.ts
CHANGED
|
@@ -2,6 +2,6 @@ export { HTTP } from './app.js';
|
|
|
2
2
|
|
|
3
3
|
export * from './middleware/metrics.js';
|
|
4
4
|
export { createRateLimitMiddleware } from './middleware/rateLimit.js';
|
|
5
|
-
export { adminAuthMiddleware } from './middleware/adminAuth.js';
|
|
6
5
|
export { paginationMiddleware } from './middleware/paginationMiddleware.js';
|
|
7
6
|
export { apiResponse, APIOutput } from './util/apiResponse.js';
|
|
7
|
+
export { ErrorHandler } from './middleware/errorHandler.js';
|
|
@@ -18,7 +18,7 @@ describe('rateLimit middleware', () => {
|
|
|
18
18
|
max: 5,
|
|
19
19
|
windowSeconds: 5,
|
|
20
20
|
useInMemory: false,
|
|
21
|
-
})
|
|
21
|
+
}),
|
|
22
22
|
)
|
|
23
23
|
getLow() {
|
|
24
24
|
return 'Hello World';
|
|
@@ -30,17 +30,20 @@ describe('rateLimit middleware', () => {
|
|
|
30
30
|
max: 15,
|
|
31
31
|
windowSeconds: 5,
|
|
32
32
|
useInMemory: false,
|
|
33
|
-
})
|
|
33
|
+
}),
|
|
34
34
|
)
|
|
35
35
|
getHigh() {
|
|
36
36
|
return 'Hello World';
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
@Get('/authenticated')
|
|
40
|
-
@UseBefore(
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
@UseBefore(
|
|
41
|
+
(req: Request, _res: Response, next: NextFunction) => {
|
|
42
|
+
ctx.addData({ user: req.query.user as string });
|
|
43
|
+
next();
|
|
44
|
+
},
|
|
45
|
+
await createRateLimitMiddleware({ max: 5, windowSeconds: 5, useInMemory: false }),
|
|
46
|
+
)
|
|
44
47
|
getAuthenticated() {
|
|
45
48
|
return 'Hello World';
|
|
46
49
|
}
|
|
@@ -50,7 +53,7 @@ describe('rateLimit middleware', () => {
|
|
|
50
53
|
{
|
|
51
54
|
controllers: [TestController],
|
|
52
55
|
},
|
|
53
|
-
{ port: undefined }
|
|
56
|
+
{ port: undefined },
|
|
54
57
|
);
|
|
55
58
|
|
|
56
59
|
await http.start();
|
|
@@ -11,13 +11,13 @@ export async function ErrorHandler(
|
|
|
11
11
|
req: Request,
|
|
12
12
|
res: Response,
|
|
13
13
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
14
|
-
_next: NextFunction
|
|
14
|
+
_next: NextFunction,
|
|
15
15
|
) {
|
|
16
16
|
let status = 500;
|
|
17
17
|
let parsedError = new errors.InternalServerError();
|
|
18
18
|
|
|
19
19
|
if (originalError.name === 'BadRequestError') {
|
|
20
|
-
if (
|
|
20
|
+
if (Object.prototype.hasOwnProperty.call(originalError, 'errors')) {
|
|
21
21
|
// @ts-expect-error Error typing is weird in ts... but we validate during runtime so should be OK
|
|
22
22
|
const validationErrors = originalError['errors'] as ValidationError[];
|
|
23
23
|
parsedError = new errors.ValidationError('Validation error', validationErrors);
|
|
@@ -39,6 +39,16 @@ export async function ErrorHandler(
|
|
|
39
39
|
parsedError = new errors.BadRequestError('Missing required field');
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
+
if (originalError.name === 'CheckViolationError') {
|
|
43
|
+
status = 400;
|
|
44
|
+
parsedError = new errors.BadRequestError('Invalid data provided');
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
if ('constraint' in originalError && originalError['constraint'] === 'currency_positive') {
|
|
48
|
+
status = 400;
|
|
49
|
+
parsedError = new errors.BadRequestError('Not enough currency');
|
|
50
|
+
}
|
|
51
|
+
|
|
42
52
|
if (originalError instanceof errors.TakaroError) {
|
|
43
53
|
status = originalError.http;
|
|
44
54
|
parsedError = originalError;
|
package/src/middleware/logger.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { NextFunction, Request, Response } from 'express';
|
|
2
2
|
import { logger, ctx } from '@takaro/util';
|
|
3
|
+
import { context, trace } from '@opentelemetry/api';
|
|
3
4
|
|
|
4
5
|
const SUPPRESS_BODY_KEYWORDS = ['password', 'newPassword'];
|
|
5
6
|
const HIDDEN_ROUTES = ['/metrics', '/health', '/healthz', '/ready', '/readyz', '/queues/api/queues'];
|
|
6
|
-
import { context, trace } from '@opentelemetry/api';
|
|
7
7
|
const log = logger('http');
|
|
8
8
|
|
|
9
9
|
/**
|
|
@@ -23,9 +23,7 @@ export async function metricsMiddleware(req: Request, res: Response, next: NextF
|
|
|
23
23
|
const start = Date.now();
|
|
24
24
|
|
|
25
25
|
try {
|
|
26
|
-
|
|
27
|
-
} catch (error) {
|
|
28
|
-
throw error;
|
|
26
|
+
next();
|
|
29
27
|
} finally {
|
|
30
28
|
counter.inc({
|
|
31
29
|
path,
|
|
@@ -38,7 +36,7 @@ export async function metricsMiddleware(req: Request, res: Response, next: NextF
|
|
|
38
36
|
method,
|
|
39
37
|
status: res.statusCode.toString(),
|
|
40
38
|
},
|
|
41
|
-
(Date.now() - start) / 1000
|
|
39
|
+
(Date.now() - start) / 1000,
|
|
42
40
|
);
|
|
43
41
|
}
|
|
44
42
|
}
|
package/src/util/apiResponse.ts
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import { errors, isTakaroDTO, TakaroDTO } from '@takaro/util';
|
|
2
2
|
import { Type } from 'class-transformer';
|
|
3
|
-
import {
|
|
4
|
-
|
|
3
|
+
import {
|
|
4
|
+
IsISO8601,
|
|
5
|
+
IsNumber,
|
|
6
|
+
IsOptional,
|
|
7
|
+
ValidateNested,
|
|
8
|
+
IsString,
|
|
9
|
+
ValidationError as ClassValidatorError,
|
|
10
|
+
} from 'class-validator';
|
|
5
11
|
import { Request, Response } from 'express';
|
|
6
12
|
|
|
7
13
|
class ErrorOutput {
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
import { errors, logger } from '@takaro/util';
|
|
2
|
-
import { ory, AUDIENCES } from '@takaro/auth';
|
|
3
|
-
const log = logger('http:middleware:adminAuth');
|
|
4
|
-
export async function adminAuthMiddleware(request, response, next) {
|
|
5
|
-
try {
|
|
6
|
-
const rawToken = request.headers['authorization']?.replace('Bearer ', '');
|
|
7
|
-
if (!rawToken) {
|
|
8
|
-
log.warn('No token provided');
|
|
9
|
-
return next(new errors.UnauthorizedError());
|
|
10
|
-
}
|
|
11
|
-
const token = await ory.introspectToken(rawToken);
|
|
12
|
-
if (!token.active) {
|
|
13
|
-
log.warn('Token is not active');
|
|
14
|
-
return next(new errors.ForbiddenError());
|
|
15
|
-
}
|
|
16
|
-
if (!token.aud.includes(AUDIENCES.TAKARO_API_ADMIN)) {
|
|
17
|
-
log.warn('Token is not for admin API', { token });
|
|
18
|
-
return next(new errors.ForbiddenError());
|
|
19
|
-
}
|
|
20
|
-
return next();
|
|
21
|
-
}
|
|
22
|
-
catch (error) {
|
|
23
|
-
log.error('Unexpected error', { error });
|
|
24
|
-
next(new errors.ForbiddenError());
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
//# sourceMappingURL=adminAuth.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"adminAuth.js","sourceRoot":"","sources":["../../src/middleware/adminAuth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,GAAG,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAgB,EAAE,QAAkB,EAAE,IAAkB;IAChG,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAE1E,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACpD,GAAG,CAAC,IAAI,CAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAClD,OAAO,IAAI,CAAC,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;IACpC,CAAC;AACH,CAAC"}
|
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
import { HTTP } from '../../app.js';
|
|
2
|
-
import supertest from 'supertest';
|
|
3
|
-
import { expect } from '@takaro/test';
|
|
4
|
-
import { ory } from '@takaro/auth';
|
|
5
|
-
import { AdminClient } from '@takaro/apiclient';
|
|
6
|
-
import { adminAuthMiddleware } from '../adminAuth.js';
|
|
7
|
-
import { ErrorHandler } from '../errorHandler.js';
|
|
8
|
-
import { Request, Response } from 'express';
|
|
9
|
-
|
|
10
|
-
describe('adminAuth', () => {
|
|
11
|
-
let http: HTTP;
|
|
12
|
-
before(async () => {
|
|
13
|
-
http = new HTTP({}, { port: undefined });
|
|
14
|
-
http.expressInstance.use(
|
|
15
|
-
'/test',
|
|
16
|
-
adminAuthMiddleware,
|
|
17
|
-
(_req: Request, res: Response) => {
|
|
18
|
-
res.json({ ok: true });
|
|
19
|
-
},
|
|
20
|
-
ErrorHandler
|
|
21
|
-
);
|
|
22
|
-
await http.start();
|
|
23
|
-
});
|
|
24
|
-
|
|
25
|
-
after(async () => {
|
|
26
|
-
await http.stop();
|
|
27
|
-
});
|
|
28
|
-
|
|
29
|
-
it('Rejects requests with no credentials', async () => {
|
|
30
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
31
|
-
// @ts-ignore
|
|
32
|
-
const response = await supertest(http.expressInstance).get('/test');
|
|
33
|
-
expect(response.status).to.be.equal(401);
|
|
34
|
-
});
|
|
35
|
-
|
|
36
|
-
it('Rejects requests with invalid credentials', async () => {
|
|
37
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
38
|
-
// @ts-ignore
|
|
39
|
-
const response = await supertest(http.expressInstance).get('/test').set('Authorization', 'Bearer foobar');
|
|
40
|
-
expect(response.status).to.be.equal(403);
|
|
41
|
-
});
|
|
42
|
-
|
|
43
|
-
it('Accepts requests with valid credentials', async () => {
|
|
44
|
-
const { clientId, clientSecret } = await ory.createOIDCClient();
|
|
45
|
-
|
|
46
|
-
const adminClient = new AdminClient({
|
|
47
|
-
url: 'http://localhost:3000',
|
|
48
|
-
auth: {
|
|
49
|
-
clientId,
|
|
50
|
-
clientSecret,
|
|
51
|
-
},
|
|
52
|
-
OAuth2URL: ory.OAuth2URL,
|
|
53
|
-
});
|
|
54
|
-
|
|
55
|
-
const token = await adminClient.getOidcToken();
|
|
56
|
-
|
|
57
|
-
const response = await supertest(http.expressInstance)
|
|
58
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
59
|
-
// @ts-ignore
|
|
60
|
-
.get('/test')
|
|
61
|
-
.set('Authorization', `Bearer ${token.access_token}`);
|
|
62
|
-
|
|
63
|
-
expect(response.status).to.be.equal(200);
|
|
64
|
-
});
|
|
65
|
-
});
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
import { Request, Response, NextFunction } from 'express';
|
|
2
|
-
import { errors, logger } from '@takaro/util';
|
|
3
|
-
import { ory, AUDIENCES } from '@takaro/auth';
|
|
4
|
-
|
|
5
|
-
const log = logger('http:middleware:adminAuth');
|
|
6
|
-
|
|
7
|
-
export async function adminAuthMiddleware(request: Request, response: Response, next: NextFunction) {
|
|
8
|
-
try {
|
|
9
|
-
const rawToken = request.headers['authorization']?.replace('Bearer ', '');
|
|
10
|
-
|
|
11
|
-
if (!rawToken) {
|
|
12
|
-
log.warn('No token provided');
|
|
13
|
-
return next(new errors.UnauthorizedError());
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
const token = await ory.introspectToken(rawToken);
|
|
17
|
-
|
|
18
|
-
if (!token.active) {
|
|
19
|
-
log.warn('Token is not active');
|
|
20
|
-
return next(new errors.ForbiddenError());
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
if (!token.aud.includes(AUDIENCES.TAKARO_API_ADMIN)) {
|
|
24
|
-
log.warn('Token is not for admin API', { token });
|
|
25
|
-
return next(new errors.ForbiddenError());
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
return next();
|
|
29
|
-
} catch (error) {
|
|
30
|
-
log.error('Unexpected error', { error });
|
|
31
|
-
next(new errors.ForbiddenError());
|
|
32
|
-
}
|
|
33
|
-
}
|