Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix unsafe preservation across newlines #74960

Merged
merged 3 commits into from Jun 11, 2021
Merged

fix unsafe preservation across newlines #74960

merged 3 commits into from Jun 11, 2021

Conversation

bcoca
Copy link
Member

@bcoca bcoca commented Jun 10, 2021

SUMMARY

CVE-2021-3583

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

template

@ansibot ansibot added affects_2.12 bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. needs_triage Needs a first human triage before being processed. small_patch support:core This issue/PR relates to code supported by the Ansible Engineering Team. and removed small_patch labels Jun 10, 2021
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. and removed core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jun 10, 2021
nitzmahone
nitzmahone reviewed Jun 10, 2021
View reviewed changes
Copy link
Member

@nitzmahone nitzmahone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs changelog, otherwise LGTM

@ansibot ansibot added shipit This PR is ready to be merged by Core and removed core_review In order to be merged, this PR must follow the core review workflow. labels Jun 10, 2021
@bcoca @relrod
fix unsafe preservation across newlines
df6b678 
  CVE-2021-3583
  ensure we always have unsafe

Co-authored-by: Rick Elrod <rick@elrod.me>
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. and removed shipit This PR is ready to be merged by Core needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. labels Jun 10, 2021
@ansibot ansibot added needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI. core_review In order to be merged, this PR must follow the core review workflow. and removed needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jun 10, 2021
@ansibot ansibot added the test This PR relates to tests. label Jun 10, 2021
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. and removed core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jun 10, 2021
@jborean93 jborean93 removed the needs_triage Needs a first human triage before being processed. label Jun 10, 2021
@ansibot ansibot added needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. and removed core_review In order to be merged, this PR must follow the core review workflow. needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jun 10, 2021
@bcoca bcoca merged commit 4c8c40f into ansible:devel Jun 11, 2021
@bcoca bcoca deleted the l_fix branch June 11, 2021 13:33
bcoca added a commit to bcoca/ansible that referenced this pull request Jun 11, 2021
@bcoca
fix unsafe preservation across newlines (ansible#74960)
94c4f3a 
* fix unsafe preservation across newlines

  CVE-2021-3583
  ensure we always have unsafe

Co-authored-by: Rick Elrod <rick@elrod.me>
(cherry picked from commit 4c8c40f)
bcoca added a commit to bcoca/ansible that referenced this pull request Jun 11, 2021
@bcoca
fix unsafe preservation across newlines (ansible#74960)
d32c4d8 
* fix unsafe preservation across newlines

  CVE-2021-3583
  ensure we always have unsafe

Co-authored-by: Rick Elrod <rick@elrod.me>
(cherry picked from commit 4c8c40f)
bcoca added a commit to bcoca/ansible that referenced this pull request Jun 11, 2021
@bcoca
fix unsafe preservation across newlines (ansible#74960)
743d67a 
* fix unsafe preservation across newlines

  CVE-2021-3583
  ensure we always have unsafe

Co-authored-by: Rick Elrod <rick@elrod.me>
(cherry picked from commit 4c8c40f)
bcoca added a commit to bcoca/ansible that referenced this pull request Jun 11, 2021
@bcoca
fix unsafe preservation across newlines (ansible#74960)
4ee797a 
* fix unsafe preservation across newlines

  CVE-2021-3583
  ensure we always have unsafe

Co-authored-by: Rick Elrod <rick@elrod.me>
(cherry picked from commit 4c8c40f)
bcoca added a commit to bcoca/ansible that referenced this pull request Jun 11, 2021
@bcoca
fix unsafe preservation across newlines (ansible#74960)
0834cc7 
* fix unsafe preservation across newlines

  CVE-2021-3583
  ensure we always have unsafe

Co-authored-by: Rick Elrod <rick@elrod.me>
(cherry picked from commit 4c8c40f)
relrod pushed a commit that referenced this pull request Jun 11, 2021
@bcoca
fix unsafe preservation across newlines (#74960) (#74973)
03aff64 
  CVE-2021-3583
  ensure we always have unsafe

Co-authored-by: Rick Elrod <rick@elrod.me>
(cherry picked from commit 4c8c40f)
relrod pushed a commit that referenced this pull request Jun 11, 2021
@bcoca
fix unsafe preservation across newlines (#74960) (#74975)
8aa850e 
  CVE-2021-3583
  ensure we always have unsafe

Co-authored-by: Rick Elrod <rick@elrod.me>
(cherry picked from commit 4c8c40f)
relrod pushed a commit that referenced this pull request Jun 11, 2021
@bcoca
fix unsafe preservation across newlines (#74960) (#74976)
8b17e5b 
  CVE-2021-3583
  ensure we always have unsafe

Co-authored-by: Rick Elrod <rick@elrod.me>
(cherry picked from commit 4c8c40f)
@ansible ansible locked and limited conversation to collaborators Jul 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@relrod relrod relrod left review comments

@nitzmahone nitzmahone nitzmahone left review comments

@jborean93 jborean93 jborean93 left review comments

@Shrews Shrews Shrews approved these changes

@mkrizek mkrizek mkrizek approved these changes

Assignees
No one assigned
Labels
affects_2.12 bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. support:core This issue/PR relates to code supported by the Ansible Engineering Team. test This PR relates to tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@bcoca @relrod @Shrews @mkrizek @nitzmahone @jborean93 @ansibot