Merge branch 'djadmin-redirector-dast-config' into 'master'

Add DAST configuration page to DAST Profiles redirection logic

See merge request gitlab-org/gitlab!63483

ee/app/assets/javascripts/security_configuration/dast_profiles/redirect.js

@@ -7,24 +7,23 @@ import {
 } from '~/lib/utils/url_utility';
 
 export const returnToPreviousPageFactory = ({
-  onDemandScansPath,
+  allowedPaths,
   profilesLibraryPath,
   urlParamKey,
 }) => ({ id } = {}) => {
-  // when previous page is not On-demand scans page
-  // redirect user to profiles library page
-  if (!document.referrer?.includes(onDemandScansPath)) {
-    return redirectTo(profilesLibraryPath);
-  }
+  const redirectPath = allowedPaths.find((path) => document.referrer?.includes(path));
 
-  // Otherwise, redirect them back to On-demand scans page
-  // with corresponding profile id, if available
-  // for example, /on_demand_scans?site_profile_id=35
-  const previousPagePath = id
+  // when previous page is not an allowed path
+  if (!redirectPath) return redirectTo(profilesLibraryPath);
+
+  // otherwise redirect to the previous page along
+  // with the given profile id
+  const redirectPathWithId = id
     ? setUrlParams(
         { [urlParamKey]: getIdFromGraphQLId(id) },
-        relativePathToAbsolute(onDemandScansPath, getBaseURL()),
+        relativePathToAbsolute(redirectPath, getBaseURL()),
       )
-    : onDemandScansPath;
-  return redirectTo(previousPagePath);
+    : redirectPath;
+
+  return redirectTo(redirectPathWithId);
 };

ee/app/assets/javascripts/security_configuration/dast_scanner_profiles/dast_scanner_profiles_bundle.js

@@ -10,7 +10,12 @@ export default () => {
     return false;
   }
 
-  const { projectFullPath, profilesLibraryPath, onDemandScansPath } = el.dataset;
+  const {
+    projectFullPath,
+    profilesLibraryPath,
+    onDemandScansPath,
+    dastConfigurationPath,
+  } = el.dataset;
 
   const props = {
     projectFullPath,
@@ -22,7 +27,7 @@ export default () => {
 
   const returnToPreviousPage = ({ id } = {}) => {
     returnToPreviousPageFactory({
-      onDemandScansPath,
+      allowedPaths: [onDemandScansPath, dastConfigurationPath],
       profilesLibraryPath,
       urlParamKey: 'scanner_profile_id',
     })(id);

ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/index.js

@@ -10,7 +10,7 @@ export default () => {
     return;
   }
 
-  const { fullPath, profilesLibraryPath, onDemandScansPath } = el.dataset;
+  const { fullPath, profilesLibraryPath, onDemandScansPath, dastConfigurationPath } = el.dataset;
 
   const props = {
     fullPath,
@@ -21,7 +21,7 @@ export default () => {
   }
 
   const factoryParams = {
-    onDemandScansPath,
+    allowedPaths: [onDemandScansPath, dastConfigurationPath],
     profilesLibraryPath,
     urlParamKey: 'site_profile_id',
   };

ee/app/views/projects/security/dast_scanner_profiles/edit.html.haml

@@ -9,4 +9,5 @@ scanner_profile: { id: @scanner_profile.to_global_id.to_s, profile_name: @scanne
 spider_timeout: @scanner_profile.spider_timeout, target_timeout: @scanner_profile.target_timeout,
 scan_type: @scanner_profile.scan_type.upcase, use_ajax_spider: @scanner_profile.use_ajax_spider,
 show_debug_messages: @scanner_profile.show_debug_messages, referenced_in_security_policies: @scanner_profile.referenced_in_security_policies }.to_json,
-on_demand_scans_path: new_project_on_demand_scan_path(@project) } }
+on_demand_scans_path: new_project_on_demand_scan_path(@project),
+dast_configuration_path: project_security_configuration_dast_path(@project) } }

ee/app/views/projects/security/dast_scanner_profiles/new.html.haml

@@ -5,4 +5,5 @@
 
 .js-dast-scanner-profile-form{ data: { project_full_path: @project.path_with_namespace,
 profiles_library_path: project_security_configuration_dast_scans_path(@project, anchor: 'scanner-profiles'),
-on_demand_scans_path: new_project_on_demand_scan_path(@project) } }
+on_demand_scans_path: new_project_on_demand_scan_path(@project),
+dast_configuration_path: project_security_configuration_dast_path(@project) } }

ee/app/views/projects/security/dast_site_profiles/edit.html.haml

@@ -6,4 +6,5 @@
 .js-dast-site-profile-form{ data: { full_path: @project.path_with_namespace,
 profiles_library_path: project_security_configuration_dast_scans_path(@project, anchor: 'site-profiles'),
 site_profile: @site_profile.to_json,
-on_demand_scans_path: new_project_on_demand_scan_path(@project) } }
+on_demand_scans_path: new_project_on_demand_scan_path(@project),
+dast_configuration_path: project_security_configuration_dast_path(@project) } }

ee/app/views/projects/security/dast_site_profiles/new.html.haml

@@ -5,4 +5,5 @@
 
 .js-dast-site-profile-form{ data: { full_path: @project.path_with_namespace,
 profiles_library_path: project_security_configuration_dast_scans_path(@project, anchor: 'site-profiles'),
-on_demand_scans_path: new_project_on_demand_scan_path(@project) } }
+on_demand_scans_path: new_project_on_demand_scan_path(@project),
+dast_configuration_path: project_security_configuration_dast_path(@project) } }

ee/spec/frontend/security_configuration/dast_profiles/redirect_spec.js

@@ -5,11 +5,12 @@ import * as urlUtility from '~/lib/utils/url_utility';
 const fullPath = 'group/project';
 const profilesLibraryPath = `${TEST_HOST}/${fullPath}/-/security/configuration/dast_scans`;
 const onDemandScansPath = `${TEST_HOST}/${fullPath}/-/on_demand_scans`;
+const dastConfigPath = `${TEST_HOST}/${fullPath}/-/security/configuration/dast`;
 const urlParamKey = 'site_profile_id';
 const originalReferrer = document.referrer;
 
 const params = {
-  onDemandScansPath,
+  allowedPaths: [onDemandScansPath, dastConfigPath],
   profilesLibraryPath,
   urlParamKey,
 };
@@ -38,9 +39,12 @@ describe('DAST Profiles redirector', () => {
       expect(urlUtility.redirectTo).toHaveBeenCalledWith(profilesLibraryPath);
     });
 
-    describe('when a referrer is set', () => {
+    describe.each([
+      ['On-demand scans', onDemandScansPath],
+      ['DAST Configuration', dastConfigPath],
+    ])('when previous page is %s', (_pathName, path) => {
       beforeEach(() => {
-        setReferrer();
+        setReferrer(path);
       });
 
       afterEach(() => {
@@ -49,14 +53,12 @@ describe('DAST Profiles redirector', () => {
 
       it('redirects to previous page', () => {
         factory();
-        expect(urlUtility.redirectTo).toHaveBeenCalledWith(onDemandScansPath);
+        expect(urlUtility.redirectTo).toHaveBeenCalledWith(path);
       });
 
       it('redirects to previous page with id', () => {
         factory({ id: 2 });
-        expect(urlUtility.redirectTo).toHaveBeenCalledWith(
-          `${onDemandScansPath}?site_profile_id=2`,
-        );
+        expect(urlUtility.redirectTo).toHaveBeenCalledWith(`${path}?site_profile_id=2`);
       });
     });
   });