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

properly escape quotes in passwords by calling to_ruby #1189

Merged
merged 1 commit into from
Oct 18, 2024
Merged

properly escape quotes in passwords by calling to_ruby #1189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/database.yml.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
username: <%= $username %>
<% } -%>
<% if $password { -%>
password: "<%= $password %>"
password: <%= stdlib::to_ruby($password) %>
Copy link
Member

Choose a reason for hiding this comment

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

On my phone so tricky to check, but can this be a Sensitive and does it handle that well?

Copy link
Member Author

Choose a reason for hiding this comment

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

Technically, it can. No idea how to test this tho 🙈

In pulpcore, we're lucky, it's a String.

Copy link
Member

Choose a reason for hiding this comment

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

I think you can pass Sensitive to epp and it will automatically unwrap it, so that's fine.

Copy link
Member Author

Choose a reason for hiding this comment

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

added a test, let's see

Copy link
Member Author

Choose a reason for hiding this comment

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

lol. init.pp says db_password is a String, while the epp file allows Sensitive[String]:

puppet-foreman/manifests/init.pp

Line 229 in b1a2286

String[1] $db_password = $foreman::params::db_password,

puppet-foreman/templates/database.yml.epp

Line 9 in b1a2286

Variant[Undef, String[1], Sensitive[String[1]]] $password,

Copy link
Member Author

Choose a reason for hiding this comment

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

going to drop the test (as it's failing now) and add sensitive support later

Copy link
Member Author

Choose a reason for hiding this comment

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

#1190 says this does not work for Sensitive

Copy link
Member Author

Choose a reason for hiding this comment

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

and this not even works properly, what the hell

Copy link
Member Author

Choose a reason for hiding this comment

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

oh I'm stupid, I was running a non-patched installer 🙈

<% } -%>
pool: <%= $db_pool %>
Loading