Commit b5e7de21 authored by GitLab Bot's avatar GitLab Bot

Add latest changes from gitlab-org/security/gitlab@13-5-stable-ee

parent fa2fec1d
<script> <script>
/* eslint-disable vue/no-v-html */
import { throttle, isEmpty } from 'lodash'; import { throttle, isEmpty } from 'lodash';
import { mapGetters, mapState, mapActions } from 'vuex'; import { mapGetters, mapState, mapActions } from 'vuex';
import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; import { GlLoadingIcon, GlIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
import { isScrolledToBottom } from '~/lib/utils/scroll_utils'; import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
import { polyfillSticky } from '~/lib/utils/sticky'; import { polyfillSticky } from '~/lib/utils/sticky';
...@@ -36,6 +35,9 @@ export default { ...@@ -36,6 +35,9 @@ export default {
GlLoadingIcon, GlLoadingIcon,
SharedRunner: () => import('ee_component/jobs/components/shared_runner_limit_block.vue'), SharedRunner: () => import('ee_component/jobs/components/shared_runner_limit_block.vue'),
}, },
directives: {
SafeHtml,
},
mixins: [delayedJobMixin], mixins: [delayedJobMixin],
props: { props: {
artifactHelpUrl: { artifactHelpUrl: {
...@@ -223,7 +225,7 @@ export default { ...@@ -223,7 +225,7 @@ export default {
</div> </div>
<callout v-if="shouldRenderHeaderCallout"> <callout v-if="shouldRenderHeaderCallout">
<div v-html="job.callout_message"></div> <div v-safe-html="job.callout_message"></div>
</callout> </callout>
</header> </header>
<!-- EO Header Section --> <!-- EO Header Section -->
......
...@@ -136,7 +136,7 @@ class BuildDetailsEntity < JobEntity ...@@ -136,7 +136,7 @@ class BuildDetailsEntity < JobEntity
docs_url = "https://docs.gitlab.com/ee/ci/yaml/README.html#dependencies" docs_url = "https://docs.gitlab.com/ee/ci/yaml/README.html#dependencies"
[ [
failure_message.html_safe, failure_message,
help_message(docs_url).html_safe help_message(docs_url).html_safe
].join("<br />") ].join("<br />")
end end
......
---
title: Fix XSS vulnerability for job build dependencies
merge_request:
author:
type: security
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