Skip to content

Commit 5ed8f93

Browse files
authored
Merge pull request #26 from mitre-attack/25-missing-fields-in-the-server-response-for-attack-pattern-objects
Loosen restrictions on DTO serialization & validation (and other improvements)
2 parents 6279851 + 31d7a1e commit 5ed8f93

30 files changed

+12566
-10634
lines changed

package-lock.json

Lines changed: 12255 additions & 10259 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -38,59 +38,59 @@
3838
},
3939
"dependencies": {
4040
"@hapi/joi": "^17.1.1",
41-
"@nestjs/axios": "^0.0.3",
42-
"@nestjs/common": "^8.4.7",
43-
"@nestjs/config": "^1.1.5",
44-
"@nestjs/core": "^8.4.7",
45-
"@nestjs/mongoose": "^9.2.0",
46-
"@nestjs/platform-express": "^8.4.7",
47-
"@nestjs/schedule": "^1.1.0",
48-
"@nestjs/swagger": "^5.1.5",
49-
"@types/object-hash": "^2.2.1",
50-
"@types/uuid": "^8.3.4",
41+
"@nestjs/axios": "^3.1.1",
42+
"@nestjs/common": "^10.4.7",
43+
"@nestjs/config": "^3.3.0",
44+
"@nestjs/core": "^10.4.7",
45+
"@nestjs/mongoose": "^10.1.0",
46+
"@nestjs/platform-express": "^10.4.7",
47+
"@nestjs/schedule": "^4.1.1",
48+
"@nestjs/swagger": "^8.0.2",
49+
"@types/object-hash": "^3.0.6",
50+
"@types/uuid": "^10.0.0",
5151
"class-transformer": "^0.5.1",
52-
"class-validator": "^0.13.2",
52+
"class-validator": "^0.14.1",
5353
"json-stringify-safe": "^5.0.1",
5454
"lodash": "^4.17.21",
55-
"mongoose": "^6.5.1",
56-
"nest-winston": "^1.6.2",
57-
"object-hash": "^2.2.0",
58-
"reflect-metadata": "^0.1.13",
59-
"rimraf": "^3.0.2",
60-
"rxjs": "^7.2.0",
61-
"swagger-ui-express": "^4.3.0",
62-
"uuid": "^8.3.2",
63-
"webpack": "^5.91.0",
64-
"winston": "^3.6.0",
65-
"winston-slack-webhook-transport": "^2.1.0",
66-
"winston-transport-sentry-node": "^2.3.0"
55+
"mongoose": "^8.8.0",
56+
"nest-winston": "^1.9.7",
57+
"object-hash": "^3.0.0",
58+
"reflect-metadata": "^0.2.2",
59+
"rimraf": "^6.0.1",
60+
"rxjs": "^7.8.1",
61+
"swagger-ui-express": "^5.0.1",
62+
"uuid": "^11.0.2",
63+
"webpack": "^5.96.1",
64+
"winston": "^3.16.0",
65+
"winston-slack-webhook-transport": "^2.3.5",
66+
"winston-transport-sentry-node": "^3.0.0"
6767
},
6868
"devDependencies": {
69-
"@nestjs/cli": "^8.2.0",
70-
"@nestjs/schematics": "^8.0.0",
71-
"@nestjs/testing": "^8.0.0",
72-
"@types/cron": "^2.0.0",
73-
"@types/express": "^4.17.13",
74-
"@types/hapi__joi": "^17.1.7",
75-
"@types/jest": "27.0.2",
76-
"@types/lodash": "^4.14.184",
77-
"@types/node": "^16.0.0",
78-
"@types/supertest": "^2.0.11",
79-
"@typescript-eslint/eslint-plugin": "^5.28.0",
80-
"@typescript-eslint/parser": "^5.28.0",
81-
"eslint": "^8.0.1",
82-
"eslint-config-prettier": "^8.3.0",
83-
"eslint-plugin-prettier": "^4.0.0",
84-
"jest": "^27.2.5",
85-
"mongodb-memory-server": "^8.9.2",
86-
"prettier": "^2.3.2",
87-
"source-map-support": "^0.5.20",
88-
"supertest": "^6.1.3",
89-
"ts-jest": "^27.0.3",
90-
"ts-loader": "^9.2.3",
91-
"ts-node": "^10.0.0",
92-
"tsconfig-paths": "^3.10.1",
93-
"typescript": "^4.3.5"
69+
"@nestjs/cli": "^10.4.7",
70+
"@nestjs/schematics": "^10.2.3",
71+
"@nestjs/testing": "^10.4.7",
72+
"@types/cron": "^2.4.3",
73+
"@types/express": "^5.0.0",
74+
"@types/hapi__joi": "^17.1.15",
75+
"@types/jest": "29.5.14",
76+
"@types/lodash": "^4.17.13",
77+
"@types/node": "^22.9.0",
78+
"@types/supertest": "^6.0.2",
79+
"@typescript-eslint/eslint-plugin": "^8.13.0",
80+
"@typescript-eslint/parser": "^8.13.0",
81+
"eslint": "^9.14.0",
82+
"eslint-config-prettier": "^9.1.0",
83+
"eslint-plugin-prettier": "^5.2.1",
84+
"jest": "^29.7.0",
85+
"mongodb-memory-server": "^10.1.2",
86+
"prettier": "^3.3.3",
87+
"source-map-support": "^0.5.21",
88+
"supertest": "^7.0.0",
89+
"ts-jest": "^29.2.5",
90+
"ts-loader": "^9.5.1",
91+
"ts-node": "^10.9.2",
92+
"tsconfig-paths": "^4.2.0",
93+
"typescript": "^5.6.3"
9494
},
9595
"jest": {
9696
"moduleFileExtensions": [

src/hydrate/collector/collector.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import { Module } from "@nestjs/common";
22
import { ObjectCollectorService } from "./providers/object-collector.service";
33
import { CollectionCollectorService } from "./providers/collection-collector.service";
44
import { MongooseModule } from "@nestjs/mongoose";
5-
import { AttackObject, AttackObjectSchema } from "./schema";
5+
import { AttackObjectEntity, AttackObjectSchema } from "./schema";
66
import { TaxiiCollection, TaxiiCollectionSchema } from "./schema";
77

88
@Module({
99
imports: [
1010
MongooseModule.forFeature([
11-
{ name: AttackObject.name, schema: AttackObjectSchema },
11+
{ name: AttackObjectEntity.name, schema: AttackObjectSchema },
1212
{ name: TaxiiCollection.name, schema: TaxiiCollectionSchema },
1313
]),
1414
],

0 commit comments

Comments
 (0)