Skip to content
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
18 changes: 12 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "2.8.5",
"license": "(CC0)",
"devDependencies": {
"@faker-js/faker": "^7.6.0",
"@faker-js/faker": "^10.5.0",
"chai": "^4.2.0",
"chai-arrays": "^2.0.0",
"chai-http": "^4.3.0",
Expand Down
6 changes: 3 additions & 3 deletions test/integration-tests/org/postOrgUsersTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,13 @@ describe('Testing user post endpoint', () => {
this.timeout(70000)
let counter = await User.where({ org_UUID: orgUuid }).countDocuments().exec()
do {
const firstName = faker.name.firstName()
const lastName = faker.name.lastName()
const firstName = faker.person.firstName()
const lastName = faker.person.lastName()
await chai.request(app)
.post('/api/org/win_5/user')
.set({ ...constants.headers, ...shortName })
.send({
username: faker.internet.userName({ firstName: firstName, lastName: lastName }) + ' ' + counter,
username: faker.internet.username({ firstName: firstName, lastName: lastName }) + ' ' + counter,
name: {
first: firstName,
last: lastName
Expand Down
32 changes: 16 additions & 16 deletions test/integration-tests/org/regularUsersTestRegistry.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
/* Negative Tests */
context('Negative Test', () => {
it('regular user cannot update their username', async () => {
const newUsername = faker.datatype.uuid()
const newUsername = faker.string.uuid()
const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
const user = constants.nonSecretariatUserHeaders['CVE-API-USER']

Expand All @@ -87,7 +87,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
})
it('regular user cannot update information of another user of the same organization', async () => {
const newUsername = faker.datatype.uuid()
const newUsername = faker.string.uuid()
const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
const user2 = constants.nonSecretariatUserHeaders2['CVE-API-USER']

Expand Down Expand Up @@ -132,7 +132,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
it('regular users cannot update organization', async () => {
const org1 = constants.nonSecretariatUserHeaders['CVE-API-ORG']
const user = constants.nonSecretariatUserHeaders['CVE-API-USER']
const org2 = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
const org2 = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)

let previousBody
await chai.request(app).get(`/api/registry/org/${org1}/user/${user}`)
Expand Down Expand Up @@ -188,7 +188,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
it('regular users cannot use grant-role missing users to enumerate another organization', async () => {
const org = constants.nonSecretariatUserHeaders3['CVE-API-ORG']
const user = faker.datatype.uuid()
const user = faker.string.uuid()
await chai.request(app)
.post(`/api/registry/org/${org}/user/${user}/grant-role`)
.set(constants.nonSecretariatUserHeaders)
Expand Down Expand Up @@ -216,7 +216,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
it('regular users cannot use revoke-role missing users to enumerate another organization', async () => {
const org = constants.nonSecretariatUserHeaders3['CVE-API-ORG']
const user = faker.datatype.uuid()
const user = faker.string.uuid()
await chai.request(app)
.post(`/api/registry/org/${org}/user/${user}/revoke-role`)
.set(constants.nonSecretariatUserHeaders)
Expand All @@ -229,7 +229,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
})
it("regular user cannot update a user from an org that doesn't exist", async () => {
const org = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
const org = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
const user = constants.nonSecretariatUserHeaders['CVE-API-USER']
await chai.request(app)
.put(`/api/registry/org/${org}/user/${user}`)
Expand All @@ -243,7 +243,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
it("regular user cannot update a user that doesn't exist ", async () => {
const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
const user = faker.datatype.uuid()
const user = faker.string.uuid()
await chai.request(app)
.put(`/api/registry/org/${org}/user/${user}`)
.set(constants.nonSecretariatUserHeaders)
Expand All @@ -268,7 +268,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
})
it("regular user cannot reset the secret of a user from an org that doesn't exist", async () => {
const org = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
const org = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
const user = constants.nonSecretariatUserHeaders['CVE-API-USER']
await chai.request(app)
.put(`/api/registry/org/${org}/user/${user}/reset_secret`)
Expand All @@ -282,7 +282,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
it("regular user cannot reset the secret of a user that doesn't exist", async () => {
const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
const user = faker.datatype.uuid()
const user = faker.string.uuid()
await chai.request(app)
.put(`/api/registry/org/${org}/user/${user}/reset_secret`)
.set(constants.nonSecretariatUserHeaders)
Expand All @@ -295,7 +295,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
it('regular users cannot use reset-secret missing users to enumerate another organization', async () => {
const org = constants.nonSecretariatUserHeaders3['CVE-API-ORG']
const user = faker.datatype.uuid()
const user = faker.string.uuid()
await chai.request(app)
.put(`/api/registry/org/${org}/user/${user}/reset_secret`)
.set(constants.nonSecretariatUserHeaders)
Expand Down Expand Up @@ -326,7 +326,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
/* Negative Tests */
context('Negative Test', () => {
it('regular user cannot create another user', async () => {
const newUsername = faker.datatype.uuid()
const newUsername = faker.string.uuid()
const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
await chai.request(app)
.post(`/api/registry/org/${org}/user`)
Expand Down Expand Up @@ -374,7 +374,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
/* Negative Tests */
context('Negative Test', () => {
it("regular users cannot view users of an organization that doesn't exist", async () => {
const org = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
const org = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
await chai.request(app)
.get(`/api/registry/org/${org}/users`)
.set(constants.nonSecretariatUserHeaders)
Expand Down Expand Up @@ -412,7 +412,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
it('regular users cannot use missing users to enumerate another organization', async () => {
const org = constants.nonSecretariatUserHeaders3['CVE-API-ORG']
const user = faker.datatype.uuid()
const user = faker.string.uuid()
await chai.request(app)
.get(`/api/registry/org/${org}/user/${user}`)
.set(constants.nonSecretariatUserHeaders)
Expand All @@ -425,7 +425,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
it("regular user cannot view user that doesn't exist", async () => {
const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
const user = faker.datatype.uuid()
const user = faker.string.uuid()
await chai.request(app)
.get(`/api/registry/org/${org}/user/${user}`)
.set(constants.nonSecretariatUserHeaders)
Expand Down Expand Up @@ -456,7 +456,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
})
})
it('regular user cannot update an organization', async () => {
const org = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
const org = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
await chai.request(app)
.put(`/api/registry/org/${org}`)
.set(constants.nonSecretariatUserHeaders)
Expand Down Expand Up @@ -519,7 +519,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
/* Negative Tests */
context('Negative Test', () => {
it("regular users cannot view an organization they don't belong to", async () => {
const org = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
const org = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
await chai.request(app)
.get(`/api/registry/org/${org}`)
.set(constants.nonSecretariatUserHeaders)
Expand Down
6 changes: 3 additions & 3 deletions test/unit-tests/cve-id/cveIdGetAllTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const OrgRepository = require('../../../src/repositories/orgRepository.js')
const CveIdRepository = require('../../../src/repositories/cveIdRepository.js')
const UserRepository = require('../../../src/repositories/userRepository.js')

const orgUUID = faker.datatype.uuid()
const orgUUID2 = faker.datatype.uuid()
const userUUID = faker.datatype.uuid()
const orgUUID = faker.string.uuid()
const orgUUID2 = faker.string.uuid()
const userUUID = faker.string.uuid()

const stubOrg = {
short_name: 'testOrg',
Expand Down
4 changes: 2 additions & 2 deletions test/unit-tests/cve/insertAdpTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const CveIdRepository = require('../../../src/repositories/cveIdRepository.js')
const CveRepository = require('../../../src/repositories/cveRepository.js')
const UserRepository = require('../../../src/repositories/userRepository.js')

const adpUUID = faker.datatype.uuid()
const adpUUID = faker.string.uuid()

const stubAdpOrg = {
short_name: 'adpOrg',
Expand All @@ -32,7 +32,7 @@ const stubAdpOrg = {
const stubAdpUser = {
username: 'testAdpUser',
org_UUID: adpUUID,
UUID: faker.datatype.uuid()
UUID: faker.string.uuid()
}

const stubCveId = {
Expand Down
4 changes: 2 additions & 2 deletions test/unit-tests/cve/updateCnaTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const error = new errors.CveControllerError()
const constants = require('../../../src/constants').getConstants()
const Cve = require('../../../src/model/cve.js')

const cnaUUID = faker.datatype.uuid()
const cnaUUID = faker.string.uuid()

const stubCnaOrg = {
short_name: 'CnaOrg',
Expand All @@ -28,7 +28,7 @@ const stubCnaOrg = {
const stubCnaUser = {
username: 'testCnaUser',
org_UUID: cnaUUID,
UUID: faker.datatype.uuid()
UUID: faker.string.uuid()
}

const stubCveId = {
Expand Down
6 changes: 3 additions & 3 deletions test/unit-tests/middleware/onlyAdpsTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const error = new errors.MiddlewareError()
const stubAdpOrg = {
short_name: 'adpOrg',
name: 'test_adp',
UUID: faker.datatype.uuid(),
UUID: faker.string.uuid(),
authority: {
active_roles: [
'ADP'
Expand All @@ -24,7 +24,7 @@ const stubAdpOrg = {
const stubCnaOrg = {
short_name: 'cnaOrg',
name: 'test_cna',
UUID: faker.datatype.uuid(),
UUID: faker.string.uuid(),
authority: {
active_roles: [
'CNA'
Expand All @@ -35,7 +35,7 @@ const stubCnaOrg = {
const stubSecretariat = {
short_name: 'secOrg',
name: 'test_sec',
UUID: faker.datatype.uuid(),
UUID: faker.string.uuid(),
authority: {
active_roles: [
'SECRETARIAT'
Expand Down
10 changes: 5 additions & 5 deletions test/unit-tests/middleware/onlyOrgWithPartnerRoleTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const error = new errors.MiddlewareError()
const stubAdpOrg = {
short_name: 'adpOrg',
name: 'test_adp',
UUID: faker.datatype.uuid(),
UUID: faker.string.uuid(),
authority: {
active_roles: [
'ADP'
Expand All @@ -26,7 +26,7 @@ const stubAdpOrg = {
const stubCnaOrg = {
short_name: 'cnaOrg',
name: 'test_cna',
UUID: faker.datatype.uuid(),
UUID: faker.string.uuid(),
authority: {
active_roles: [
'CNA'
Expand All @@ -37,7 +37,7 @@ const stubCnaOrg = {
const stubBulkDownloadOrg = {
short_name: 'bdOrg',
name: 'test_bd',
UUID: faker.datatype.uuid(),
UUID: faker.string.uuid(),
authority: {
active_roles: [
'BULK_DOWNLOAD'
Expand All @@ -48,7 +48,7 @@ const stubBulkDownloadOrg = {
const stubOrgNoRole = {
short_name: 'NoRole',
name: 'test_org',
UUID: faker.datatype.uuid(),
UUID: faker.string.uuid(),
authority: {
active_roles: []
}
Expand All @@ -57,7 +57,7 @@ const stubOrgNoRole = {
const stubSecretariat = {
short_name: 'secOrg',
name: 'test_sec',
UUID: faker.datatype.uuid(),
UUID: faker.string.uuid(),
authority: {
active_roles: [
'SECRETARIAT'
Expand Down
2 changes: 1 addition & 1 deletion test/unit-tests/org/orgCreateADPTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
let status, json, res, next, getOrgRepository, regOrgRepo, getUserRepository, getBaseOrgRepository,
updateOrg, updateRegOrg, userRegistryRepo, getBaseUserRepository, mockSession

beforeEach(() => {

Check warning on line 45 in test/unit-tests/org/orgCreateADPTest.js

View workflow job for this annotation

GitHub Actions / lint-test (24.x)

Unexpected use of Mocha `beforeEach` hook for a single test case
status = sinon.stub()
json = sinon.spy()
res = { json, status }
Expand Down Expand Up @@ -80,14 +80,14 @@
sinon.stub(regOrgRepo, 'checkAliasCollisions').resolves(null)
})

afterEach(() => {

Check warning on line 83 in test/unit-tests/org/orgCreateADPTest.js

View workflow job for this annotation

GitHub Actions / lint-test (24.x)

Unexpected use of Mocha `afterEach` hook for a single test case
sinon.restore()
})

it('Should return newly created org with id_quota of 0 and ADP role', async () => {
const req = {
ctx: {
uuid: faker.datatype.uuid(),
uuid: faker.string.uuid(),
repositories: {
getBaseOrgRepository,
getBaseUserRepository
Expand Down
Loading
Loading