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

Update INT from DEV #918

Merged
merged 63 commits into from
Nov 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
20d330a
Merge pull request #454 from CVEProject/release/v1.1.1
mattrbianchi Jun 15, 2021
ce078b1
Rm anticipatory tests for 5.0
mattrbianchi Oct 20, 2021
e2fa4b9
Reorder permission checks
mattrbianchi Oct 20, 2021
7bd7989
Merge pull request #516 from CVEProject/hotfix/adjust_permission_check
spant-mitre Oct 20, 2021
d1b44b5
Keep Org Admins from changing user's org.
mattrbianchi Dec 9, 2021
5c50baf
Merge pull request #534 from CVEProject/hotfix/restrict_org_change
mattrbianchi Dec 9, 2021
f707e58
Fixed secret logging
wizedkyle Apr 1, 2022
cf88345
reverted production package-lock.json
jdaigneau5 Apr 15, 2022
664c26e
Merge pull request #627 from CVEProject/jd-patch-prod
jdaigneau5 Apr 15, 2022
75254fa
#683 recreated prod-staging branch based of master
jdaigneau5 May 24, 2022
d291dce
Fixed prod-staging start script
jdaigneau5 May 27, 2022
594fb11
Update default.json-docker
shaneficorilli Aug 2, 2022
da72601
Update default.json-docker
shaneficorilli Aug 3, 2022
0f0a216
Update default.json-docker
shaneficorilli Aug 15, 2022
27c2eba
#863 Restrict access to non-IDR endpoints to Secretariat-only
brettp Sep 12, 2022
f8d157b
#864 Soft Deploy phase I doc updates - includes v2.1 information for …
slubar Sep 14, 2022
204edd9
#864 lint fix
slubar Sep 14, 2022
ed3adfa
Merge remote-tracking branch 'origin/dev' into prod-staging
brettp Sep 26, 2022
6c2fbcb
chore: remove duplicate test from merge
brettp Sep 26, 2022
eee72ce
Merge branch 'pr-877' into prod-staging
brettp Sep 26, 2022
045067f
Merge branch 'pr-870' into prod-staging
brettp Sep 26, 2022
592769d
chore: restore prod-staging start script
brettp Sep 26, 2022
577dddf
#889 fixed problem with empty replacedBy array
slubar Oct 3, 2022
a5537c2
Merge pull request #891 from CVEProject/srl-889
jdaigneau5 Oct 3, 2022
b5f12d7
Merge pull request #895 from CVEProject/bep-890-rejected-lang-check
slubar Oct 3, 2022
00bfdf5
Update comments to clarify why two language keys are passed in POST/P…
brettp Oct 6, 2022
a94b482
Merge pull request #898 from CVEProject/bep-correct-comments-lang-field
slubar Oct 6, 2022
cee5516
#715 Added additionalProperties: false to schema being used to valida…
jdaigneau5 Oct 13, 2022
f30068e
#715 Added additionalProperties: false to cna reject schema
jdaigneau5 Oct 13, 2022
015f635
Merge pull request #902 from CVEProject/jd-715
slubar Oct 17, 2022
31d6b03
Merge branch 'dev' into prod-staging
brettp Oct 20, 2022
8dc2139
Revert "#863 Restrict access to non-IDR endpoints to Secretariat-only"
brettp Oct 20, 2022
3f7b164
Revert "#864 Soft Deploy phase I doc updates - includes v2.1 informat…
brettp Oct 20, 2022
892646d
Merge changes from dev
brettp Oct 20, 2022
3033114
Merge branch 'prod-staging' into bep-prod-staging-setup
brettp Oct 20, 2022
f107844
Merge pull request #904 from CVEProject/bep-prod-staging-setup
slubar Oct 20, 2022
9fb35bc
Bump node-notifier and node-dev
dependabot[bot] Oct 20, 2022
5654fc5
Bump markdown-it and apidoc
dependabot[bot] Oct 20, 2022
8eb5c8f
#745 improve messaging for user update with no changes specified
slubar Oct 26, 2022
916aa50
Merge branch 'dev' into srl-745
slubar Oct 26, 2022
325d21b
Merge pull request #909 from CVEProject/srl-745
brettp Oct 26, 2022
f7419c8
Fixed broken production API doc link
marcruef Oct 28, 2022
f95f75b
Updated docker-compose and README
wizedkyle May 23, 2022
9358e1b
Merge branch 'dev' into patch-1
slubar Nov 3, 2022
f089ecc
Merge pull request #910 from marcruef/patch-1
slubar Nov 3, 2022
ea85e44
Merge branch 'dev' into dependabot/npm_and_yarn/node-notifier-and-nod…
jdaigneau5 Nov 4, 2022
0ee65b0
Merge pull request #905 from CVEProject/dependabot/npm_and_yarn/node-…
jdaigneau5 Nov 4, 2022
f3a265c
Merge branch 'dev' into dependabot/npm_and_yarn/markdown-it-and-apido…
jdaigneau5 Nov 4, 2022
a81e3fc
Merge pull request #906 from CVEProject/dependabot/npm_and_yarn/markd…
jdaigneau5 Nov 4, 2022
f0acd97
#908 update contact information and point to JSON 5.0 schema informat…
slubar Nov 8, 2022
8cc3cc8
Merge branch 'dev' into srl-908
slubar Nov 8, 2022
f183412
#908 fix url replacement script, lint errors
slubar Nov 8, 2022
0c3313a
Merge branch 'srl-908' of https://github.com/CVEProject/cve-services …
slubar Nov 8, 2022
abde24b
fix(updateCve): #713 Removed requesterUserId from cveMetadata field
jdaigneau5 Nov 9, 2022
e48a76d
Merge pull request #914 from CVEProject/srl-908
jdaigneau5 Nov 9, 2022
c9d415b
Added uniqueEnglishDescription tests
wizedkyle May 23, 2022
06a7594
Removed unnecessary code
wizedkyle May 23, 2022
7e58696
Fixing linting
wizedkyle May 23, 2022
550d843
#631 Extract unique English language checks into more testable functi…
brettp Oct 31, 2022
5ea02b8
chore: fix index of language entry in error messages
brettp Nov 9, 2022
4884a24
Merge pull request #912 from CVEProject/bep-kj-631
brettp Nov 9, 2022
1cae486
Merge branch 'dev' into jd-713
jdaigneau5 Nov 10, 2022
4eab157
Merge pull request #916 from CVEProject/jd-713
slubar Nov 10, 2022
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ API documentation is generated using [swagger-autogen](https://github.com/daviba

To ensure you are using the correct API specification the following endpoints can be used:
- [Test Instance](https://cveawg-test.mitre.org/api-docs/)
- [Production](https://cveawg.mitre.org/api-docs/openapi.json)
- [Production](https://cveawg.mitre.org/api-docs/)

Note: The specification file stored in GitHub will only be correct for that branch; there could be differences between branches and production.

Expand Down
11 changes: 5 additions & 6 deletions api-docs/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
"info": {
"version": "2.1.0",
"title": "CVE Services API",
"description": "The CVE Services API supports automation tooling for the CVE Program. Credentials are required for most service endpoints. Representatives of <a href='https://www.cve.org/ProgramOrganization/CNAs'>CVE Numbering Authorities (CNAs)</a> should use one of the methods below to obtain credentials: <ul><li>If your organization already has an Organizational Administrator (OA) account for the CVE Services, ask your admin for credentials</li> <li>Contact your Root (<a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/Google'>Google</a>, <a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/INCIBE'>INCIBE</a>, <a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/jpcert'>JPCERT/CC</a>, or <a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/redhat'>Red Hat</a>) or Top-Level Root (<a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/icscert'>CISA ICS</a> or <a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/mitre'>MITRE</a>) to request credentials </ul>",
"description": "The CVE Services API supports automation tooling for the CVE Program. Credentials are required for most service endpoints. Representatives of <a href='https://www.cve.org/ProgramOrganization/CNAs'>CVE Numbering Authorities (CNAs)</a> should use one of the methods below to obtain credentials: <ul><li>If your organization already has an Organizational Administrator (OA) account for the CVE Services, ask your admin for credentials</li> <li>Contact your Root (<a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/Google'>Google</a>, <a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/INCIBE'>INCIBE</a>, <a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/jpcert'>JPCERT/CC</a>, or <a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/redhat'>Red Hat</a>) or Top-Level Root (<a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/icscert'>CISA ICS</a> or <a href='https://www.cve.org/PartnerInformation/ListofPartners/partner/mitre'>MITRE</a>) to request credentials </ul> <p>CVE data is to be in the JSON 5.0 CVE Record format. Details of the JSON 5.0 schema are located <a href='https://github.com/CVEProject/cve-schema/tree/master/schema/v5.0' target='_blank'>here</a>.</p> <a href='https://cveform.mitre.org/' class='link' target='_blank'>Contact the CVE Services team</a>",
"contact": {
"name": "CVE Services",
"url": "https://cveawg-dev.mitre.org/api",
"email": "cve-board-auto-list@mitre.org"
"name": "CVE Services Overview",
"url": "https://cveproject.github.io/automation-cve-services#services-overview"
}
},
"servers": [
Expand Down Expand Up @@ -2804,7 +2803,7 @@
"tags": [
"string"
],
"url": "https://cveawg-dev.mitre.org/api"
"url": "string"
}
]
}
Expand Down Expand Up @@ -2907,4 +2906,4 @@
}
}
}
}
}
6 changes: 6 additions & 0 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,9 @@ See the [API documentation](https://github.com/CVEProject/cve-services#api-docum
## Mongo DB

The `docker-compose.yml` file exposes the default Mongo port to the host: `localhost:27017`. You can connect using any Mongo viewer such as [Mongo Express](https://github.com/mongo-express/mongo-express) or [Compass](https://www.mongodb.com/try/download/compass) on the host.

## Running unit tests

You can run unit tests using the docker image by running the following command:

`docker exec -it cveawg npm run test`
7 changes: 7 additions & 0 deletions docker/default.json-docker
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
"host": "docdb",
"port": 27017
},
"prod-staging": {
"username": null,
"password": null,
"database": "cve_prd",
"host": "docdb",
"port": 27017
},
"production": {
"username": null,
"password": null,
Expand Down
2 changes: 2 additions & 0 deletions docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ elif [[ "$NODE_ENV" == "staging" ]]; then
npm run start:stage
elif [[ "$NODE_ENV" == "integration" ]]; then
npm run start:int
elif [[ "$NODE_ENV" == "prod-staging" ]]; then
npm run start:prdstg
elif [[ "$NODE_ENV" == "production" ]]; then
npm run start:prd
else
Expand Down
Loading