diff --git a/config/feature_flags/development/security_on_demand_scans_http_header_validation.yml b/config/feature_flags/development/security_on_demand_scans_http_header_validation.yml deleted file mode 100644 index 475cbfa4d9aab70061e0a3bf3f9d75a306e216b0..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/security_on_demand_scans_http_header_validation.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: security_on_demand_scans_http_header_validation -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42812 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276403 -milestone: '13.6' -type: development -group: group::dynamic analysis -default_enabled: false diff --git a/ee/app/assets/javascripts/security_configuration/dast_site_validation/components/dast_site_validation_modal.vue b/ee/app/assets/javascripts/security_configuration/dast_site_validation/components/dast_site_validation_modal.vue index a11d1e67e9070f39aceb99feda25cbbb4e649cbc..b56fe71b36ac43248cb1697bf913e5e94c6adc21 100644 --- a/ee/app/assets/javascripts/security_configuration/dast_site_validation/components/dast_site_validation_modal.vue +++ b/ee/app/assets/javascripts/security_configuration/dast_site_validation/components/dast_site_validation_modal.vue @@ -11,12 +11,10 @@ import { GlSkeletonLoader, GlTruncate, } from '@gitlab/ui'; -import { omit } from 'lodash'; import { __, s__ } from '~/locale'; import * as Sentry from '~/sentry/wrapper'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import download from '~/lib/utils/downloader'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { cleanLeadingSeparator, joinPaths, stripPathTail } from '~/lib/utils/url_utility'; import { DAST_SITE_VALIDATION_MODAL_ID, @@ -44,7 +42,6 @@ export default { GlSkeletonLoader, GlTruncate, }, - mixins: [glFeatureFlagsMixin()], props: { fullPath: { type: String, @@ -85,14 +82,7 @@ export default { }; }, validationMethodOptions() { - const isHttpHeaderValidationEnabled = this.glFeatures - .securityOnDemandScansHttpHeaderValidation; - - const enabledValidationMethods = omit(DAST_SITE_VALIDATION_METHODS, [ - !isHttpHeaderValidationEnabled ? DAST_SITE_VALIDATION_METHOD_HTTP_HEADER : '', - ]); - - return Object.values(enabledValidationMethods); + return Object.values(DAST_SITE_VALIDATION_METHODS); }, urlObject() { try { @@ -187,7 +177,7 @@ export default { await this.$apollo.mutate({ mutation: dastSiteValidationCreateMutation, variables: { - projectFullPath: this.fullPath, + fullPath: this.fullPath, dastSiteTokenId: this.tokenId, validationPath: this.validationPath, validationStrategy: this.validationMethod, diff --git a/ee/app/assets/javascripts/security_configuration/dast_site_validation/graphql/dast_site_validation_create.mutation.graphql b/ee/app/assets/javascripts/security_configuration/dast_site_validation/graphql/dast_site_validation_create.mutation.graphql index ec4dc79ff59cce425afe916903065fb4118c67d0..8fb2d9d2337128a510b5ca632e57c8c75857c36a 100644 --- a/ee/app/assets/javascripts/security_configuration/dast_site_validation/graphql/dast_site_validation_create.mutation.graphql +++ b/ee/app/assets/javascripts/security_configuration/dast_site_validation/graphql/dast_site_validation_create.mutation.graphql @@ -1,12 +1,12 @@ mutation dastSiteValidationCreate( - $projectFullPath: ID! + $fullPath: ID! $dastSiteTokenId: DastSiteTokenID! $validationPath: String! $validationStrategy: DastSiteValidationStrategyEnum ) { dastSiteValidationCreate( input: { - fullPath: $projectFullPath + fullPath: $fullPath dastSiteTokenId: $dastSiteTokenId validationPath: $validationPath strategy: $validationStrategy diff --git a/ee/app/controllers/projects/security/dast_profiles_controller.rb b/ee/app/controllers/projects/security/dast_profiles_controller.rb index ff34e8e6829cc1de1321334ccc7a7de0594fc1a8..aaf08aee6e7660f7543fc06a3dd61d28be8f31bd 100644 --- a/ee/app/controllers/projects/security/dast_profiles_controller.rb +++ b/ee/app/controllers/projects/security/dast_profiles_controller.rb @@ -6,7 +6,6 @@ class DastProfilesController < Projects::ApplicationController before_action do authorize_read_on_demand_scans! push_frontend_feature_flag(:security_on_demand_scans_site_validation, @project) - push_frontend_feature_flag(:security_on_demand_scans_http_header_validation, @project) end feature_category :dynamic_application_security_testing diff --git a/ee/spec/frontend/security_configuration/dast_site_validation/components/dast_site_validation_modal_spec.js b/ee/spec/frontend/security_configuration/dast_site_validation/components/dast_site_validation_modal_spec.js index 5822b321073f9d43de83e6c6032b410fd58e9b3d..989dedcb1f8bab1e02a38f906568f4b69e739a2f 100644 --- a/ee/spec/frontend/security_configuration/dast_site_validation/components/dast_site_validation_modal_spec.js +++ b/ee/spec/frontend/security_configuration/dast_site_validation/components/dast_site_validation_modal_spec.js @@ -51,9 +51,6 @@ describe('DastSiteValidationModal', () => { {}, { propsData: defaultProps, - provide: { - glFeatures: { securityOnDemandScansHttpHeaderValidation: true }, - }, attrs: { static: true, visible: true, @@ -287,22 +284,6 @@ describe('DastSiteValidationModal', () => { }); }); - describe('with the "securityOnDemandScansHttpHeaderValidation" feature flag disabled', () => { - beforeEach(() => { - createFullComponent({ - provide: { - glFeatures: { - securityOnDemandScansHttpHeaderValidation: false, - }, - }, - }); - }); - - it('does not render the http-header validation method', () => { - expect(findRadioInputForValidationMethod('header')).toBe(null); - }); - }); - describe.each(validationMethods)('"%s" validation submission', validationMethod => { beforeEach(async () => { createFullComponent(); @@ -318,7 +299,7 @@ describe('DastSiteValidationModal', () => { findValidateButton().trigger('click'); expect(requestHandlers.dastSiteValidationCreate).toHaveBeenCalledWith({ - projectFullPath: fullPath, + fullPath, dastSiteTokenId: tokenId, validationPath: wrapper.vm.validationPath, validationStrategy: wrapper.vm.validationMethod,