Skip to content

Prevent passwords and client keys being leaked when tasks fail #53

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

Merged
merged 6 commits into from
Nov 22, 2022
Merged

Prevent passwords and client keys being leaked when tasks fail #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d5d4163
feat: change loop approach in `pulp_repository`
jackhodgkiss Nov 22, 2022
0e83328
feat: change loop approach in `pulp_django_user`
jackhodgkiss Nov 22, 2022
d908c84
feat: change loop approach in `pulp_content_guard`
jackhodgkiss Nov 22, 2022
05cc205
fix: incorrect indentation on `loop`
jackhodgkiss Nov 22, 2022
7b44301
fix: remove unwanted `double quote`
jackhodgkiss Nov 22, 2022
6e5b2cd
fix: remove remaining unwanted `double quotes`
jackhodgkiss Nov 22, 2022
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
12 changes: 6 additions & 6 deletions roles/pulp_content_guard/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
name: "{{ item.name }}"
description: "{{ item.description | default(omit) }}"
ca_certificate: "{{ item.ca_certificate | default(omit) }}"
state: "{{ item.state }}"
with_items: "{{ pulp_content_guard_x509_cert_guards }}"
name: "{{ pulp_content_guard_x509_cert_guards[cert_guard_index].name }}"
description: "{{ pulp_content_guard_x509_cert_guards[cert_guard_index].description | default(omit) }}"
ca_certificate: "{{ pulp_content_guard_x509_cert_guards[cert_guard_index].ca_certificate | default(omit) }}"
state: "{{ pulp_content_guard_x509_cert_guards[cert_guard_index].state }}"
loop: "{{ pulp_content_guard_x509_cert_guards | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: cert_guard_index

- name: Ensure RBAC cert guards exist
import_tasks: rbac/rbac.yml
10 changes: 5 additions & 5 deletions roles/pulp_django_user/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
Cookie: "{{ result_login.cookies_string }}"
body:
csrfmiddlewaretoken: "{{ result_login.cookies.csrftoken }}"
username: "{{ item.username }}"
password1: "{{ item.password }}"
password2: "{{ item.password }}"
username: "{{ pulp_django_users[user_index].username }}"
password1: "{{ pulp_django_users[user_index].password }}"
password2: "{{ pulp_django_users[user_index].password }}"
body_format: form-urlencoded
follow_redirects: all
validate_certs: "{{ pulp_validate_certs | bool }}"
loop: "{{ pulp_django_users }}"
loop: "{{ pulp_django_users | map(attribute='username') }}"
loop_control:
label: "{{ item.username }}"
index_var: user_index

- name: Add or remove user from group(s)
include_tasks: user_groups/add_or_remove_users.yml
Expand Down
62 changes: 32 additions & 30 deletions roles/pulp_repository/tasks/container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,53 @@
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
name: "{{ item.name }}"
state: "{{ item.state }}"
with_items: "{{ pulp_repository_container_repos }}"
name: "{{ pulp_repository_container_repos[repository_index].name }}"
state: "{{ pulp_repository_container_repos[repository_index].state }}"
loop: "{{ pulp_repository_container_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index

- name: Setup container remotes
pulp.squeezer.container_remote:
pulp_url: "{{ pulp_url }}"
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
name: "{{ item.name }}-remote"
ca_cert: "{{ item.ca_cert | default(omit) }}"
client_cert: "{{ item.client_cert | default(omit) }}"
client_key: "{{ item.client_key | default(omit) }}"
download_concurrency: "{{ item.download_concurrency | default(omit) }}"
exclude_tags: "{{ item.exclude_tags | default(omit) }}"
include_tags: "{{ item.include_tags | default(omit) }}"
policy: "{{ item.policy | default(omit) }}"
proxy_url: "{{ item.proxy_url | default(omit) }}"
proxy_username: "{{ item.proxy_username | default(omit) }}"
proxy_password: "{{ item.proxy_password | default(omit) }}"
remote_username: "{{ item.remote_username | default(omit) }}"
remote_password: "{{ item.remote_password | default(omit) }}"
tls_validation: "{{ item.tls_validation | default(omit) }}"
upstream_name: "{{ item.upstream_name | default(item.name) }}"
url: "{{ item.url | default(omit) }}"
state: "{{ item.state }}"
with_items: "{{ pulp_repository_container_repos }}"
when: item.state == "absent" or item.url is defined
name: "{{ pulp_repository_container_repos[repository_index].name }}-remote"
ca_cert: "{{ pulp_repository_container_repos[repository_index].ca_cert | default(omit) }}"
client_cert: "{{ pulp_repository_container_repos[repository_index].client_cert | default(omit) }}"
client_key: "{{ pulp_repository_container_repos[repository_index].client_key | default(omit) }}"
download_concurrency: "{{ pulp_repository_container_repos[repository_index].download_concurrency | default(omit) }}"
exclude_tags: "{{ pulp_repository_container_repos[repository_index].exclude_tags | default(omit) }}"
include_tags: "{{ pulp_repository_container_repos[repository_index].include_tags | default(omit) }}"
policy: "{{ pulp_repository_container_repos[repository_index].policy | default(omit) }}"
proxy_url: "{{ pulp_repository_container_repos[repository_index].proxy_url | default(omit) }}"
proxy_username: "{{ pulp_repository_container_repos[repository_index].proxy_username | default(omit) }}"
proxy_password: "{{ pulp_repository_container_repos[repository_index].proxy_password | default(omit) }}"
remote_username: "{{ pulp_repository_container_repos[repository_index].remote_username | default(omit) }}"
remote_password: "{{ pulp_repository_container_repos[repository_index].remote_password | default(omit) }}"
tls_validation: "{{ pulp_repository_container_repos[repository_index].tls_validation | default(omit) }}"
upstream_name: "{{ pulp_repository_container_repos[repository_index].upstream_name | default(pulp_repository_container_repos[repository_index].name) }}"
url: "{{ pulp_repository_container_repos[repository_index].url | default(omit) }}"
state: "{{ pulp_repository_container_repos[repository_index].state }}"
when: >
pulp_repository_container_repos[repository_index].state == "absent" or
pulp_repository_container_repos[repository_index].url is defined
loop: "{{ pulp_repository_container_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index

- name: Sync container remotes into repositories
pulp.squeezer.container_sync:
pulp_url: "{{ pulp_url }}"
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
repository: "{{ item.name }}"
remote: "{{ item.name }}-remote"
with_items: "{{ pulp_repository_container_repos }}"
repository: "{{ pulp_repository_container_repos[repository_index].name }}"
remote: "{{ pulp_repository_container_repos[repository_index].name }}-remote"
when:
- item.url is defined
- item.state == "present"
- pulp_repository_container_repos[repository_index].url is defined
- pulp_repository_container_repos[repository_index].state == "present"
loop: "{{ pulp_repository_container_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index
64 changes: 33 additions & 31 deletions roles/pulp_repository/tasks/deb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,52 +5,54 @@
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
name: "{{ item.name }}"
state: "{{ item.state }}"
with_items: "{{ pulp_repository_deb_repos }}"
name: "{{ pulp_repository_deb_repos[repository_index].name }}"
state: "{{ pulp_repository_deb_repos[repository_index].state }}"
loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index

- name: Setup DEB remotes
pulp.squeezer.deb_remote:
pulp_url: "{{ pulp_url }}"
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
name: "{{ item.name }}-remote"
architectures: "{{ item.architectures | default(omit) }}"
ca_cert: "{{ item.ca_cert | default(omit) }}"
client_cert: "{{ item.client_cert | default(omit) }}"
client_key: "{{ item.client_key | default(omit) }}"
components: "{{ item.components | default(omit) }}"
distributions: "{{ item.distributions | default(omit) }}"
download_concurrency: "{{ item.download_concurrency | default(omit) }}"
policy: "{{ item.policy | default(omit) }}"
proxy_url: "{{ item.proxy_url | default(omit) }}"
proxy_username: "{{ item.proxy_username | default(omit) }}"
proxy_password: "{{ item.proxy_password | default(omit) }}"
remote_username: "{{ item.remote_username | default(omit) }}"
remote_password: "{{ item.remote_password | default(omit) }}"
tls_validation: "{{ item.tls_validation | default(omit) }}"
url: "{{ item.url | default(omit) }}"
state: "{{ item.state }}"
with_items: "{{ pulp_repository_deb_repos }}"
when: item.state == "absent" or item.url is defined
name: "{{ pulp_repository_deb_repos[repository_index].name }}-remote"
architectures: "{{ pulp_repository_deb_repos[repository_index].architectures | default(omit) }}"
ca_cert: "{{ pulp_repository_deb_repos[repository_index].ca_cert | default(omit) }}"
client_cert: "{{ pulp_repository_deb_repos[repository_index].client_cert | default(omit) }}"
client_key: "{{ pulp_repository_deb_repos[repository_index].client_key | default(omit) }}"
components: "{{ pulp_repository_deb_repos[repository_index].components | default(omit) }}"
distributions: "{{ pulp_repository_deb_repos[repository_index].distributions | default(omit) }}"
download_concurrency: "{{ pulp_repository_deb_repos[repository_index].download_concurrency | default(omit) }}"
policy: "{{ pulp_repository_deb_repos[repository_index].policy | default(omit) }}"
proxy_url: "{{ pulp_repository_deb_repos[repository_index].proxy_url | default(omit) }}"
proxy_username: "{{ pulp_repository_deb_repos[repository_index].proxy_username | default(omit) }}"
proxy_password: "{{ pulp_repository_deb_repos[repository_index].proxy_password | default(omit) }}"
remote_username: "{{ pulp_repository_deb_repos[repository_index].remote_username | default(omit) }}"
remote_password: "{{ pulp_repository_deb_repos[repository_index].remote_password | default(omit) }}"
tls_validation: "{{ pulp_repository_deb_repos[repository_index].tls_validation | default(omit) }}"
url: "{{ pulp_repository_deb_repos[repository_index].url | default(omit) }}"
state: "{{ pulp_repository_deb_repos[repository_index].state }}"
when: >
pulp_repository_deb_repos[repository_index].state == "absent" or
pulp_repository_deb_repos[repository_index].url is defined
loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index

- name: Sync DEB remotes into repositories
pulp.squeezer.deb_sync:
pulp_url: "{{ pulp_url }}"
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
repository: "{{ item.name }}"
remote: "{{ item.name }}-remote"
mirror: "{{ item.mirror | default(omit) }}"
with_items: "{{ pulp_repository_deb_repos }}"
repository: "{{ pulp_repository_deb_repos[repository_index].name }}"
remote: "{{ pulp_repository_deb_repos[repository_index].name }}-remote"
mirror: "{{ pulp_repository_deb_repos[repository_index].mirror | default(omit) }}"
when:
- item.url is defined
- item.state == "present"
- pulp_repository_deb_repos[repository_index].url is defined
- pulp_repository_deb_repos[repository_index].state == "present"
loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index
62 changes: 32 additions & 30 deletions roles/pulp_repository/tasks/python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,53 @@
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
name: "{{ item.name }}"
state: "{{ item.state }}"
with_items: "{{ pulp_repository_python_repos }}"
name: "{{ pulp_repository_python_repos[repository_index].name }}"
state: "{{ pulp_repository_python_repos[repository_index].state }}"
loop: "{{ pulp_repository_python_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index

- name: Setup PyPI remotes
pulp.squeezer.python_remote:
pulp_url: "{{ pulp_url }}"
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
name: "{{ item.name }}-remote"
ca_cert: "{{ item.ca_cert | default(omit) }}"
client_cert: "{{ item.client_cert | default(omit) }}"
client_key: "{{ item.client_key | default(omit) }}"
download_concurrency: "{{ item.download_concurrency | default(omit) }}"
excludes: "{{ item.excludes | default(omit) }}"
includes: "{{ item.includes | default(omit) }}"
policy: "{{ item.policy | default(omit) }}"
prereleases: "{{ item.prereleases | default(omit) }}"
proxy_url: "{{ item.proxy_url | default(omit) }}"
proxy_username: "{{ item.proxy_username | default(omit) }}"
proxy_password: "{{ item.proxy_password | default(omit) }}"
remote_username: "{{ item.remote_username | default(omit) }}"
remote_password: "{{ item.remote_password | default(omit) }}"
tls_validation: "{{ item.tls_validation | default(omit) }}"
url: "{{ item.url | default(omit) }}"
state: "{{ item.state }}"
with_items: "{{ pulp_repository_python_repos }}"
when: item.state == "absent" or item.url is defined
name: "{{ pulp_repository_python_repos[repository_index].name }}-remote"
ca_cert: "{{ pulp_repository_python_repos[repository_index].ca_cert | default(omit) }}"
client_cert: "{{ pulp_repository_python_repos[repository_index].client_cert | default(omit) }}"
client_key: "{{ pulp_repository_python_repos[repository_index].client_key | default(omit) }}"
download_concurrency: "{{ pulp_repository_python_repos[repository_index].download_concurrency | default(omit) }}"
excludes: "{{ pulp_repository_python_repos[repository_index].excludes | default(omit) }}"
includes: "{{ pulp_repository_python_repos[repository_index].includes | default(omit) }}"
policy: "{{ pulp_repository_python_repos[repository_index].policy | default(omit) }}"
prereleases: "{{ pulp_repository_python_repos[repository_index].prereleases | default(omit) }}"
proxy_url: "{{ pulp_repository_python_repos[repository_index].proxy_url | default(omit) }}"
proxy_username: "{{ pulp_repository_python_repos[repository_index].proxy_username | default(omit) }}"
proxy_password: "{{ pulp_repository_python_repos[repository_index].proxy_password | default(omit) }}"
remote_username: "{{ pulp_repository_python_repos[repository_index].remote_username | default(omit) }}"
remote_password: "{{ pulp_repository_python_repos[repository_index].remote_password | default(omit) }}"
tls_validation: "{{ pulp_repository_python_repos[repository_index].tls_validation | default(omit) }}"
url: "{{ pulp_repository_python_repos[repository_index].url | default(omit) }}"
state: "{{ pulp_repository_python_repos[repository_index].state }}"
when: >
pulp_repository_python_repos[repository_index].state == "absent" or
pulp_repository_python_repos[repository_index].url is defined
loop: "{{ pulp_repository_python_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index

- name: Sync PyPI remotes into repositories
pulp.squeezer.python_sync:
pulp_url: "{{ pulp_url }}"
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
repository: "{{ item.name }}"
remote: "{{ item.name }}-remote"
with_items: "{{ pulp_repository_python_repos }}"
repository: "{{ pulp_repository_python_repos[repository_index].name }}"
remote: "{{ pulp_repository_python_repos[repository_index].name }}-remote"
when:
- item.url is defined
- item.state == "present"
- pulp_repository_python_repos[repository_index].url is defined
- pulp_repository_python_repos[repository_index].state == "present"
loop: "{{ pulp_repository_python_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index
58 changes: 30 additions & 28 deletions roles/pulp_repository/tasks/rpm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,51 @@
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
name: "{{ item.name }}"
state: "{{ item.state }}"
with_items: "{{ pulp_repository_rpm_repos }}"
name: "{{ pulp_repository_rpm_repos[repository_index].name }}"
state: "{{ pulp_repository_rpm_repos[repository_index].state }}"
loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index

- name: Setup RPM remotes
pulp.squeezer.rpm_remote:
pulp_url: "{{ pulp_url }}"
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
name: "{{ item.name }}-remote"
ca_cert: "{{ item.ca_cert | default(omit) }}"
client_cert: "{{ item.client_cert | default(omit) }}"
client_key: "{{ item.client_key | default(omit) }}"
download_concurrency: "{{ item.download_concurrency | default(omit) }}"
policy: "{{ item.policy | default(omit) }}"
proxy_url: "{{ item.proxy_url | default(omit) }}"
proxy_username: "{{ item.proxy_username | default(omit) }}"
proxy_password: "{{ item.proxy_password | default(omit) }}"
remote_username: "{{ item.remote_username | default(omit) }}"
remote_password: "{{ item.remote_password | default(omit) }}"
tls_validation: "{{ item.tls_validation | default(omit) }}"
url: "{{ item.url | default(omit) }}"
state: "{{ item.state }}"
with_items: "{{ pulp_repository_rpm_repos }}"
when: item.state == "absent" or item.url is defined
name: "{{ pulp_repository_rpm_repos[repository_index].name }}-remote"
ca_cert: "{{ pulp_repository_rpm_repos[repository_index].ca_cert | default(omit) }}"
client_cert: "{{ pulp_repository_rpm_repos[repository_index].client_cert | default(omit) }}"
client_key: "{{ pulp_repository_rpm_repos[repository_index].client_key | default(omit) }}"
download_concurrency: "{{ pulp_repository_rpm_repos[repository_index].download_concurrency | default(omit) }}"
policy: "{{ pulp_repository_rpm_repos[repository_index].policy | default(omit) }}"
proxy_url: "{{ pulp_repository_rpm_repos[repository_index].proxy_url | default(omit) }}"
proxy_username: "{{ pulp_repository_rpm_repos[repository_index].proxy_username | default(omit) }}"
proxy_password: "{{ pulp_repository_rpm_repos[repository_index].proxy_password | default(omit) }}"
remote_username: "{{ pulp_repository_rpm_repos[repository_index].remote_username | default(omit) }}"
remote_password: "{{ pulp_repository_rpm_repos[repository_index].remote_password | default(omit) }}"
tls_validation: "{{ pulp_repository_rpm_repos[repository_index].tls_validation | default(omit) }}"
url: "{{ pulp_repository_rpm_repos[repository_index].url | default(omit) }}"
state: "{{ pulp_repository_rpm_repos[repository_index].state }}"
when: >
pulp_repository_rpm_repos[repository_index].state == "absent" or
pulp_repository_rpm_repos[repository_index].url is defined
loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index

- name: Sync RPM remotes into repositories
pulp.squeezer.rpm_sync:
pulp_url: "{{ pulp_url }}"
username: "{{ pulp_username }}"
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
repository: "{{ item.name }}"
remote: "{{ item.name }}-remote"
sync_policy: "{{ item.sync_policy | default(omit) }}"
with_items: "{{ pulp_repository_rpm_repos }}"
repository: "{{ pulp_repository_rpm_repos[repository_index].name }}"
remote: "{{ pulp_repository_rpm_repos[repository_index].name }}-remote"
sync_policy: "{{ pulp_repository_rpm_repos[repository_index].sync_policy | default(omit) }}"
when:
- item.url is defined
- item.state == "present"
- pulp_repository_rpm_repos[repository_index].url is defined
- pulp_repository_rpm_repos[repository_index].state == "present"
loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}"
loop_control:
label: "{{ item.name }}"
index_var: repository_index