Skip to content

G
gitlab-ce
Commit 47ca3421 authored by Paul Gascou-Vaillancourt's avatar Paul Gascou-Vaillancourt
Browse files
Options

Use site profiles in on-demand DAST scans 

- Added the ability to use existing site profiles when running new
on-demand DAST scans
- Updated/added specs
parent d429e468
Hide whitespace changes
Inline Side-by-side
Showing with 475 additions and 166 deletions
ee/app/assets/javascripts/on_demand_scans/components/on_demand_scans_app.vue
View file @ 47ca3421
......@@ -29,6 +29,14 @@ export default {
type: String,
required: true,
},
profilesLibraryPath: {
type: String,
required: true,
},
newSiteProfilePath: {
type: String,
required: true,
},
},
data() {
return {
......@@ -46,6 +54,8 @@ export default {
:help-page-path="helpPagePath"
:project-path="projectPath"
:default-branch="defaultBranch"
:profiles-library-path="profilesLibraryPath"
:new-site-profile-path="newSiteProfilePath"
@cancel="showForm = false"
/>
<on-demand-scans-form-old
......
ee/app/assets/javascripts/on_demand_scans/components/on_demand_scans_form.vue
View file @ 47ca3421
<script>
import * as Sentry from '@sentry/browser';
import { s__, sprintf } from '~/locale';
import createFlash from '~/flash';
import { isAbsolute, redirectTo } from '~/lib/utils/url_utility';
import { s__ } from '~/locale';
import { redirectTo } from '~/lib/utils/url_utility';
import {
GlAlert,
GlButton,
GlCard,
GlForm,
GlFormGroup,
GlFormInput,
GlIcon,
GlLink,
GlNewDropdown as GlDropdown,
GlNewDropdownItem as GlDropdownItem,
GlSkeletonLoader,
GlSprintf,
GlTooltipDirective,
} from '@gitlab/ui';
import runDastScanMutation from '../graphql/run_dast_scan.mutation.graphql';
import dastSiteProfilesQuery from 'ee/dast_profiles/graphql/dast_site_profiles.query.graphql';
import dastOnDemandScanCreateMutation from '../graphql/dast_on_demand_scan_create.mutation.graphql';
import { SCAN_TYPES } from '../constants';
const ERROR_RUN_SCAN = 'ERROR_RUN_SCAN';
const ERROR_FETCH_SITE_PROFILES = 'ERROR_FETCH_SITE_PROFILES';
const ERROR_MESSAGES = {
[ERROR_RUN_SCAN]: s__('OnDemandScans|Could not run the scan. Please try again.'),
[ERROR_FETCH_SITE_PROFILES]: s__(
'OnDemandScans|Could not fetch site profiles. Please try again.',
),
};
const initField = value => ({
value,
state: null,
......@@ -24,17 +38,39 @@ const initField = value => ({
export default {
components: {
GlAlert,
GlButton,
GlCard,
GlForm,
GlFormGroup,
GlFormInput,
GlIcon,
GlLink,
GlDropdown,
GlDropdownItem,
GlSkeletonLoader,
GlSprintf,
},
directives: {
GlTooltip: GlTooltipDirective,
},
apollo: {
siteProfiles: {
query: dastSiteProfilesQuery,
variables() {
return {
fullPath: this.projectPath,
};
},
update(data) {
const siteProfileEdges = data?.project?.siteProfiles?.edges ?? [];
return siteProfileEdges.map(({ node }) => node);
},
error(e) {
Sentry.captureException(e);
this.showErrors(ERROR_FETCH_SITE_PROFILES);
},
},
},
props: {
helpPagePath: {
type: String,
......@@ -48,21 +84,42 @@ export default {
type: String,
required: true,
},
profilesLibraryPath: {
type: String,
required: true,
},
newSiteProfilePath: {
type: String,
required: true,
},
},
data() {
return {
siteProfiles: [],
form: {
scanType: initField(SCAN_TYPES.PASSIVE),
branch: initField(this.defaultBranch),
targetUrl: initField(''),
dastSiteProfileId: initField(null),
},
loading: false,
errorType: null,
errors: [],
showAlert: false,
};
},
computed: {
errorMessage() {
return ERROR_MESSAGES[this.errorType] || null;
},
isLoadingProfiles() {
return this.$apollo.queries.siteProfiles.loading;
},
failedToLoadProfiles() {
return [ERROR_FETCH_SITE_PROFILES].includes(this.errorType);
},
formData() {
return {
projectPath: this.projectPath,
fullPath: this.projectPath,
...Object.fromEntries(Object.entries(this.form).map(([key, { value }]) => [key, value])),
};
},
......@@ -75,37 +132,35 @@ export default {
isSubmitDisabled() {
return this.formHasErrors || this.someFieldEmpty;
},
selectedSiteProfile() {
const selectedSiteProfileId = this.form.dastSiteProfileId.value;
return selectedSiteProfileId === null
? null
: this.siteProfiles.find(({ id }) => id === selectedSiteProfileId);
},
siteProfileText() {
const { selectedSiteProfile } = this;
return selectedSiteProfile
? `${selectedSiteProfile.profileName}: ${selectedSiteProfile.targetUrl}`
: s__('OnDemandScans|Select one of the existing profiles');
},
},
methods: {
validateTargetUrl() {
let [state, feedback] = [true, null];
const { value: targetUrl } = this.form.targetUrl;
if (!isAbsolute(targetUrl)) {
state = false;
feedback = s__(
'OnDemandScans|Please enter a valid URL format, ex: http://www.example.com/home',
);
}
this.form.targetUrl = {
...this.form.targetUrl,
state,
feedback,
};
setSiteProfile({ id }) {
this.form.dastSiteProfileId.value = id;
},
onSubmit() {
this.loading = true;
this.hideErrors();
this.$apollo
.mutate({
mutation: runDastScanMutation,
mutation: dastOnDemandScanCreateMutation,
variables: this.formData,
})
.then(({ data: { runDastScan: { pipelineUrl, errors } } }) => {
.then(({ data: { dastOnDemandScanCreate: { pipelineUrl, errors } } }) => {
if (errors?.length) {
createFlash(
sprintf(s__('OnDemandScans|Could not run the scan: %{backendErrorMessage}'), {
backendErrorMessage: errors.join(', '),
}),
);
this.showErrors(ERROR_RUN_SCAN, errors);
this.loading = false;
} else {
redirectTo(pipelineUrl);
......@@ -113,10 +168,20 @@ export default {
})
.catch(e => {
Sentry.captureException(e);
createFlash(s__('OnDemandScans|Could not run the scan. Please try again.'));
this.showErrors(ERROR_RUN_SCAN);
this.loading = false;
});
},
showErrors(errorType, errors = []) {
this.errorType = errorType;
this.errors = errors;
this.showAlert = true;
},
hideErrors() {
this.errorType = null;
this.errors = [];
this.showAlert = false;
},
},
};
</script>
......@@ -126,7 +191,6 @@ export default {
<header class="gl-mb-6">
<h2>{{ s__('OnDemandScans|New on-demand DAST scan') }}</h2>
<p>
<gl-icon name="information-o" class="gl-vertical-align-text-bottom gl-text-gray-400" />
<gl-sprintf
:message="
s__(
......@@ -143,65 +207,155 @@ export default {
</p>
</header>
<gl-form-group>
<template #label>
{{ s__('OnDemandScans|Scan mode') }}
<gl-icon
v-gl-tooltip.hover
name="information-o"
class="gl-vertical-align-text-bottom gl-text-gray-400"
:title="s__('OnDemandScans|Only a passive scan can be performed on demand.')"
/>
</template>
{{ s__('OnDemandScans|Passive DAST Scan') }}
</gl-form-group>
<gl-alert
v-if="showAlert"
variant="danger"
class="gl-mb-5"
data-testid="on-demand-scan-error"
:dismissible="!failedToLoadProfiles"
@dismiss="hideErrors"
>
{{ errorMessage }}
<ul v-if="errors.length" class="gl-mt-3 gl-mb-0">
<li v-for="error in errors" :key="error" v-text="error"></li>
</ul>
</gl-alert>
<gl-form-group>
<template #label>
{{ s__('OnDemandScans|Attached branch') }}
<gl-icon
v-gl-tooltip.hover
name="information-o"
class="gl-vertical-align-text-bottom gl-text-gray-400"
:title="s__('OnDemandScans|Attached branch is where the scan job runs.')"
/>
</template>
{{ defaultBranch }}
</gl-form-group>
<template v-if="isLoadingProfiles">
<gl-card v-for="i in 2" :key="i">
<template #header>
<gl-skeleton-loader :width="1248" :height="15">
<rect x="0" y="0" width="300" height="15" rx="4" />
</gl-skeleton-loader>
</template>
<gl-skeleton-loader :width="1248" :height="15">
<rect x="0" y="0" width="600" height="15" rx="4" />
</gl-skeleton-loader>
<gl-skeleton-loader :width="1248" :height="15">
<rect x="0" y="0" width="300" height="15" rx="4" />
</gl-skeleton-loader>
</gl-card>
</template>
<template v-else-if="!failedToLoadProfiles">
<gl-card>
<template #header>
<h3 class="gl-font-lg gl-display-inline">{{ s__('OnDemandScans|Scanner settings') }}</h3>
</template>
<gl-form-group :invalid-feedback="form.targetUrl.feedback">
<template #label>
{{ s__('OnDemandScans|Target URL') }}
<gl-icon
v-gl-tooltip.hover
name="information-o"
class="gl-vertical-align-text-bottom gl-text-gray-400"
:title="s__('OnDemandScans|DAST will scan the target URL and any discovered sub URLs.')"
/>
</template>
<gl-form-input
v-model="form.targetUrl.value"
class="mw-460"
data-testid="target-url-input"
type="url"
:state="form.targetUrl.state"
@input="validateTargetUrl"
/>
</gl-form-group>
<gl-form-group class="gl-mt-4">
<template #label>
{{ s__('OnDemandScans|Scan mode') }}
<gl-icon
v-gl-tooltip.hover
name="information-o"
class="gl-vertical-align-text-bottom gl-text-gray-600"
:title="s__('OnDemandScans|Only a passive scan can be performed on demand.')"
/>
</template>
{{ s__('OnDemandScans|Passive') }}
</gl-form-group>
<gl-form-group class="gl-mt-7 gl-mb-2">
<template #label>
{{ s__('OnDemandScans|Attached branch') }}
<gl-icon
v-gl-tooltip.hover
name="information-o"
class="gl-vertical-align-text-bottom gl-text-gray-600"
:title="s__('OnDemandScans|Attached branch is where the scan job runs.')"
/>
</template>
{{ defaultBranch }}
</gl-form-group>
</gl-card>
<div class="gl-mt-6 gl-pt-6">
<gl-button
type="submit"
variant="success"
class="js-no-auto-disable"
:disabled="isSubmitDisabled"
:loading="loading"
>
{{ s__('OnDemandScans|Run this scan') }}
</gl-button>
<gl-button @click="$emit('cancel')">
{{ __('Cancel') }}
</gl-button>
</div>
<gl-card>
<template #header>
<div class="row">
<div class="col-7">
<h3 class="gl-font-lg gl-display-inline">{{ s__('OnDemandScans|Site profiles') }}</h3>
</div>
<div class="col-5 gl-text-right">
<gl-button
:href="siteProfiles.length ? profilesLibraryPath : null"
:disabled="!siteProfiles.length"
variant="success"
category="secondary"
size="small"
data-testid="manage-site-profiles-button"
>
{{ s__('OnDemandScans|Manage profiles') }}
</gl-button>
</div>
</div>
</template>
<gl-form-group v-if="siteProfiles.length">
<template #label>
{{ s__('OnDemandScans|Use existing site profile') }}
</template>
<gl-dropdown
v-model="form.dastSiteProfileId.value"
:text="siteProfileText"
class="mw-460"
data-testid="site-profiles-dropdown"
>
<gl-dropdown-item
v-for="siteProfile in siteProfiles"
:key="siteProfile.id"
:is-checked="form.dastSiteProfileId.value === siteProfile.id"
is-check-item
@click="setSiteProfile(siteProfile)"
>
{{ siteProfile.profileName }}
</gl-dropdown-item>
</gl-dropdown>
<template v-if="selectedSiteProfile">
<hr />
<div class="row" data-testid="site-profile-summary">
<div class="col-md-6">
<div class="row">
<div class="col-md-3">{{ s__('DastProfiles|Target URL') }}:</div>
<div class="col-md-9 gl-font-weight-bold">
{{ selectedSiteProfile.targetUrl }}
</div>
</div>
</div>
</div>
</template>
</gl-form-group>
<template v-else>
<p class="gl-text-gray-700">
{{
s__(
'OnDemandScans|No profile yet. In order to create a new scan, you need to have at least one completed site profile.',
)
}}
</p>
<gl-button
:href="newSiteProfilePath"
variant="success"
category="secondary"
data-testid="create-site-profile-link"
>
{{ s__('OnDemandScans|Create a new site profile') }}
</gl-button>
</template>
</gl-card>
<div class="gl-mt-6 gl-pt-6">
<gl-button
type="submit"
variant="success"
class="js-no-auto-disable"
:disabled="isSubmitDisabled"
:loading="loading"
>
{{ s__('OnDemandScans|Run scan') }}
</gl-button>
<gl-button data-testid="on-demand-scan-cancel-button" @click="$emit('cancel')">
{{ __('Cancel') }}
</gl-button>
</div>
</template>
</gl-form>
</template>
ee/app/assets/javascripts/on_demand_scans/graphql/dast_on_demand_scan_create.mutation.graphql 0 → 100644
View file @ 47ca3421
mutation dastOnDemandScanCreate($fullPath: ID!, $dastSiteProfileId: DastSiteProfileID!) {
dastOnDemandScanCreate(input: { fullPath: $fullPath, dastSiteProfileId: $dastSiteProfileId }) {
pipelineUrl
errors
}
}
ee/app/assets/javascripts/on_demand_scans/index.js
View file @ 47ca3421
......@@ -5,13 +5,19 @@ import OnDemandScansApp from './components/on_demand_scans_app.vue';
export default () => {
const el = document.querySelector('#js-on-demand-scans-app');
if (!el) {
return;
return null;
}
const { helpPagePath, emptyStateSvgPath, projectPath, defaultBranch } = el.dataset;
const {
helpPagePath,
emptyStateSvgPath,
projectPath,
defaultBranch,
profilesLibraryPath,
newSiteProfilePath,
} = el.dataset;
// eslint-disable-next-line no-new
new Vue({
return new Vue({
el,
apolloProvider,
render(h) {
......@@ -21,6 +27,8 @@ export default () => {
emptyStateSvgPath,
projectPath,
defaultBranch,
profilesLibraryPath,
newSiteProfilePath,
},
});
},
......
ee/app/helpers/projects/on_demand_scans_helper.rb
View file @ 47ca3421
......@@ -6,7 +6,9 @@ module Projects::OnDemandScansHelper
'help-page-path' => help_page_path('user/application_security/dast/index', anchor: 'on-demand-scans'),
'empty-state-svg-path' => image_path('illustrations/empty-state/ondemand-scan-empty.svg'),
'default-branch' => project.default_branch,
'project-path' => project.path_with_namespace
'project-path' => project.path_with_namespace,
'profiles-library-path': project_profiles_path(project),
'new-site-profile-path': new_project_dast_site_profile_path(project)
}
end
end
ee/spec/frontend/on_demand_scans/components/on_demand_scans_app_spec.js
View file @ 47ca3421
......@@ -10,6 +10,8 @@ const helpPagePath = `${TEST_HOST}/application_security/dast/index#on-demand-sca
const projectPath = 'group/project';
const defaultBranch = 'master';
const emptyStateSvgPath = `${TEST_HOST}/assets/illustrations/alert-management-empty-state.svg`;
const profilesLibraryPath = `${TEST_HOST}/${projectPath}/-/on_demand_scans/profiles`;
const newSiteProfilePath = `${TEST_HOST}/${projectPath}/-/on_demand_scans/profiles`;
describe('OnDemandScansApp', () => {
let wrapper;
......@@ -32,6 +34,8 @@ describe('OnDemandScansApp', () => {
projectPath,
defaultBranch,
emptyStateSvgPath,
profilesLibraryPath,
newSiteProfilePath,
},
},
options,
......
ee/spec/frontend/on_demand_scans/components/on_demand_scans_form_old_spec.js
View file @ 47ca3421
import { shallowMount } from '@vue/test-utils';
import { GlForm } from '@gitlab/ui';
import { TEST_HOST } from 'helpers/test_constants';
import OnDemandScansForm from 'ee/on_demand_scans/components/on_demand_scans_form.vue';
import OnDemandScansForm from 'ee/on_demand_scans/components/on_demand_scans_form_old.vue';
import runDastScanMutation from 'ee/on_demand_scans/graphql/run_dast_scan.mutation.graphql';
import createFlash from '~/flash';
import { redirectTo } from '~/lib/utils/url_utility';
......
ee/spec/frontend/on_demand_scans/components/on_demand_scans_form_spec.js
View file @ 47ca3421
import { shallowMount } from '@vue/test-utils';
import { GlForm } from '@gitlab/ui';
import { merge } from 'lodash';
import { mount, shallowMount } from '@vue/test-utils';
import { GlForm, GlSkeletonLoader } from '@gitlab/ui';
import { TEST_HOST } from 'helpers/test_constants';
import OnDemandScansForm from 'ee/on_demand_scans/components/on_demand_scans_form.vue';
import runDastScanMutation from 'ee/on_demand_scans/graphql/run_dast_scan.mutation.graphql';
import createFlash from '~/flash';
import dastOnDemandScanCreate from 'ee/on_demand_scans/graphql/dast_on_demand_scan_create.mutation.graphql';
import { redirectTo } from '~/lib/utils/url_utility';
const helpPagePath = `${TEST_HOST}/application_security/dast/index#on-demand-scans`;
const projectPath = 'group/project';
const defaultBranch = 'master';
const profilesLibraryPath = `${TEST_HOST}/${projectPath}/-/on_demand_scans/profiles`;
const newSiteProfilePath = `${TEST_HOST}/${projectPath}/-/on_demand_scans/profiles`;
const targetUrl = 'http://example.com';
const defaultProps = {
helpPagePath,
projectPath,
defaultBranch,
profilesLibraryPath,
newSiteProfilePath,
};
const siteProfiles = [
{ id: 1, profileName: 'My first site profile', targetUrl: 'https://example.com' },
{ id: 2, profileName: 'My second site profile', targetUrl: 'https://foo.bar' },
];
const pipelineUrl = `${TEST_HOST}/${projectPath}/pipelines/123`;
jest.mock('~/flash');
jest.mock('~/lib/utils/url_utility', () => ({
isAbsolute: jest.requireActual('~/lib/utils/url_utility').isAbsolute,
redirectTo: jest.fn(),
......@@ -23,26 +35,42 @@ describe('OnDemandScansApp', () => {
let wrapper;
const findForm = () => wrapper.find(GlForm);
const findTargetUrlInput = () => wrapper.find('[data-testid="target-url-input"]');
const findSiteProfilesDropdown = () => wrapper.find('[data-testid="site-profiles-dropdown"]');
const findManageSiteProfilesButton = () =>
wrapper.find('[data-testid="manage-site-profiles-button"]');
const findCreateNewSiteProfileLink = () =>
wrapper.find('[data-testid="create-site-profile-link"]');
const findAlert = () => wrapper.find('[data-testid="on-demand-scan-error"]');
const findCancelButton = () => wrapper.find('[data-testid="on-demand-scan-cancel-button"]');
const submitForm = () => findForm().vm.$emit('submit', { preventDefault: () => {} });
const createComponent = ({ props = {}, computed = {} } = {}) => {
wrapper = shallowMount(OnDemandScansForm, {
attachToDocument: true,
propsData: {
helpPagePath,
projectPath,
defaultBranch,
...props,
},
computed,
mocks: {
$apollo: {
mutate: jest.fn(),
const wrapperFactory = (mountFn = shallowMount) => (options = {}) => {
wrapper = mountFn(
OnDemandScansForm,
merge(
{},
{
propsData: defaultProps,
mocks: {
$apollo: {
mutate: jest.fn(),
queries: {
siteProfiles: {},
},
},
},
},
},
});
options,
{
data() {
return { ...options.data };
},
},
),
);
};
const createComponent = wrapperFactory();
const createFullComponent = wrapperFactory(mount);
beforeEach(() => {
createComponent();
......@@ -61,15 +89,15 @@ describe('OnDemandScansApp', () => {
describe('formData', () => {
it('returns an object with a key:value mapping from the form object including the project path', () => {
wrapper.vm.form = {
targetUrl: {
value: targetUrl,
siteProfileId: {
value: siteProfiles[0],
state: null,
feedback: '',
},
};
expect(wrapper.vm.formData).toEqual({
projectPath,
targetUrl,
fullPath: projectPath,
siteProfileId: siteProfiles[0],
});
});
});
......@@ -77,8 +105,8 @@ describe('OnDemandScansApp', () => {
describe('formHasErrors', () => {
it('returns true if any of the fields are invalid', () => {
wrapper.vm.form = {
targetUrl: {
value: targetUrl,
siteProfileId: {
value: siteProfiles[0],
state: false,
feedback: '',
},
......@@ -92,8 +120,8 @@ describe('OnDemandScansApp', () => {
it('returns false if none of the fields are invalid', () => {
wrapper.vm.form = {
targetUrl: {
value: targetUrl,
siteProfileId: {
value: siteProfiles[0],
state: null,
feedback: '',
},
......@@ -109,7 +137,7 @@ describe('OnDemandScansApp', () => {
describe('someFieldEmpty', () => {
it('returns true if any of the fields are empty', () => {
wrapper.vm.form = {
targetUrl: {
siteProfileId: {
value: '',
state: false,
feedback: '',
......@@ -124,8 +152,8 @@ describe('OnDemandScansApp', () => {
it('returns false if no field is empty', () => {
wrapper.vm.form = {
targetUrl: {
value: targetUrl,
siteProfileId: {
value: siteProfiles[0],
state: null,
feedback: '',
},
......@@ -161,42 +189,88 @@ describe('OnDemandScansApp', () => {
});
});
describe('target URL input', () => {
it.each(['asd', 'example.com'])('is marked as invalid provided an invalid URL', async value => {
const input = findTargetUrlInput();
input.vm.$emit('input', value);
await wrapper.vm.$nextTick();
describe('site profiles', () => {
describe('while site profiles are being fetched', () => {
beforeEach(() => {
createComponent({ mocks: { $apollo: { queries: { siteProfiles: { loading: true } } } } });
});
it('shows a skeleton loader', () => {
expect(wrapper.contains(GlSkeletonLoader)).toBe(true);
});
});
describe('when site profiles could not be fetched', () => {
beforeEach(() => {
createComponent();
return wrapper.vm.showErrors('ERROR_FETCH_SITE_PROFILES');
});
it('shows a non-dismissible alert and no field', () => {
const alert = findAlert();
expect(alert.exists()).toBe(true);
expect(alert.props('dismissible')).toBe(false);
expect(alert.text()).toContain('Could not fetch site profiles. Please try again.');
});
});
describe('when there are no site profiles yet', () => {
beforeEach(() => {
createFullComponent();
});
it('disables the link to manage site profiles', () => {
expect(findManageSiteProfilesButton().props('disabled')).toBe(true);
});
expect(wrapper.vm.form.targetUrl).toEqual({
value,
state: false,
feedback: 'Please enter a valid URL format, ex: http://www.example.com/home',
it('shows a link to create a new site profile', () => {
const link = findCreateNewSiteProfileLink();
expect(link.exists()).toBe(true);
expect(link.attributes('href')).toBe(newSiteProfilePath);
});
expect(input.attributes().state).toBeUndefined();
});
it('is marked as valid provided a valid URL', async () => {
const input = findTargetUrlInput();
input.vm.$emit('input', targetUrl);
await wrapper.vm.$nextTick();
describe('when there are site profiles', () => {
beforeEach(() => {
createComponent({
data: {
siteProfiles,
},
});
});
it('shows a dropdown containing the site profiles', () => {
const dropdown = findSiteProfilesDropdown();
expect(dropdown.exists()).toBe(true);
expect(dropdown.element.children).toHaveLength(siteProfiles.length);
});
expect(wrapper.vm.form.targetUrl).toEqual({
value: targetUrl,
state: true,
feedback: null,
it('when a site profile is selected, its summary is displayed below the dropdown', async () => {
wrapper.vm.form.dastSiteProfileId.value = siteProfiles[0].id;
await wrapper.vm.$nextTick();
const summary = wrapper.find('[data-testid="site-profile-summary"]');
expect(summary.exists()).toBe(true);
expect(summary.text()).toContain(siteProfiles[0].targetUrl);
});
expect(input.attributes().state).toBe('true');
});
});
describe('submission', () => {
beforeEach(() => {
createComponent({
data: {
siteProfiles,
},
});
});
describe('on success', () => {
beforeEach(async () => {
beforeEach(() => {
jest
.spyOn(wrapper.vm.$apollo, 'mutate')
.mockResolvedValue({ data: { runDastScan: { pipelineUrl, errors: [] } } });
const input = findTargetUrlInput();
input.vm.$emit('input', targetUrl);
.mockResolvedValue({ data: { dastOnDemandScanCreate: { pipelineUrl, errors: [] } } });
findSiteProfilesDropdown().vm.$emit('input', siteProfiles[0]);
submitForm();
});
......@@ -206,12 +280,12 @@ describe('OnDemandScansApp', () => {
it('triggers GraphQL mutation', () => {
expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({
mutation: runDastScanMutation,
mutation: dastOnDemandScanCreate,
variables: {
scanType: 'PASSIVE',
branch: 'master',
targetUrl,
projectPath,
dastSiteProfileId: siteProfiles[0],
fullPath: projectPath,
},
});
});
......@@ -219,13 +293,16 @@ describe('OnDemandScansApp', () => {
it('redirects to the URL provided in the response', () => {
expect(redirectTo).toHaveBeenCalledWith(pipelineUrl);
});
it('does not show an alert', () => {
expect(findAlert().exists()).toBe(false);
});
});
describe('on top-level error', () => {
beforeEach(async () => {
beforeEach(() => {
jest.spyOn(wrapper.vm.$apollo, 'mutate').mockRejectedValue();
const input = findTargetUrlInput();
input.vm.$emit('input', targetUrl);
findSiteProfilesDropdown().vm.$emit('input', siteProfiles[0]);
submitForm();
});
......@@ -233,19 +310,21 @@ describe('OnDemandScansApp', () => {
expect(wrapper.vm.loading).toBe(false);
});
it('shows an error flash', () => {
expect(createFlash).toHaveBeenCalledWith('Could not run the scan. Please try again.');
it('shows an alert', () => {
const alert = findAlert();
expect(alert.exists()).toBe(true);
expect(alert.text()).toContain('Could not run the scan. Please try again.');
});
});
describe('on errors as data', () => {
beforeEach(async () => {
const errors = ['A', 'B', 'C'];
const errors = ['error#1', 'error#2', 'error#3'];
beforeEach(() => {
jest
.spyOn(wrapper.vm.$apollo, 'mutate')
.mockResolvedValue({ data: { runDastScan: { pipelineUrl: null, errors } } });
const input = findTargetUrlInput();
input.vm.$emit('input', targetUrl);
.mockResolvedValue({ data: { dastOnDemandScanCreate: { pipelineUrl: null, errors } } });
findSiteProfilesDropdown().vm.$emit('input', siteProfiles[0]);
submitForm();
});
......@@ -253,9 +332,23 @@ describe('OnDemandScansApp', () => {
expect(wrapper.vm.loading).toBe(false);
});
it('shows an error flash', () => {
expect(createFlash).toHaveBeenCalledWith('Could not run the scan: A, B, C');
it('shows an alert with the returned errors', () => {
const alert = findAlert();
expect(alert.exists()).toBe(true);
errors.forEach(error => {
expect(alert.text()).toContain(error);
});
});
});
});
describe('cancel', () => {
it('emits cancel event on click', () => {
jest.spyOn(wrapper.vm, '$emit');
findCancelButton().vm.$emit('click');
expect(wrapper.vm.$emit).toHaveBeenCalledWith('cancel');
});
});
});
ee/spec/helpers/projects/on_demand_scans_helper_spec.rb
View file @ 47ca3421
......@@ -11,7 +11,9 @@ RSpec.describe Projects::OnDemandScansHelper do
'help-page-path' => help_page_path('user/application_security/dast/index', anchor: 'on-demand-scans'),
'empty-state-svg-path' => match_asset_path('/assets/illustrations/empty-state/ondemand-scan-empty.svg'),
'default-branch' => project.default_branch,
'project-path' => project.path_with_namespace
'project-path' => project.path_with_namespace,
'profiles-library-path': project_profiles_path(project),
'new-site-profile-path': new_project_dast_site_profile_path(project)
)
end
end
......
locale/gitlab.pot
View file @ 47ca3421
......@@ -16655,21 +16655,33 @@ msgstr ""
msgid "OnDemandScans|Attached branch is where the scan job runs."
msgstr ""
msgid "OnDemandScans|Could not fetch site profiles. Please try again."
msgstr ""
msgid "OnDemandScans|Could not run the scan. Please try again."
msgstr ""
msgid "OnDemandScans|Could not run the scan: %{backendErrorMessage}"
msgstr ""
msgid "OnDemandScans|Create a new site profile"
msgstr ""
msgid "OnDemandScans|Create new DAST scan"
msgstr ""
msgid "OnDemandScans|DAST will scan the target URL and any discovered sub URLs."
msgstr ""
msgid "OnDemandScans|Manage profiles"
msgstr ""
msgid "OnDemandScans|New on-demand DAST scan"
msgstr ""
msgid "OnDemandScans|No profile yet. In order to create a new scan, you need to have at least one completed site profile."
msgstr ""
msgid "OnDemandScans|On-demand Scans"
msgstr ""
......@@ -16679,24 +16691,42 @@ msgstr ""
msgid "OnDemandScans|Only a passive scan can be performed on demand."
msgstr ""
msgid "OnDemandScans|Passive"
msgstr ""
msgid "OnDemandScans|Passive DAST Scan"
msgstr ""
msgid "OnDemandScans|Please enter a valid URL format, ex: http://www.example.com/home"
msgstr ""
msgid "OnDemandScans|Run scan"
msgstr ""
msgid "OnDemandScans|Run this scan"
msgstr ""
msgid "OnDemandScans|Scan mode"
msgstr ""
msgid "OnDemandScans|Scanner settings"
msgstr ""
msgid "OnDemandScans|Schedule or run scans immediately against target sites. Currently available on-demand scan type: DAST. %{helpLinkStart}More information%{helpLinkEnd}"
msgstr ""
msgid "OnDemandScans|Select one of the existing profiles"
msgstr ""
msgid "OnDemandScans|Site profiles"
msgstr ""
msgid "OnDemandScans|Target URL"
msgstr ""
msgid "OnDemandScans|Use existing site profile"
msgstr ""
msgid "Once a project is permanently deleted it %{strongStart}cannot be recovered%{strongEnd}. Permanently deleting this project will %{strongStart}immediately delete%{strongEnd} its respositories and %{strongStart}all related resources%{strongEnd} including issues, merge requests etc."
msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7