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

ansible_mitogen: Remove restrictive whitelist of modules served from controller #1012

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 2 additions & 6 deletions .ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,9 @@ jobs:

# NOTE: this hangs when ran in Ubuntu 18.04
Van_27_210:
tox.env: py27-mode_localhost-ansible2.10
STRATEGY: linear
ANSIBLE_SKIP_TAGS: resource_intensive
tox.env: py27-mode_localhost-ansible2.10-strategy_linear
Van_27_4:
tox.env: py27-mode_localhost-ansible4
STRATEGY: linear
ANSIBLE_SKIP_TAGS: resource_intensive
tox.env: py27-mode_localhost-ansible4-strategy_linear

- job: Linux
pool:
Expand Down
3 changes: 0 additions & 3 deletions ansible_mitogen/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,6 @@ def _setup_responder(responder):
Configure :class:`mitogen.master.ModuleResponder` to only permit
certain packages, and to generate custom responses for certain modules.
"""
responder.whitelist_prefix('ansible')
responder.whitelist_prefix('ansible_mitogen')

# Ansible 2.3 is compatible with Python 2.4 targets, however
# ansible/__init__.py is not. Instead, executor/module_common.py writes
# out a 2.4-compatible namespace package for unknown reasons. So we
Expand Down
2 changes: 2 additions & 0 deletions tests/ansible/integration/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
tags: playbook_semantics
- import_playbook: process/all.yml
tags: process
- import_playbook: responder/all.yml
tags: responder
- import_playbook: runner/all.yml
tags: runner
- import_playbook: ssh/all.yml
Expand Down
1 change: 1 addition & 0 deletions tests/ansible/integration/responder/all.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- import_playbook: imports.yml
23 changes: 23 additions & 0 deletions tests/ansible/integration/responder/imports.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- name: integration/responder/imports.yml
hosts: test-targets
tasks:
- meta: end_play
when: not is_mitogen

- name: Import pure Python module via Ansible module
mitogen_plain_old_add:
x: 2
y: 2
register: mitogen_plain_old_add_result

- name: Import binary module via Responder
custom_python_run_script:
script: |
import lxml
register: binary_module_result

- name: Import missing module via Responder
custom_python_run_script:
script: |
import does_not_exist
register: missing_module_result
36 changes: 36 additions & 0 deletions tests/ansible/lib/modules/mitogen_plain_old_add.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env python

DOCUMENTATION = '''
module: mitogen_plain_old_add
options:
x: {type: int, required: true}
y: {type: int, required: true}
author:
- Alex Willmer (@moreati)
'''

RETURN = '''
total: {type: int, returned: always, sample: 42}
'''

from ansible.module_utils.basic import AnsibleModule

import plain_old_module

def main():
module = AnsibleModule(
argument_spec={
'x': {'type': int, 'required': True},
'x': {'type': int, 'required': True},
},
supports_check_mode=True,
)
result = {
'changed': False,
'total': plain_old_module.add(module.params['x'], module.params['y']),
}
module.exit_json(**result)


if __name__ == '__main__':
main()
2 changes: 2 additions & 0 deletions tests/ansible/run_ansible_playbook.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
os.environ['PATH'],
)

os.environ['PYTHONPATH'] = os.path.join(GIT_BASEDIR, 'tests', 'data')

extra = {
'is_mitogen': os.environ.get('ANSIBLE_STRATEGY', '').startswith('mitogen'),
'git_basedir': GIT_BASEDIR,
Expand Down