diff --git a/ee/app/assets/javascripts/security_configuration/dast_profiles/dast_profile_selector/scanner_profile_summary.vue b/ee/app/assets/javascripts/security_configuration/dast_profiles/dast_profile_selector/scanner_profile_summary.vue index 89dc69800fb17a81e22a57562a9605de881e3985..c704868f7ad9cd7a9d53ee321626de97c7303eaa 100644 --- a/ee/app/assets/javascripts/security_configuration/dast_profiles/dast_profile_selector/scanner_profile_summary.vue +++ b/ee/app/assets/javascripts/security_configuration/dast_profiles/dast_profile_selector/scanner_profile_summary.vue @@ -44,7 +44,7 @@ export default { ><scan-type-badge :scan-type="profile.scanType" /></summary-cell> <summary-cell - :label="s__('DastProfiles|Spider timeout')" + :label="s__('DastProfiles|Crawl timeout')" :value="n__('%d minute', '%d minutes', profile.spiderTimeout || 0)" /> <summary-cell diff --git a/ee/app/assets/javascripts/security_configuration/dast_profiles/dast_scanner_profiles/components/dast_scanner_profile_form.vue b/ee/app/assets/javascripts/security_configuration/dast_profiles/dast_scanner_profiles/components/dast_scanner_profile_form.vue index 2ede07bcb81ab0cca51c07a846e41112d9eafdfc..c3e4b7edcfbf264543fb383d73e31b1e62edbf53 100644 --- a/ee/app/assets/javascripts/security_configuration/dast_profiles/dast_scanner_profiles/components/dast_scanner_profile_form.vue +++ b/ee/app/assets/javascripts/security_configuration/dast_profiles/dast_scanner_profiles/components/dast_scanner_profile_form.vue @@ -96,7 +96,7 @@ export default { : s__('DastProfiles|Could not create the scanner profile. Please try again.'), tooltips: { spiderTimeout: s__( - 'DastProfiles|The maximum number of minutes allowed for the spider to traverse the site.', + 'DastProfiles|The maximum number of minutes allowed for the crawler to traverse the site.', ), targetTimeout: s__( 'DastProfiles|The maximum number of seconds allowed for the site under test to respond to a request.', @@ -199,7 +199,7 @@ export default { :state="form.fields.spiderTimeout.state" > <template #label> - {{ s__('DastProfiles|Spider timeout') }} + {{ s__('DastProfiles|Crawl timeout') }} <tooltip-icon :title="i18n.tooltips.spiderTimeout" /> </template> <gl-form-input-group diff --git a/ee/app/models/dast_scanner_profile.rb b/ee/app/models/dast_scanner_profile.rb index bbd1b5b6fcc21548614e80d1df82f404d6597a56..69a7e974068529004c17d6b954dd263ed445dd9f 100644 --- a/ee/app/models/dast_scanner_profile.rb +++ b/ee/app/models/dast_scanner_profile.rb @@ -32,6 +32,7 @@ def ci_variables(dast_site_profile: nil) variables.append(key: 'DAST_USE_AJAX_SPIDER', value: String(use_ajax_spider)) variables.append(key: 'DAST_DEBUG', value: String(show_debug_messages)) variables.append(key: 'DAST_FULL_SCAN_ENABLED', value: String(active?)) + variables.append(key: 'DAST_BROWSER_CRAWL_TIMEOUT', value: "#{String(spider_timeout)}m") if spider_timeout next unless dast_site_profile&.api? diff --git a/ee/spec/frontend/security_configuration/dast_profiles/dast_profile_selector/__snapshots__/scanner_profile_summary_spec.js.snap b/ee/spec/frontend/security_configuration/dast_profiles/dast_profile_selector/__snapshots__/scanner_profile_summary_spec.js.snap index ea84625a5d798770f9788b31b17451c7e3b94164..0a81374604997a10256a95cf7ffec52b9567f406 100644 --- a/ee/spec/frontend/security_configuration/dast_profiles/dast_profile_selector/__snapshots__/scanner_profile_summary_spec.js.snap +++ b/ee/spec/frontend/security_configuration/dast_profiles/dast_profile_selector/__snapshots__/scanner_profile_summary_spec.js.snap @@ -14,7 +14,7 @@ exports[`DastScannerProfileSummary renders properly 1`] = ` /> </summary-cell-stub> <summary-cell-stub - label="Spider timeout" + label="Crawl timeout" value="5 minutes" /> <summary-cell-stub diff --git a/ee/spec/models/dast_scanner_profile_spec.rb b/ee/spec/models/dast_scanner_profile_spec.rb index 011160fbcec54f9b2cd2c9d7fc6fd7dc676b6d01..ee8146a28c3e80d63c9e0929cd4ea57f3469c75d 100644 --- a/ee/spec/models/dast_scanner_profile_spec.rb +++ b/ee/spec/models/dast_scanner_profile_spec.rb @@ -75,6 +75,7 @@ it 'returns a collection of variables including these', :aggregate_failures do expect(collection).to include(key: 'DAST_SPIDER_MINS', value: String(subject.spider_timeout), public: true) expect(collection).to include(key: 'DAST_TARGET_AVAILABILITY_TIMEOUT', value: String(subject.target_timeout), public: true) + expect(collection).to include(key: 'DAST_BROWSER_CRAWL_TIMEOUT', value: "#{String(subject.spider_timeout)}m", public: true) end end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 29ad8b192e2f156c2c6a7aa98922976f854affe0..b37e1472580de0488494d85f5f45c4e9d1d11142 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -15514,6 +15514,9 @@ msgstr "" msgid "DastProfiles|Could not update the site profile. Please try again." msgstr "" +msgid "DastProfiles|Crawl timeout" +msgstr "" + msgid "DastProfiles|DAST profile library" msgstr "" @@ -15691,9 +15694,6 @@ msgstr "" msgid "DastProfiles|Site type" msgstr "" -msgid "DastProfiles|Spider timeout" -msgstr "" - msgid "DastProfiles|Submit button" msgstr "" @@ -15706,7 +15706,7 @@ msgstr "" msgid "DastProfiles|Target timeout" msgstr "" -msgid "DastProfiles|The maximum number of minutes allowed for the spider to traverse the site." +msgid "DastProfiles|The maximum number of minutes allowed for the crawler to traverse the site." msgstr "" msgid "DastProfiles|The maximum number of seconds allowed for the site under test to respond to a request."