-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
run precommits and linter fixes
- Loading branch information
Showing
4 changed files
with
80 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,62 @@ | ||
| import { getRepository } from 'typeorm'; | ||
| import { Cidr, DL_Organization,connectToDatalake2 } from '../../models'; | ||
|
|
||
| export default async (ip: string, acronym: string): Promise<{ isInCidr: boolean; isExecutive: boolean }> => { | ||
| // await connectToDatalake2() | ||
| // const cidrRepository = getRepository(Cidr); | ||
| // const organizationRepository = getRepository(DL_Organization); | ||
|
|
||
| // Find the organization by acronym | ||
| const mdl_connection = await connectToDatalake2() | ||
| const mdl_organization_repo = mdl_connection.getRepository(DL_Organization); | ||
| const organization = await mdl_organization_repo.findOne({ | ||
| where: { acronym }, | ||
| relations: ['cidrs','sectors','parent'], | ||
| }); | ||
|
|
||
| if (!organization) { | ||
| return {isInCidr:false, isExecutive: false} | ||
| import { Cidr, DL_Organization, connectToDatalake2 } from '../../models'; | ||
|
|
||
| export default async ( | ||
| ip: string, | ||
| acronym: string | ||
| ): Promise<{ isInCidr: boolean; isExecutive: boolean }> => { | ||
| // await connectToDatalake2() | ||
| // const cidrRepository = getRepository(Cidr); | ||
| // const organizationRepository = getRepository(DL_Organization); | ||
|
|
||
| // Find the organization by acronym | ||
| const mdl_connection = await connectToDatalake2(); | ||
| const mdl_organization_repo = mdl_connection.getRepository(DL_Organization); | ||
| const organization = await mdl_organization_repo.findOne({ | ||
| where: { acronym }, | ||
| relations: ['cidrs', 'sectors', 'parent'] | ||
| }); | ||
|
|
||
| if (!organization) { | ||
| return { isInCidr: false, isExecutive: false }; | ||
| } | ||
|
|
||
| const isOrganizationExecutive = async ( | ||
| org: DL_Organization | ||
| ): Promise<boolean> => { | ||
| if (org.sectors.some((sector) => sector.acronym === 'EXECUTIVE')) { | ||
| return true; | ||
| } | ||
|
|
||
| const isOrganizationExecutive = async (org: DL_Organization): Promise<boolean> => { | ||
| if (org.sectors.some(sector => sector.acronym === 'EXECUTIVE')) { | ||
| return true; | ||
| } | ||
| if (org.parent) { | ||
| const parentOrg = await mdl_organization_repo.findOne({ | ||
| where: { id: org.parent.id }, | ||
| relations: ['sectors'], | ||
| }); | ||
| console.log('parent') | ||
| console.log(parentOrg) | ||
| return parentOrg ? await isOrganizationExecutive(parentOrg) : false; | ||
| } | ||
| return false; | ||
| }; | ||
|
|
||
| const isExecutive = await isOrganizationExecutive(organization); | ||
|
|
||
| // Get CIDRs related to the organization | ||
| const cidrs = organization.cidrs.map(cidr => cidr.network); | ||
|
|
||
| if (cidrs.length === 0) { | ||
| return { isInCidr: false, isExecutive }; // No CIDRs associated with the organization | ||
| if (org.parent) { | ||
| const parentOrg = await mdl_organization_repo.findOne({ | ||
| where: { id: org.parent.id }, | ||
| relations: ['sectors'] | ||
| }); | ||
| console.log('parent'); | ||
| console.log(parentOrg); | ||
| return parentOrg ? await isOrganizationExecutive(parentOrg) : false; | ||
| } | ||
|
|
||
| // Check if the IP is in any of the CIDRs | ||
| const mdl_cidr_repo = mdl_connection.getRepository(Cidr); | ||
| const result = await mdl_cidr_repo | ||
| .createQueryBuilder('cidr') | ||
| .where('cidr.network >>= :ip', { ip }) | ||
| .andWhere('cidr.id IN (:...cidrIds)', { cidrIds: organization.cidrs.map(cidr => cidr.id) }) | ||
| .getCount(); | ||
|
|
||
|
|
||
| return { isInCidr: result > 0, isExecutive }; | ||
| } | ||
| return false; | ||
| }; | ||
|
|
||
| const isExecutive = await isOrganizationExecutive(organization); | ||
|
|
||
| // Get CIDRs related to the organization | ||
| const cidrs = organization.cidrs.map((cidr) => cidr.network); | ||
|
|
||
| if (cidrs.length === 0) { | ||
| return { isInCidr: false, isExecutive }; // No CIDRs associated with the organization | ||
| } | ||
|
|
||
| // Check if the IP is in any of the CIDRs | ||
| const mdl_cidr_repo = mdl_connection.getRepository(Cidr); | ||
| const result = await mdl_cidr_repo | ||
| .createQueryBuilder('cidr') | ||
| .where('cidr.network >>= :ip', { ip }) | ||
| .andWhere('cidr.id IN (:...cidrIds)', { | ||
| cidrIds: organization.cidrs.map((cidr) => cidr.id) | ||
| }) | ||
| .getCount(); | ||
|
|
||
| return { isInCidr: result > 0, isExecutive }; | ||
| }; |