Merge pull request #661 from cisagov/revert-647-dj-cidr_hot_fix-WIP

Revert "Only display domains that are directly attributable to a cidr"
cisagov · Oct 1, 2024 · 0462afb · 0462afb
2 parents f8f04ee + ca2e71f
commit 0462afb
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 124 deletions.
diff --git a/backend/src/api/domains.ts b/backend/src/api/domains.ts
@@ -154,10 +154,6 @@ class DomainSearch {
       });
     }
 
-    qs.andWhere(
-      'domain."isFceb" = true OR (domain."isFceb" = false AND domain."fromCidr" = true)'
-    );
-
     await this.filterResultQueryset(qs, event);
     return qs.getManyAndCount();
   }

diff --git a/backend/src/api/scans.ts b/backend/src/api/scans.ts
@@ -128,13 +128,6 @@ export const SCAN_SCHEMA: ScanSchema = {
     description:
       'Open source tool that integrates passive APIs in order to discover target subdomains'
   },
-  flagFloatingIps: {
-    type: 'fargate',
-    isPassive: true,
-    global: true,
-    description:
-      'Loops through all domains and determines if their associated IP can be found in a report Cidr block.'
-  },
   hibp: {
     type: 'fargate',
     isPassive: true,

diff --git a/backend/src/api/stats.ts b/backend/src/api/stats.ts
@@ -94,10 +94,6 @@ export const get = wrapHandler(async (event) => {
       });
     }
 
-    qs.andWhere(
-      'domain."isFceb" = true OR (domain."isFceb" = false AND domain."fromCidr" = true)'
-    );
-
     // Handles the case where no orgs and no regions are set, and we pull stats for a region that will never exist
     if (
       search.filters?.organizations?.length === 0 &&

diff --git a/backend/src/api/vulnerabilities.ts b/backend/src/api/vulnerabilities.ts
@@ -173,10 +173,6 @@ class VulnerabilitySearch {
       .leftJoinAndSelect('domain.organization', 'organization')
       .leftJoinAndSelect('vulnerability.service', 'service');
 
-    qs.andWhere(
-      'domain."isFceb" = true OR (domain."isFceb" = false AND domain."fromCidr" = true)'
-    );
-
     if (groupBy) {
       qs = qs
         .groupBy('title, cve, "isKev", description, severity')

diff --git a/backend/src/models/domain.ts b/backend/src/models/domain.ts
@@ -111,16 +111,6 @@ export class Domain extends BaseEntity {
   })
   cloudHosted: boolean;
 
-  @Column({
-    default: false
-  })
-  fromCidr: boolean;
-
-  @Column({
-    default: false
-  })
-  isFceb: boolean;
-
   /** SSL Certificate information  */
   @Column({
     type: 'jsonb',

diff --git a/backend/src/tasks/flagFloatingIps.ts b/backend/src/tasks/flagFloatingIps.ts
diff --git a/backend/src/tasks/helpers/checkIpInCidr.ts b/backend/src/tasks/helpers/checkIpInCidr.ts
diff --git a/backend/src/tasks/search-sync-domains.ts b/backend/src/tasks/search-sync-domains.ts
@@ -40,10 +40,6 @@ export const handler = async (commandOptions: CommandOptions) => {
     qs.where('organization.id=:org', { org: organizationId });
   }
 
-  qs.andWhere(
-    'domain."isFceb" = true OR (domain."isFceb" = false AND domain."fromCidr" = true)'
-  );
-
   const domainIds = (await qs.getMany()).map((e) => e.id);
   console.log(`Got ${domainIds.length} domains.`);
   if (domainIds.length) {

diff --git a/backend/src/worker.ts b/backend/src/worker.ts
@@ -23,7 +23,6 @@ import { handler as sslyze } from './tasks/sslyze';
 import { handler as trustymail } from './tasks/trustymail';
 import { handler as vulnSync } from './tasks/vuln-sync';
 import { handler as vulnScanningSync } from './tasks/vs_sync';
-import { handler as flagFloatingIps } from './tasks/flagFloatingIps';
 import { handler as xpanseSync } from './tasks/xpanse-sync';
 import { SCAN_SCHEMA } from './api/scans';
 
@@ -48,7 +47,6 @@ async function main() {
     dnstwist,
     dotgov,
     findomain,
-    flagFloatingIps,
     intrigueIdent,
     lookingGlass,
     portscanner,