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

support for older jinja2 in installer #5501 #6471

Merged
merged 1 commit into from
Mar 31, 2020
Merged

support for older jinja2 in installer #5501 #6471

merged 1 commit into from
Mar 31, 2020

Conversation

megabreit
Copy link
Contributor

SUMMARY

Fix for #5501

Support older versions of jinja2 e.g. in RHEL 7 in the Openshift installer
equalto is not available, so change it to match

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME
  • Installer
AWX VERSION
>=9.0.1
ADDITIONAL INFORMATION

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@ryanpetrello ryanpetrello requested a review from shanemcd March 28, 2020 02:56
ryanpetrello
ryanpetrello previously approved these changes Mar 28, 2020
View reviewed changes
@ryanpetrello
Copy link
Contributor

@shanemcd you have any thoughts on this? If not, I'm going to merge it.

@ryanpetrello
Copy link
Contributor

ryanpetrello commented Mar 30, 2020 •
edited
Loading

@megabreit is this match a fuzzy match? What if you've got two contexts with similar names (i.e., one name is a substring of another, like awx-prod and awx)?

Jinja2 docs suggest to me that it's a regex-like match. Do we need a ^ and $ one either end of the string (or something like it) here?

@ryanpetrello ryanpetrello dismissed their stale review March 30, 2020 16:42

I've got some more questions about this.

@ryanpetrello ryanpetrello requested a review from matburt March 30, 2020 16:56
@megabreit
Copy link
Contributor Author

@ryanpetrello You are right, the match requires a reg-ex to emulate equalto completely. But it's not really necessary.
It's working because in openshift_auth.yml a fresh config file /tmp/awx/.kube/config is generated which only contains one (the current) cluster and the current context.
~/.kube/config is never used.
I can add the missing reg-ex, but in case that oc some time behaves like plain kubernetes, the openshift tasks are probably removed anyway and the kubernetes tasks are used.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 0beda08 into ansible:devel Mar 31, 2020
@ryanpetrello
Copy link
Contributor

Thanks @megabreit 👍

@megabreit megabreit deleted the jinja2-installer-fix branch March 31, 2020 15:08
kdelee pushed a commit to kdelee/awx that referenced this pull request May 8, 2024
@TheRealHaoLiu
Fix CVE-2023-40267 (ansible#14388) (ansible#6471)
767715c 
CVE-2023-40267 GitPython: Insecure non-multi options in clone and clone_from is not blocked https://bugzilla.redhat.com/show_bug.cgi?id=2231474

GitPython before 3.1.32 does not block insecure non-multi options in clone and clone_from. NOTE: this issue exists because of an incomplete fix for CVE-2022-24439.

References:
gitpython-developers/GitPython@ca965ec gitpython-developers/GitPython#1609
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryanpetrello ryanpetrello ryanpetrello approved these changes

@shanemcd shanemcd Awaiting requested review from shanemcd

@matburt matburt Awaiting requested review from matburt

Assignees
No one assigned
Labels
component:installer type:bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@megabreit @ryanpetrello @awxbot