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.

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

Add trust_input option to postgresql_slot module #298

Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/fragments/298-postgresql_slot_add_trust_input.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
minor_changes:
- postgresql_slot - add the ``trust_input`` parameter (https://github.com/ansible-collections/community.general/pull/298).
13 changes: 13 additions & 0 deletions plugins/modules/database/postgresql/postgresql_slot.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
- Permissions checking for SQL commands is carried out as though
the session_role were the one that had logged in originally.
type: str
trust_input:
description:
- If C(no), check whether values of some parameters are potentially dangerous.
andytom marked this conversation as resolved.
Show resolved Hide resolved
type: bool
default: yes

notes:
- Physical replication slots were introduced to PostgreSQL with version 9.4,
Expand All @@ -89,6 +94,7 @@
author:
- John Scalia (@jscalia)
- Andrew Klychkov (@Andersson007)
- Thomas O'Donnell (@andytom)
extends_documentation_fragment:
- community.general.postgres

Expand Down Expand Up @@ -147,6 +153,9 @@
pass

from ansible.module_utils.basic import AnsibleModule
from ansible_collections.community.general.plugins.module_utils.database import (
check_input,
)
from ansible_collections.community.general.plugins.module_utils.postgres import (
connect_to_db,
exec_sql,
Expand Down Expand Up @@ -229,6 +238,7 @@ def main():
session_role=dict(type="str"),
output_plugin=dict(type="str", default="test_decoding"),
state=dict(type="str", default="present", choices=["absent", "present"]),
trust_input=dict(type="bool", default=True),
)

module = AnsibleModule(
Expand All @@ -242,6 +252,9 @@ def main():
state = module.params["state"]
output_plugin = module.params["output_plugin"]

if not module.params["trust_input"]:
check_input(module, module.params['session_role'])

if immediately_reserve and slot_type == 'logical':
module.fail_json(msg="Module parameters immediately_reserve and slot_type=logical are mutually exclusive")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# Copyright: (c) 2019, Andrew Klychkov (@Andersson007) <aaklychkov@mail.ru>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

Expand Down Expand Up @@ -55,7 +56,7 @@
query: "SELECT 1 FROM pg_replication_slots WHERE slot_name = 'slot0'"
ignore_errors: yes
register: result

- assert:
that:
- result.rowcount == 0
Expand Down Expand Up @@ -92,7 +93,7 @@
query: "SELECT 1 FROM pg_replication_slots WHERE slot_name = 'slot0' and slot_type = 'physical'"
ignore_errors: yes
register: result

- assert:
that:
- result.rowcount == 1
Expand Down Expand Up @@ -123,7 +124,7 @@
query: "SELECT 1 FROM pg_replication_slots WHERE slot_name = 'slot0' and slot_type = 'physical'"
ignore_errors: yes
register: result

- assert:
that:
- result.rowcount == 1
Expand Down Expand Up @@ -154,7 +155,7 @@
query: "SELECT 1 FROM pg_replication_slots WHERE slot_name = 'slot0' and slot_type = 'physical'"
ignore_errors: yes
register: result

- assert:
that:
- result.rowcount == 1
Expand Down Expand Up @@ -191,7 +192,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('9.6', '>=')

- assert:
that:
- result.rowcount == 1
Expand Down Expand Up @@ -238,7 +239,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('10', '>=') and ansible_distribution == 'Ubuntu'

- assert:
that:
- result.rowcount == 0
Expand Down Expand Up @@ -273,7 +274,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('10', '>=') and ansible_distribution == 'Ubuntu'

- assert:
that:
- result.rowcount == 1
Expand Down Expand Up @@ -309,7 +310,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('10', '>=')

- assert:
that:
- result.rowcount == 1
Expand Down Expand Up @@ -344,7 +345,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('10', '>=') and ansible_distribution == 'Ubuntu'

- assert:
that:
- result.rowcount == 1
Expand Down Expand Up @@ -383,7 +384,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('10', '>=') and ansible_distribution == 'Ubuntu'

- assert:
that:
- result.rowcount == 1
Expand Down Expand Up @@ -423,7 +424,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('10', '>=') and ansible_distribution == 'Ubuntu'

- assert:
that:
- result.rowcount == 1
Expand Down Expand Up @@ -458,7 +459,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('10', '>=') and ansible_distribution == 'Ubuntu'

- assert:
that:
- result.rowcount == 0
Expand Down Expand Up @@ -494,7 +495,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('10', '>=')

- assert:
that:
- result.rowcount == 0
Expand Down Expand Up @@ -529,7 +530,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('10', '>=') and ansible_distribution == 'Ubuntu'

- assert:
that:
- result.rowcount == 0
Expand Down Expand Up @@ -568,7 +569,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('9.6', '>=')

- assert:
that:
- result.rowcount == 1
Expand Down Expand Up @@ -603,7 +604,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('9.6', '>=')

- assert:
that:
- result.rowcount == 0
Expand Down Expand Up @@ -639,7 +640,7 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('9.6', '>=')

- assert:
that:
- result.rowcount == 0
Expand Down Expand Up @@ -674,12 +675,30 @@
ignore_errors: yes
register: result
when: postgres_version_resp.stdout is version('9.6', '>=')

- assert:
that:
- result.rowcount == 0
when: postgres_version_resp.stdout is version('9.6', '>=')

# Check trust input
- name: postgresql_slot - try using a bad name
postgresql_slot:
session_role: 'curious.anonymous"; SELECT * FROM information_schema.tables; --'
db: postgres
name: slot1
trust_input: no
register: result
ignore_errors: true
when: postgres_version_resp.stdout is version('9.6', '>=')

- name: postgresql_slot - check that using a dangerous name fails
assert:
that:
- result is failed
- result.msg is search('is potentially dangerous')
when: postgres_version_resp.stdout is version('9.6', '>=')

#
# clean up
#
Expand Down