Merge pull request #369 from GSA/lc/1157-third-party-service-url

Update filtering and expose URLs field
GSA · Sep 19, 2024 · 8c2a79a · 8c2a79a
2 parents 830fbdd + d54041a
commit 8c2a79a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/entities/core-result.entity.ts b/entities/core-result.entity.ts
@@ -289,13 +289,12 @@ export class CoreResult {
   thirdPartyServiceDomains?: string;
 
   @Column({ nullable: true })
-  //@Expose({ name: 'third_party_service_urls' })
-  @Exclude()
+  @Expose({ name: 'third_party_service_urls' })
   @Transform((value: string) => {
     if (value) {
       return value.split(',');
     } else {
-      return 'null';
+      return null;
     }
   })
   thirdPartyServiceUrls?: string;
@@ -526,6 +525,7 @@ export class CoreResult {
     'dap_version',
     'ga_tag_id',
     'third_party_service_domains',
+    'third_party_service_urls',
     'third_party_service_count',
     'cookie_domains',
     'viewport_meta_tag',

diff --git a/libs/core-scanner/src/scans/third-party.ts b/libs/core-scanner/src/scans/third-party.ts
@@ -57,8 +57,8 @@ export function thirdPartyServicesUrls ( parentLogger: Logger, outboundRequests:
     const url = request && new URL(request.url());
     if (parsedUrl.hostname != url.hostname && !request.isNavigationRequest()) {
       const fullUrl = removeQueryParameters(url.toString());
-      const isFileLoad = fullUrl.startsWith('data:') || fullUrl.startsWith('blob:');
-      if( !isFileLoad) {
+      const isFileLoad = fullUrl.startsWith('http') || fullUrl.startsWith('https');
+      if( isFileLoad) {
         thirdPartyDomains.push(fullUrl);
       }
     }

diff --git a/libs/snapshot/src/serializers/json-serializer.spec.ts b/libs/snapshot/src/serializers/json-serializer.spec.ts
@@ -11,7 +11,7 @@ describe('JsonSerializer', () => {
 
     const result = serializer.serialize([website]);
     const expectedResult =
-      '[{"source_list":null,"login":null,"third_party_service_domains":null,"cookie_domains":null,"required_links_url":null,"required_links_text":null,"robots_txt_sitemap_locations":null,"uswds_usa_class_list":null}]';
+      '[{"source_list":null,"login":null,"third_party_service_domains":null,"third_party_service_urls":null,"cookie_domains":null,"required_links_url":null,"required_links_text":null,"robots_txt_sitemap_locations":null,"uswds_usa_class_list":null}]';
 
     expect(result).toEqual(expectedResult);
   });