fix: fedramp URL check

snyk · Aug 31, 2023 · b47d7a2 · b47d7a2
1 parent 52b900c
commit b47d7a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/snyk/common/analytics/itly.ts b/src/snyk/common/analytics/itly.ts
@@ -1,13 +1,13 @@
 import SegmentPlugin from '@itly/plugin-segment-node';
 import itly, {
   AnalysisIsReadyProperties,
-  AnalysisIsTriggeredProperties as _AnalysisIsTriggeredProperties,
   FalsePositiveIsSubmittedProperties,
   IssueHoverIsDisplayedProperties,
   IssueInTreeIsClickedProperties,
-  QuickFixIsDisplayedProperties as _QuickFixIsDisplayedProperties,
   ScanModeIsSelectedProperties,
   TrackOptions,
+  AnalysisIsTriggeredProperties as _AnalysisIsTriggeredProperties,
+  QuickFixIsDisplayedProperties as _QuickFixIsDisplayedProperties,
 } from '../../../ampli';
 import { Configuration } from '../configuration/configuration';
 import { SnykConfiguration } from '../configuration/snykConfiguration';
@@ -82,6 +82,7 @@ export class Iteratively implements IAnalytics {
       this.logger.debug(`Analytics are disabled. No analytics will be collected.`);
       return null;
     }
+    this.logger.debug(`Analytics are enabled. Analytics will be collected.`);
 
     const segmentWriteKey = this.snykConfiguration?.segmentWriteKey;
     if (!segmentWriteKey) {

diff --git a/src/snyk/common/configuration/configuration.ts b/src/snyk/common/configuration/configuration.ts
@@ -196,14 +196,15 @@ export class Configuration implements IConfiguration {
   get isFedramp(): boolean {
     if (!this.customEndpoint) return false;
 
+    // FEDRAMP URL e.g. https://api.fedramp.snykgov.io
     const endpoint = new URL(this.customEndpoint);
 
     // hostname validation
     const hostnameParts = endpoint.hostname.split('.');
     if (hostnameParts.length < 3) return false;
 
-    const isFedrampInstance = hostnameParts[1] === 'fedramp';
-    const isFedrampDomain = hostnameParts[2] === 'snykgov' && hostnameParts[3] === 'io';
+    const isFedrampInstance = hostnameParts[1].includes('fedramp');
+    const isFedrampDomain = hostnameParts[2].includes('snykgov') && hostnameParts[3].includes('io');
     return isFedrampDomain && isFedrampInstance;
   }
 

diff --git a/src/test/integration/analytics.test.ts b/src/test/integration/analytics.test.ts
@@ -36,7 +36,7 @@ suite('Analytics', () => {
   });
 
   test('"Welcome Is Viewed" not tracked if using fedramp endpoint', async () => {
-    await configuration.setEndpoint('https://snyk.fedramp.gov');
+    await configuration.setEndpoint('https://api.fedramp.snykgov.io');
     await vscode.commands.executeCommand('workbench.action.toggleSidebarVisibility');
     await vscode.commands.executeCommand(VSCODE_VIEW_CONTAINER_COMMAND);