mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-11-21 14:48:44 +00:00
Compare commits
22
Commits
2.2.0
...
36d9bc2ebc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
36d9bc2ebc | ||
|
|
7f65f3e6d5 | ||
|
|
8129a5e8d3 | ||
|
|
7f4388b0de | ||
|
|
e03234e855 | ||
|
|
7811740296 | ||
|
|
7dfac5e719 | ||
|
|
3db746aed3 | ||
|
|
7a70c0607c | ||
|
|
61dba1eb25 | ||
|
|
e0adbf54c4 | ||
|
|
e98d9a0756 | ||
|
|
73939ba8ff | ||
|
|
2504f532b8 | ||
|
|
4ac4603af5 | ||
|
|
a4805b92b7 | ||
|
|
ee1461f46c | ||
|
|
78fb77c8d5 | ||
|
|
d4ac6f63f4 | ||
|
|
b42cbb2a97 | ||
|
|
aaacdb9d13 | ||
|
|
955acdca44 |
@@ -4,7 +4,6 @@
|
||||
# SPDX-FileCopyrightText: 2024, Ansible Project
|
||||
|
||||
skip_list:
|
||||
- meta-runtime[unsupported-version] # This rule doesn't make any sense
|
||||
- fqcn[deep] # This rule produces false positives for files in tests/unit/plugins/action/fixtures/
|
||||
- sanity[cannot-ignore] # This rule is skipped to keep backward compatibility with Python 2
|
||||
|
||||
|
||||
@@ -37,8 +37,9 @@ variables:
|
||||
resources:
|
||||
containers:
|
||||
- container: default
|
||||
image: quay.io/ansible/azure-pipelines-test-container:8.0.0
|
||||
- container: legacy
|
||||
image: quay.io/ansible/azure-pipelines-test-container:7.0.0
|
||||
|
||||
pool: Standard
|
||||
|
||||
stages:
|
||||
@@ -128,6 +129,7 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
nameFormat: "{0}"
|
||||
testFormat: 2.17/{0}
|
||||
targets:
|
||||
@@ -145,6 +147,7 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
nameFormat: "{0}"
|
||||
testFormat: 2.16/{0}
|
||||
targets:
|
||||
@@ -237,6 +240,7 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
testFormat: 2.17/linux/{0}/1
|
||||
targets:
|
||||
- name: Fedora 39
|
||||
@@ -250,6 +254,7 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
testFormat: 2.16/linux/{0}/1
|
||||
targets:
|
||||
- name: Fedora 38
|
||||
@@ -266,14 +271,14 @@ stages:
|
||||
parameters:
|
||||
testFormat: devel/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.1
|
||||
test: rhel/10.1
|
||||
- name: RHEL 9.7
|
||||
test: rhel/9.7
|
||||
- name: FreeBSD 14.4
|
||||
test: freebsd/14.4
|
||||
- name: FreeBSD 15.0
|
||||
test: freebsd/15.0
|
||||
- name: RHEL 10.2
|
||||
test: rhel/10.2
|
||||
- name: RHEL 9.8 py39
|
||||
test: rhel/9.8@3.9
|
||||
- name: FreeBSD 14.5
|
||||
test: freebsd/14.5
|
||||
- name: FreeBSD 15.1
|
||||
test: freebsd/15.1
|
||||
|
||||
- stage: Remote_2_21
|
||||
displayName: Remote 2.21
|
||||
@@ -306,8 +311,6 @@ stages:
|
||||
test: rhel/9.7
|
||||
- name: FreeBSD 14.3
|
||||
test: freebsd/14.3
|
||||
- name: FreeBSD 13.5
|
||||
test: freebsd/13.5
|
||||
|
||||
- stage: Remote_2_19
|
||||
displayName: Remote 2.19
|
||||
@@ -321,10 +324,8 @@ stages:
|
||||
test: rhel/10.1
|
||||
- name: RHEL 9.7
|
||||
test: rhel/9.7
|
||||
- name: FreeBSD 14.2
|
||||
test: freebsd/14.2
|
||||
- name: FreeBSD 13.5
|
||||
test: freebsd/13.5
|
||||
- name: FreeBSD 14.3
|
||||
test: freebsd/14.3
|
||||
|
||||
- stage: Remote_2_18
|
||||
displayName: Remote 2.18
|
||||
@@ -338,8 +339,6 @@ stages:
|
||||
test: rhel/10.1
|
||||
- name: RHEL 9.7
|
||||
test: rhel/9.7
|
||||
- name: FreeBSD 13.5
|
||||
test: freebsd/13.5
|
||||
|
||||
- stage: Remote_2_17
|
||||
displayName: Remote 2.17
|
||||
@@ -347,19 +346,18 @@ stages:
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
testFormat: 2.17/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.0
|
||||
test: rhel/10.0
|
||||
- name: FreeBSD 13.5
|
||||
test: freebsd/13.5
|
||||
|
||||
- stage: Remote_2_16
|
||||
displayName: Remote 2.16
|
||||
dependsOn: []
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
testFormat: 2.16/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.1
|
||||
|
||||
@@ -14,6 +14,12 @@ parameters:
|
||||
type: object
|
||||
default: []
|
||||
|
||||
# An optional container resource name to use for the test jobs.
|
||||
# Defaults to "default" if not specified.
|
||||
- name: container
|
||||
type: string
|
||||
default: default
|
||||
|
||||
# An optional format string used to generate the job name.
|
||||
# - {0} is the name of an item in the targets list.
|
||||
- name: nameFormat
|
||||
@@ -43,6 +49,7 @@ parameters:
|
||||
jobs:
|
||||
- template: test.yml
|
||||
parameters:
|
||||
container: ${{ parameters.container }}
|
||||
jobs:
|
||||
- ${{ if eq(length(parameters.groups), 0) }}:
|
||||
- ${{ each target in parameters.targets }}:
|
||||
|
||||
@@ -7,11 +7,17 @@ parameters:
|
||||
- name: jobs
|
||||
type: object
|
||||
|
||||
# An optional container resource name to use for the test jobs.
|
||||
# Defaults to "default" if not specified.
|
||||
- name: container
|
||||
type: string
|
||||
default: default
|
||||
|
||||
jobs:
|
||||
- ${{ each job in parameters.jobs }}:
|
||||
- job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }}
|
||||
displayName: ${{ job.name }}
|
||||
container: default
|
||||
container: ${{ parameters.container }}
|
||||
workspace:
|
||||
clean: all
|
||||
steps:
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
# Security Policy
|
||||
|
||||
## Reporting a security vulnerability
|
||||
|
||||
All security vulnerability reports MUST be submitted by email to: [security@ansible.com](mailto:security@ansible.com)
|
||||
|
||||
Security vulnerabilities MUST NOT be reported through public channels such as GitHub issues, pull requests, the Ansible Forum, or social media.
|
||||
|
||||
## What to include
|
||||
|
||||
When submitting a vulnerability report, include the following:
|
||||
|
||||
* **Title** (required): Clear, concise, descriptive summary.
|
||||
* **Impacted project** (required): Ideally a link to the GitHub project.
|
||||
* **Reporter details** (optional): Your name or handle and affiliation.
|
||||
* **Vulnerability description** (required): Technical details of the issue.
|
||||
* **Affected versions** (required): Known affected version(s), and ideally all affected versions.
|
||||
* **Reproduction steps** (required): Minimal example to reproduce the issue.
|
||||
* **Impact assessment** (required): Potential exploit scenarios and severity.
|
||||
* **Suggested fix** (optional): Proposed remediation, if any.
|
||||
* **Disclosure status** (required): Whether this has been shared with other parties or published and your plan for future sharing (e.g., at a conference).
|
||||
|
||||
## Timeline
|
||||
|
||||
* The Ansible Security Team aims to confirm receipt of vulnerability reports within one (1) business day.
|
||||
* Our goal is to assess the report, coordinate fix and disclosure as quickly as possible.
|
||||
* All confirmed vulnerabilities are addressed according to severity and impact.
|
||||
|
||||
## Backports
|
||||
|
||||
Generally, only the latest release of this project receives security updates.
|
||||
Earlier versions may receive critical fixes on a best-effort basis.
|
||||
|
||||
## Ansible Security Policy
|
||||
|
||||
For the complete Ansible Security Policy, including what qualifies as a reportable vulnerability, severity classification, the response process, coordinated disclosure, and the vulnerability management process, see [ansible.com/security](https://ansible.com/security).
|
||||
|
||||
## EU Cyber Resilience Act: Open-Source Steward Statement
|
||||
|
||||
This project is stewarded by **Red Hat, Inc.**, an open-source software steward as defined in Article 3(14) of the [EU Cyber Resilience Act (Regulation 2024/2847)](https://eur-lex.europa.eu/eli/reg/2024/2847/oj/eng).
|
||||
|
||||
Contact: [cra-steward@redhat.com](mailto:cra-steward@redhat.com)
|
||||
@@ -32,4 +32,4 @@ concurrency:
|
||||
# for each affected version of ansible-core (for example, `tests/sanity/ignore-2.18.txt`) and add corresponding entries.
|
||||
jobs:
|
||||
call:
|
||||
uses: ansible-collections/partner-certification-checker/.github/workflows/certification-reusable.yml@v0.1
|
||||
uses: ansible-collections/partner-certification-checker/.github/workflows/certification-reusable.yml@v4.1.0
|
||||
|
||||
@@ -4,6 +4,43 @@ ansible.posix Release Notes
|
||||
|
||||
.. contents:: Topics
|
||||
|
||||
v2.2.2
|
||||
======
|
||||
|
||||
Release Summary
|
||||
---------------
|
||||
|
||||
This is the minor release of the ``ansible.posix`` collection.
|
||||
This changelog contains all changes to the modules and plugins
|
||||
in the stable-2 branch that have been added after the release of
|
||||
``ansible.posix`` 2.2.1
|
||||
|
||||
Bugfixes
|
||||
--------
|
||||
|
||||
- README - Added ``Red Hat Automation Hub`` as correct contact information for Red Hat Ansible Automation Platform subscribers.
|
||||
|
||||
v2.2.1
|
||||
======
|
||||
|
||||
Release Summary
|
||||
---------------
|
||||
|
||||
This is the minor release of the ``ansible.posix`` collection.
|
||||
This changelog contains all changes to the modules and plugins
|
||||
in the stable-2 branch that have been added after the release of
|
||||
``ansible.posix`` 2.2.0
|
||||
|
||||
Security Fixes
|
||||
--------------
|
||||
|
||||
- authorized_key - fix local privilege escalation via symlink-following when running as root (https://github.com/ansible-collections/ansible.posix/issues/759).
|
||||
|
||||
Bugfixes
|
||||
--------
|
||||
|
||||
- sysctl - reload sysctl only if the sysctl file is ``/etc/sysctl.conf`` or ``/etc/sysctl.conf.local`` (https://github.com/ansible-collections/ansible.posix/issues/663).
|
||||
|
||||
v2.2.0
|
||||
======
|
||||
|
||||
|
||||
@@ -99,7 +99,8 @@ We welcome community contributions to this collection. For more details, see [Co
|
||||
|
||||
## Support
|
||||
|
||||
See [Communication](#Communication) section.
|
||||
* Community users can find help through the [Communication](#Communication) section.
|
||||
* Red Hat Ansible Automation Platform subscribers can request support through [Automation Hub](https://console.redhat.com/ansible/automation-hub/collections/published/ansible/posix/) by using the "Create issue" button on the collection page.
|
||||
|
||||
## Release Notes and Roadmap
|
||||
|
||||
|
||||
@@ -578,3 +578,44 @@ releases:
|
||||
- firewalld_info_warnings.yml
|
||||
- patch_removed.yml
|
||||
release_date: '2026-05-18'
|
||||
2.2.1:
|
||||
changes:
|
||||
bugfixes:
|
||||
- sysctl - reload sysctl only if the sysctl file is ``/etc/sysctl.conf`` or
|
||||
``/etc/sysctl.conf.local`` (https://github.com/ansible-collections/ansible.posix/issues/663).
|
||||
release_summary: 'This is the minor release of the ``ansible.posix`` collection.
|
||||
|
||||
This changelog contains all changes to the modules and plugins
|
||||
|
||||
in the stable-2 branch that have been added after the release of
|
||||
|
||||
``ansible.posix`` 2.2.0'
|
||||
security_fixes:
|
||||
- authorized_key - fix local privilege escalation via symlink-following when
|
||||
running as root (https://github.com/ansible-collections/ansible.posix/issues/759).
|
||||
fragments:
|
||||
- 2.2.1.yml
|
||||
- 643-sysctl-docs.yml
|
||||
- 751_ci_test_container_update.yml
|
||||
- 755_ci_test_container_update.yml
|
||||
- 759_cve_2026_11837.yml
|
||||
- 763_ci_azp_update_devel.yml
|
||||
- freebsd_sysctl.yml
|
||||
release_date: '2026-07-01'
|
||||
2.2.2:
|
||||
changes:
|
||||
bugfixes:
|
||||
- README - Added ``Red Hat Automation Hub`` as correct contact information for
|
||||
Red Hat Ansible Automation Platform subscribers.
|
||||
release_summary: 'This is the minor release of the ``ansible.posix`` collection.
|
||||
|
||||
This changelog contains all changes to the modules and plugins
|
||||
|
||||
in the stable-2 branch that have been added after the release of
|
||||
|
||||
``ansible.posix`` 2.2.1'
|
||||
fragments:
|
||||
- 2.2.2.yml
|
||||
- 767_remove_unsupported_version_skip.yml
|
||||
- 768_update_support_section.yml
|
||||
release_date: '2026-07-08'
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
bugfixes:
|
||||
- synchronize - fall back to ``ansible_host`` and ``ansible_password``/``ansible_ssh_pass``
|
||||
from the current host's task vars when absent from the cached ``hostvars``
|
||||
snapshot (for example when set via play-level ``vars:``), and correctly
|
||||
template ``ansible_host`` before building the rsync destination, fixing
|
||||
"Host not found" errors when ``ansible_host`` differs from
|
||||
``inventory_hostname`` (https://github.com/ansible-collections/ansible.posix/issues/469).
|
||||
@@ -0,0 +1,4 @@
|
||||
bugfixes:
|
||||
- firewalld_info - return a module failure instead of a traceback when python-firewall raises
|
||||
``FirewallError``, for example when D-Bus is unavailable
|
||||
(https://github.com/ansible-collections/ansible.posix/issues/678).
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
bugfixes:
|
||||
- profile_tasks callback - align TASKS RECAP output with ``display.banner()`` width instead of a hardcoded 79 columns (https://github.com/ansible-collections/ansible.posix/pull/773).
|
||||
minor_changes:
|
||||
- profile_tasks callback - add ``truncate_task_names`` option (default ``false``) to ellipsize long task names in the TASKS RECAP summary (https://github.com/ansible-collections/ansible.posix/pull/773).
|
||||
@@ -0,0 +1,2 @@
|
||||
minor_changes:
|
||||
- "Introduce an option to remove only the mount and fstab entry but not the mountpoint (https://github.com/ansible-collections/ansible.posix/issues/331)."
|
||||
@@ -0,0 +1,3 @@
|
||||
---
|
||||
trivial:
|
||||
- AZP - Update AZP matrix to follow ansible-test changes.
|
||||
@@ -0,0 +1,4 @@
|
||||
---
|
||||
trivial:
|
||||
- CI - Bump partner-certification-checker to v4.1.0 to fix ansible-lint compatibility.
|
||||
...
|
||||
@@ -0,0 +1,4 @@
|
||||
---
|
||||
bugfixes:
|
||||
- profile_tasks - fix incorrect ``version_added`` for ``datetime_format`` option(https://github.com/ansible-collections/ansible.posix/issues/783).
|
||||
...
|
||||
@@ -0,0 +1,3 @@
|
||||
---
|
||||
trivial:
|
||||
- Fix mount opts_no_log integration test for ansible-core 2.22 (https://github.com/ansible-collections/ansible.posix/issues/793).
|
||||
@@ -0,0 +1,4 @@
|
||||
---
|
||||
trivial:
|
||||
- CI - AZP replace FreeBSD version 14.4 with 14.5 for remote tests.
|
||||
...
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
trivial:
|
||||
- CI - remove FreeBSD version 13.5 from AZP remote tests.
|
||||
- CI - use Python 3.9 on RHEL 9.8 in AZP remote devel to keep compatibility with Python firewall library.
|
||||
...
|
||||
@@ -0,0 +1,3 @@
|
||||
---
|
||||
bugfixes:
|
||||
- mount - restore fstab if umount fails (https://github.com/ansible-collections/ansible.posix/issues/605).
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
---
|
||||
namespace: ansible
|
||||
name: posix
|
||||
version: 2.2.0
|
||||
version: 2.2.2
|
||||
readme: README.md
|
||||
authors:
|
||||
- Ansible (github.com/ansible)
|
||||
|
||||
@@ -240,10 +240,17 @@ class ActionModule(ActionBase):
|
||||
src_host = '127.0.0.1'
|
||||
inventory_hostname = task_vars.get('inventory_hostname')
|
||||
dest_host_inventory_vars = task_vars['hostvars'].get(inventory_hostname)
|
||||
dest_host = dest_host_inventory_vars.get('ansible_host', inventory_hostname)
|
||||
# If the user did not set ansible_host, ansible fills it in with the address
|
||||
# of the delegate host when delegating, so only use ansible_host when not delegating.
|
||||
dest_host = ((task_vars.get('ansible_host') if delegate_to is None else None)
|
||||
or dest_host_inventory_vars.get('ansible_host')
|
||||
or inventory_hostname)
|
||||
if self._templar is not None:
|
||||
dest_host = self._templar.template(dest_host)
|
||||
|
||||
dest_host_ids = [hostid for hostid in (dest_host_inventory_vars.get('inventory_hostname'),
|
||||
dest_host_inventory_vars.get('ansible_host'))
|
||||
dest_host_inventory_vars.get('ansible_host'),
|
||||
dest_host)
|
||||
if hostid is not None]
|
||||
|
||||
localhost_ports = set()
|
||||
@@ -371,7 +378,10 @@ class ActionModule(ActionBase):
|
||||
src = self._process_origin(src_host, src, user)
|
||||
dest = self._process_remote(_tmp_args, dest_host, dest, user, inv_port in localhost_ports)
|
||||
|
||||
password = dest_host_inventory_vars.get('ansible_ssh_pass', None) or dest_host_inventory_vars.get('ansible_password', None)
|
||||
password = (task_vars.get('ansible_ssh_pass')
|
||||
or task_vars.get('ansible_password')
|
||||
or dest_host_inventory_vars.get('ansible_ssh_pass', None)
|
||||
or dest_host_inventory_vars.get('ansible_password', None))
|
||||
if self._templar is not None:
|
||||
password = self._templar.template(password)
|
||||
else:
|
||||
|
||||
@@ -62,7 +62,18 @@ DOCUMENTATION = '''
|
||||
ini:
|
||||
- section: callback_profile_tasks
|
||||
key: datetime_format
|
||||
version_added: 3.0.0
|
||||
version_added: 2.2.0
|
||||
truncate_task_names:
|
||||
description:
|
||||
- Truncate long task names in the TASKS RECAP summary with an ellipsis so rows stay within the terminal width.
|
||||
type: bool
|
||||
default: false
|
||||
env:
|
||||
- name: PROFILE_TASKS_TRUNCATE_TASK_NAMES
|
||||
ini:
|
||||
- section: callback_profile_tasks
|
||||
key: truncate_task_names
|
||||
version_added: 2.3.0
|
||||
'''
|
||||
|
||||
EXAMPLES = '''
|
||||
@@ -88,6 +99,7 @@ from datetime import datetime
|
||||
|
||||
from functools import reduce
|
||||
from ansible.plugins.callback import CallbackBase
|
||||
from ansible.utils.display import get_text_width
|
||||
|
||||
|
||||
# define start time
|
||||
@@ -102,16 +114,64 @@ def secondsToStr(t):
|
||||
return "%d:%02d:%02d.%03d" % tuple(reduce(rediv, [[t * 1000, ], 1000, 60, 60]))
|
||||
|
||||
|
||||
def filled(msg, fchar="*"):
|
||||
if len(msg) == 0:
|
||||
width = 79
|
||||
def filled(msg, columns, fchar="*"):
|
||||
"""Fill to the same width as display.banner() (columns + 1)."""
|
||||
if not msg:
|
||||
return fchar * (columns + 1)
|
||||
try:
|
||||
msg_width = get_text_width(msg)
|
||||
except EnvironmentError:
|
||||
msg_width = len(msg)
|
||||
fill_len = columns - msg_width
|
||||
if fill_len < 3:
|
||||
fill_len = 3
|
||||
return "%s %s" % (msg, fchar * fill_len)
|
||||
|
||||
|
||||
def _text_width(text):
|
||||
try:
|
||||
return get_text_width(text)
|
||||
except EnvironmentError:
|
||||
return len(text)
|
||||
|
||||
|
||||
def truncate_name(name, width):
|
||||
if width <= 0:
|
||||
return name
|
||||
if _text_width(name) <= width:
|
||||
return name
|
||||
if width <= 3:
|
||||
return name[:width]
|
||||
ellipsis = '...'
|
||||
for end in range(len(name), 0, -1):
|
||||
candidate = name[:end] + ellipsis
|
||||
if _text_width(candidate) <= width:
|
||||
return candidate
|
||||
return ellipsis
|
||||
|
||||
|
||||
def pad_to_display_width(text, width, fillchar='-'):
|
||||
current = _text_width(text)
|
||||
if current >= width:
|
||||
return text
|
||||
return text + fillchar * (width - current)
|
||||
|
||||
|
||||
def format_timing_row(task_name, elapsed, columns, truncate=False):
|
||||
line_width = columns + 1
|
||||
time_field_width = 9
|
||||
name_field_width = line_width - time_field_width
|
||||
if truncate:
|
||||
task_name = truncate_name(task_name, name_field_width - 1)
|
||||
prefix = task_name + u' '
|
||||
gap = name_field_width - _text_width(prefix)
|
||||
if gap == 1:
|
||||
# A lone dash before the timing field looks like misaligned padding.
|
||||
left = prefix + u' '
|
||||
else:
|
||||
msg = "%s " % msg
|
||||
width = 79 - len(msg)
|
||||
if width < 3:
|
||||
width = 3
|
||||
filler = fchar * width
|
||||
return "%s%s " % (msg, filler)
|
||||
left = pad_to_display_width(prefix, name_field_width)
|
||||
timing = u' {0:.02f}s'.format(elapsed)
|
||||
return left + timing.rjust(time_field_width, u'-')
|
||||
|
||||
|
||||
def timestamp(self):
|
||||
@@ -127,7 +187,10 @@ def tasktime(self):
|
||||
time_elapsed = secondsToStr((cdtn - dtn).total_seconds())
|
||||
time_total_elapsed = secondsToStr((cdtn - dt0).total_seconds())
|
||||
dtn = cdtn
|
||||
return filled('%s (%s)%s%s' % (datetime_current, time_elapsed, ' ' * 7, time_total_elapsed))
|
||||
return filled(
|
||||
'%s (%s)%s%s' % (datetime_current, time_elapsed, ' ' * 7, time_total_elapsed),
|
||||
self._display.columns,
|
||||
)
|
||||
|
||||
|
||||
class CallbackModule(CallbackBase):
|
||||
@@ -148,6 +211,7 @@ class CallbackModule(CallbackBase):
|
||||
self.summary_only = None
|
||||
self.task_output_limit = None
|
||||
self.datetime_format = None
|
||||
self.truncate_task_names = None
|
||||
|
||||
super(CallbackModule, self).__init__()
|
||||
|
||||
@@ -178,6 +242,8 @@ class CallbackModule(CallbackBase):
|
||||
if self.datetime_format == 'iso8601':
|
||||
self.datetime_format = '%Y-%m-%dT%H:%M:%S.%f'
|
||||
|
||||
self.truncate_task_names = self.get_option('truncate_task_names')
|
||||
|
||||
def _display_tasktime(self):
|
||||
if not self.summary_only:
|
||||
self._display.display(tasktime(self))
|
||||
@@ -210,11 +276,12 @@ class CallbackModule(CallbackBase):
|
||||
self._record_task(task)
|
||||
|
||||
def v2_playbook_on_stats(self, stats):
|
||||
# Align summary report header with other callback plugin summary
|
||||
self._display.banner("TASKS RECAP")
|
||||
columns = self._display.columns
|
||||
line_width = columns + 1
|
||||
self._display.display(filled("TASKS RECAP", columns))
|
||||
|
||||
self._display.display(tasktime(self))
|
||||
self._display.display(filled("", fchar="="))
|
||||
self._display.display(filled("", columns, fchar="="))
|
||||
|
||||
timestamp(self)
|
||||
self.current = None
|
||||
@@ -234,7 +301,15 @@ class CallbackModule(CallbackBase):
|
||||
|
||||
# Print the timings
|
||||
for uuid, result in results:
|
||||
msg = u"{0:-<{2}}{1:->9}".format(result['name'] + u' ', u' {0:.02f}s'.format(result['elapsed']), self._display.columns - 9)
|
||||
msg = format_timing_row(
|
||||
result['name'],
|
||||
result['elapsed'],
|
||||
columns,
|
||||
truncate=self.truncate_task_names,
|
||||
)
|
||||
if 'path' in result:
|
||||
msg += u"\n{0:-<{1}}".format(result['path'] + u' ', self._display.columns)
|
||||
path_name = result['path']
|
||||
if self.truncate_task_names:
|
||||
path_name = truncate_name(path_name, line_width - 1)
|
||||
msg += u"\n%s" % pad_to_display_width(path_name + u' ', line_width)
|
||||
self._display.display(msg)
|
||||
|
||||
@@ -121,10 +121,10 @@ EXAMPLES = r'''
|
||||
ansible.posix.authorized_key:
|
||||
user: deploy
|
||||
state: present
|
||||
key: '{{ item }}'
|
||||
with_file:
|
||||
- public_keys/doe-jane
|
||||
- public_keys/doe-john
|
||||
key: "{{ lookup('file', item) }}"
|
||||
loop:
|
||||
- public_keys/doe-jane
|
||||
- public_keys/doe-john
|
||||
|
||||
- name: Set authorized key defining key options
|
||||
ansible.posix.authorized_key:
|
||||
@@ -307,6 +307,17 @@ class keydict(dict):
|
||||
return [item[1] for item in self.items()]
|
||||
|
||||
|
||||
def _safe_open_write(module, path, follow):
|
||||
flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
|
||||
if not follow and hasattr(os, 'O_NOFOLLOW'):
|
||||
flags |= os.O_NOFOLLOW
|
||||
try:
|
||||
fd = os.open(path, flags, int('0600', 8))
|
||||
except OSError as e:
|
||||
module.fail_json(msg="File open failed %s : %s" % (path, to_native(e)))
|
||||
return fd
|
||||
|
||||
|
||||
def keyfile(module, user, write=False, path=None, manage_dir=True, follow=False):
|
||||
"""
|
||||
Calculate name of authorized keys file, optionally creating the
|
||||
@@ -359,7 +370,7 @@ def keyfile(module, user, write=False, path=None, manage_dir=True, follow=False)
|
||||
module.fail_json(msg="Failed to create directory %s : %s" % (sshdir, to_native(e)))
|
||||
if module.selinux_enabled():
|
||||
module.set_default_selinux_context(sshdir, False)
|
||||
os.chown(sshdir, uid, gid)
|
||||
os.chown(sshdir, uid, gid, follow_symlinks=follow)
|
||||
os.chmod(sshdir, int('0700', 8))
|
||||
|
||||
if not os.path.exists(keysfile):
|
||||
@@ -367,16 +378,13 @@ def keyfile(module, user, write=False, path=None, manage_dir=True, follow=False)
|
||||
if not os.path.exists(basedir):
|
||||
os.makedirs(basedir)
|
||||
|
||||
f = None
|
||||
try:
|
||||
f = open(keysfile, "w") # touches file so we can set ownership and perms
|
||||
finally:
|
||||
f.close()
|
||||
fd = _safe_open_write(module, keysfile, follow)
|
||||
os.close(fd)
|
||||
if module.selinux_enabled():
|
||||
module.set_default_selinux_context(keysfile, False)
|
||||
|
||||
try:
|
||||
os.chown(keysfile, uid, gid)
|
||||
os.chown(keysfile, uid, gid, follow_symlinks=follow)
|
||||
os.chmod(keysfile, int('0600', 8))
|
||||
except OSError:
|
||||
pass
|
||||
@@ -607,7 +615,7 @@ def enforce_state(module, params):
|
||||
|
||||
# check current state -- just get the filename, don't create file
|
||||
do_write = False
|
||||
params["keyfile"] = keyfile(module, user, do_write, path, manage_dir)
|
||||
params["keyfile"] = keyfile(module, user, do_write, path, manage_dir, follow)
|
||||
existing_content = readfile(module, params["keyfile"])
|
||||
existing_keys = parsekeys(module, existing_content)
|
||||
|
||||
@@ -696,6 +704,11 @@ def enforce_state(module, params):
|
||||
|
||||
if not module.check_mode:
|
||||
writefile(module, filename, new_content)
|
||||
user_entry = pwd.getpwnam(user)
|
||||
uid = user_entry.pw_uid
|
||||
gid = user_entry.pw_gid
|
||||
os.chown(filename, uid, gid, follow_symlinks=follow)
|
||||
os.chmod(filename, int('0600', 8))
|
||||
params['changed'] = True
|
||||
|
||||
return params
|
||||
|
||||
@@ -224,9 +224,11 @@ except ImportError:
|
||||
try:
|
||||
import firewall.client as fw_client
|
||||
import firewall.config as fw_config
|
||||
import firewall.errors as fw_errors
|
||||
HAS_FIREWALLD = True
|
||||
except ImportError:
|
||||
HAS_FIREWALLD = False
|
||||
fw_errors = None
|
||||
|
||||
|
||||
def get_version():
|
||||
@@ -387,6 +389,8 @@ def main():
|
||||
module.fail_json(msg=('Unable to gather firewalld settings.'
|
||||
' You may need to run as the root user or'
|
||||
' use become. (Error: %s)' % to_native(e)))
|
||||
except fw_errors.FirewallError as e:
|
||||
module.fail_json(msg='Unable to gather firewalld settings. (Error: %s)' % to_native(e))
|
||||
|
||||
result['collected_zones'] = collect_zones
|
||||
result['undefined_zones'] = ignore_zones
|
||||
|
||||
+91
-63
@@ -88,6 +88,13 @@ options:
|
||||
fail if multiple devices are mounted on the same mount point. Using
|
||||
V(absent) with a mount point that is not registered in the I(fstab) has
|
||||
no effect, use V(unmounted) instead.
|
||||
- V(absent_keep_mountpoint) specifies that the mount point entry O(path) will be removed
|
||||
from I(fstab) and will also unmount the mounted device. The associated
|
||||
mountpoint will not be removed. A mounted device will be unmounted regardless
|
||||
of O(src) or its real source. V(absent_keep_mountpoint) does not unmount recursively,
|
||||
and the module will fail if multiple devices are mounted on the same mount
|
||||
point. Using V(absent_keep_mountpoint) with a mount point that is not registered in the
|
||||
I(fstab) has no effect, use V(unmounted) instead.
|
||||
- V(remounted) specifies that the device will be remounted for when you
|
||||
want to force a refresh on the mount itself (added in 2.9). This will
|
||||
always return RV(ignore:changed=true). If O(opts) is set, the options will be
|
||||
@@ -102,7 +109,7 @@ options:
|
||||
mountpoint.
|
||||
type: str
|
||||
required: true
|
||||
choices: [ absent, absent_from_fstab, mounted, present, unmounted, remounted, ephemeral ]
|
||||
choices: [ absent, absent_from_fstab, absent_keep_mountpoint, mounted, present, unmounted, remounted, ephemeral ]
|
||||
fstab:
|
||||
description:
|
||||
- File to use instead of C(/etc/fstab).
|
||||
@@ -170,6 +177,11 @@ EXAMPLES = r'''
|
||||
path: /tmp/mnt-pnt
|
||||
state: unmounted
|
||||
|
||||
- name: Unmount a mounted volume and remove its fstab entry
|
||||
ansible.posix.mount:
|
||||
path: /tmp/mnt-pnt
|
||||
state: absent_keep_mountpoint
|
||||
|
||||
- name: Remount a mounted volume
|
||||
ansible.posix.mount:
|
||||
path: /tmp/mnt-pnt
|
||||
@@ -229,12 +241,14 @@ from ansible.module_utils.common.text.converters import to_bytes, to_native
|
||||
from ansible.module_utils.parsing.convert_bool import boolean
|
||||
|
||||
|
||||
PLATFORM = platform.system().lower()
|
||||
|
||||
|
||||
def write_fstab(module, lines, path):
|
||||
|
||||
backup_file = ""
|
||||
if module.params['backup']:
|
||||
backup_file = module.backup_local(path)
|
||||
else:
|
||||
backup_file = ""
|
||||
|
||||
fs_w = open(path, 'w')
|
||||
|
||||
@@ -257,12 +271,7 @@ def _escape_fstab(v):
|
||||
|
||||
if isinstance(v, int):
|
||||
return v
|
||||
else:
|
||||
return (
|
||||
v.
|
||||
replace('\\', '\\134').
|
||||
replace(' ', '\\040').
|
||||
replace('&', '\\046'))
|
||||
return v.replace('\\', '\\134').replace(' ', '\\040').replace('&', '\\046')
|
||||
|
||||
|
||||
def set_mount(module, args):
|
||||
@@ -281,7 +290,7 @@ def _set_mount_save_old(module, args):
|
||||
escaped_args = dict([(k, _escape_fstab(v)) for k, v in args.items()])
|
||||
new_line = '%(src)s %(name)s %(fstype)s %(opts)s %(dump)s %(passno)s\n'
|
||||
|
||||
if platform.system() == 'SunOS':
|
||||
if PLATFORM == 'sunos':
|
||||
new_line = (
|
||||
'%(src)s - %(name)s %(fstype)s %(passno)s %(boot)s %(opts)s\n')
|
||||
|
||||
@@ -307,16 +316,16 @@ def _set_mount_save_old(module, args):
|
||||
# Check if we got a valid line for splitting
|
||||
# (on Linux the 5th and the 6th field is optional)
|
||||
if (
|
||||
platform.system() == 'SunOS' and len(fields) != 7 or
|
||||
platform.system() == 'Linux' and len(fields) not in [4, 5, 6] or
|
||||
platform.system() not in ['SunOS', 'Linux'] and len(fields) != 6):
|
||||
PLATFORM == 'sunos' and len(fields) != 7 or
|
||||
PLATFORM == 'linux' and len(fields) not in [4, 5, 6] or
|
||||
PLATFORM not in ['sunos', 'linux'] and len(fields) != 6):
|
||||
to_write.append(line)
|
||||
|
||||
continue
|
||||
|
||||
ld = {}
|
||||
|
||||
if platform.system() == 'SunOS':
|
||||
if PLATFORM == 'sunos':
|
||||
(
|
||||
ld['src'],
|
||||
dash,
|
||||
@@ -354,7 +363,7 @@ def _set_mount_save_old(module, args):
|
||||
exists = True
|
||||
args_to_check = ('src', 'fstype', 'opts', 'dump', 'passno')
|
||||
|
||||
if platform.system() == 'SunOS':
|
||||
if PLATFORM == 'sunos':
|
||||
args_to_check = ('src', 'fstype', 'passno', 'boot', 'opts')
|
||||
|
||||
for t in args_to_check:
|
||||
@@ -377,35 +386,35 @@ def _set_mount_save_old(module, args):
|
||||
return (args['name'], old_lines, changed)
|
||||
|
||||
|
||||
def unset_mount(module, args):
|
||||
def unset_mount(module, args, backup=False):
|
||||
"""Remove a mount point from fstab."""
|
||||
|
||||
to_write = []
|
||||
changed = False
|
||||
escaped_name = _escape_fstab(args['name'])
|
||||
|
||||
for line in open(args['fstab'], 'r').readlines():
|
||||
lines = open(args['fstab'], 'r').readlines()
|
||||
for line in lines:
|
||||
if not line.strip():
|
||||
to_write.append(line)
|
||||
|
||||
continue
|
||||
|
||||
if line.strip().startswith('#'):
|
||||
to_write.append(line)
|
||||
|
||||
continue
|
||||
|
||||
line_fields = line.split()
|
||||
# Check if we got a valid line for splitting
|
||||
if (
|
||||
platform.system() == 'SunOS' and len(line.split()) != 7 or
|
||||
platform.system() != 'SunOS' and len(line.split()) != 6):
|
||||
PLATFORM == 'sunos' and len(line_fields) != 7 or
|
||||
PLATFORM != 'sunos' and len(line_fields) != 6):
|
||||
to_write.append(line)
|
||||
|
||||
continue
|
||||
|
||||
ld = {}
|
||||
|
||||
if platform.system() == 'SunOS':
|
||||
if PLATFORM == 'sunos':
|
||||
(
|
||||
ld['src'],
|
||||
dash,
|
||||
@@ -414,7 +423,7 @@ def unset_mount(module, args):
|
||||
ld['passno'],
|
||||
ld['boot'],
|
||||
ld['opts']
|
||||
) = line.split()
|
||||
) = line_fields
|
||||
else:
|
||||
(
|
||||
ld['src'],
|
||||
@@ -423,7 +432,7 @@ def unset_mount(module, args):
|
||||
ld['opts'],
|
||||
ld['dump'],
|
||||
ld['passno']
|
||||
) = line.split()
|
||||
) = line_fields
|
||||
|
||||
if (
|
||||
ld['name'] != escaped_name or (
|
||||
@@ -442,7 +451,9 @@ def unset_mount(module, args):
|
||||
if changed and not module.check_mode:
|
||||
write_fstab(module, to_write, args['fstab'])
|
||||
|
||||
return (args['name'], changed)
|
||||
if backup:
|
||||
return (args['name'], changed, lines)
|
||||
return (args['name'], changed, [])
|
||||
|
||||
|
||||
def _set_fstab_args(fstab_file):
|
||||
@@ -451,8 +462,8 @@ def _set_fstab_args(fstab_file):
|
||||
if (
|
||||
fstab_file and
|
||||
fstab_file != '/etc/fstab' and
|
||||
platform.system().lower() != 'sunos'):
|
||||
if platform.system().lower().endswith('bsd'):
|
||||
PLATFORM != 'sunos'):
|
||||
if PLATFORM.endswith('bsd'):
|
||||
result.append('-F')
|
||||
else:
|
||||
result.append('-T')
|
||||
@@ -465,7 +476,7 @@ def _set_fstab_args(fstab_file):
|
||||
def _set_ephemeral_args(args):
|
||||
result = []
|
||||
# Set fstype switch according to platform. SunOS/Solaris use -F
|
||||
if platform.system().lower() == 'sunos':
|
||||
if PLATFORM == 'sunos':
|
||||
result.append('-F')
|
||||
else:
|
||||
result.append('-t')
|
||||
@@ -487,7 +498,7 @@ def mount(module, args):
|
||||
name = args['name']
|
||||
cmd = [mount_bin]
|
||||
|
||||
if platform.system().lower() == 'openbsd':
|
||||
if PLATFORM == 'openbsd':
|
||||
# Use module.params['fstab'] here as args['fstab'] has been set to the
|
||||
# default value.
|
||||
if module.params['fstab'] is not None:
|
||||
@@ -508,8 +519,7 @@ def mount(module, args):
|
||||
|
||||
if rc == 0:
|
||||
return 0, ''
|
||||
else:
|
||||
return rc, out + err
|
||||
return rc, out + err
|
||||
|
||||
|
||||
def umount(module, path):
|
||||
@@ -522,8 +532,7 @@ def umount(module, path):
|
||||
|
||||
if rc == 0:
|
||||
return 0, ''
|
||||
else:
|
||||
return rc, out + err
|
||||
return rc, out + err
|
||||
|
||||
|
||||
def remount(module, args):
|
||||
@@ -532,7 +541,7 @@ def remount(module, args):
|
||||
cmd = [mount_bin]
|
||||
|
||||
# Multiplatform remount opts
|
||||
if platform.system().lower().endswith('bsd'):
|
||||
if PLATFORM.endswith('bsd'):
|
||||
if module.params['state'] == 'remounted' and args['opts'] != 'defaults':
|
||||
cmd += ['-u', '-o', args['opts']]
|
||||
else:
|
||||
@@ -543,7 +552,7 @@ def remount(module, args):
|
||||
else:
|
||||
cmd += ['-o', 'remount']
|
||||
|
||||
if platform.system().lower() == 'openbsd':
|
||||
if PLATFORM == 'openbsd':
|
||||
# Use module.params['fstab'] here as args['fstab'] has been set to the
|
||||
# default value.
|
||||
if module.params['fstab'] is not None:
|
||||
@@ -562,7 +571,7 @@ def remount(module, args):
|
||||
out = err = ''
|
||||
|
||||
try:
|
||||
if module.params['state'] != 'ephemeral' and platform.system().lower().endswith('bsd'):
|
||||
if module.params['state'] != 'ephemeral' and PLATFORM.endswith('bsd'):
|
||||
# Note: Forcing BSDs to do umount/mount due to BSD remount not
|
||||
# working as expected (suspect bug in the BSD mount command)
|
||||
# Interested contributor could rework this to use mount options on
|
||||
@@ -618,7 +627,7 @@ def is_bind_mounted(module, linux_mounts, dest, src=None, fstype=None):
|
||||
|
||||
is_mounted = False
|
||||
|
||||
if platform.system() == 'Linux' and linux_mounts is not None:
|
||||
if PLATFORM == 'linux' and linux_mounts is not None:
|
||||
if src is None:
|
||||
# That's for unmounted/absent
|
||||
if dest in linux_mounts:
|
||||
@@ -732,7 +741,7 @@ def _is_same_mount_src(module, src, mountpoint, linux_mounts):
|
||||
return False
|
||||
|
||||
# Treat Linux bind mounts
|
||||
if platform.system() == 'Linux' and linux_mounts is not None:
|
||||
if PLATFORM == 'linux' and linux_mounts is not None:
|
||||
# For Linux bind mounts only: the mount command does not return
|
||||
# the actual source for bind mounts, but the device of the source.
|
||||
# is_bind_mounted() called with the 'src' parameter will return True if
|
||||
@@ -777,7 +786,20 @@ def main():
|
||||
passno=dict(type='str', no_log=False, default='0'),
|
||||
src=dict(type='path'),
|
||||
backup=dict(type='bool', default=False),
|
||||
state=dict(type='str', required=True, choices=['absent', 'absent_from_fstab', 'mounted', 'present', 'unmounted', 'remounted', 'ephemeral']),
|
||||
state={
|
||||
'type': 'str',
|
||||
'required': True,
|
||||
'choices': [
|
||||
'absent',
|
||||
'absent_from_fstab',
|
||||
'absent_keep_mountpoint',
|
||||
'mounted',
|
||||
'present',
|
||||
'unmounted',
|
||||
'remounted',
|
||||
'ephemeral'
|
||||
]
|
||||
},
|
||||
),
|
||||
supports_check_mode=True,
|
||||
required_if=(
|
||||
@@ -796,30 +818,35 @@ def main():
|
||||
# name, src, fstype, opts, dump, passno, state, fstab=/etc/fstab
|
||||
# Note: Do not modify module.params['fstab'] as we need to know if the user
|
||||
# explicitly specified it in mount() and remount()
|
||||
if platform.system().lower() == 'sunos':
|
||||
args = dict(
|
||||
name=module.params['path'],
|
||||
opts='-',
|
||||
passno='-',
|
||||
fstab=module.params['fstab'],
|
||||
boot='yes' if module.params['boot'] else 'no',
|
||||
args = dict(
|
||||
name=module.params['path'],
|
||||
)
|
||||
if PLATFORM == 'sunos':
|
||||
args.update(
|
||||
dict(
|
||||
opts='-',
|
||||
passno='-',
|
||||
fstab=module.params['fstab'],
|
||||
boot='yes' if module.params['boot'] else 'no',
|
||||
)
|
||||
)
|
||||
if args['fstab'] is None:
|
||||
args['fstab'] = '/etc/vfstab'
|
||||
else:
|
||||
args = dict(
|
||||
name=module.params['path'],
|
||||
opts='defaults',
|
||||
dump='0',
|
||||
passno='0',
|
||||
fstab=module.params['fstab'],
|
||||
boot='yes',
|
||||
args.update(
|
||||
dict(
|
||||
opts='defaults',
|
||||
dump='0',
|
||||
passno='0',
|
||||
fstab=module.params['fstab'],
|
||||
boot='yes',
|
||||
)
|
||||
)
|
||||
if args['fstab'] is None:
|
||||
args['fstab'] = '/etc/fstab'
|
||||
|
||||
# FreeBSD doesn't have any 'default' so set 'rw' instead
|
||||
if platform.system() == 'FreeBSD':
|
||||
if PLATFORM == 'freebsd':
|
||||
args['opts'] = 'rw'
|
||||
|
||||
args['backup_file'] = ""
|
||||
@@ -827,7 +854,7 @@ def main():
|
||||
|
||||
# Cache all mounts here in order we have consistent results if we need to
|
||||
# call is_bind_mounted() multiple times
|
||||
if platform.system() == 'Linux':
|
||||
if PLATFORM == 'linux':
|
||||
linux_mounts = get_linux_mounts(module)
|
||||
|
||||
if linux_mounts is None:
|
||||
@@ -837,7 +864,7 @@ def main():
|
||||
for key in ('src', 'fstype', 'passno', 'opts', 'dump', 'fstab'):
|
||||
if module.params[key] is not None:
|
||||
args[key] = module.params[key]
|
||||
if platform.system().lower() == 'linux' or platform.system().lower().endswith('bsd'):
|
||||
if PLATFORM == 'linux' or PLATFORM.endswith('bsd'):
|
||||
# Linux, FreeBSD, NetBSD and OpenBSD have 'noauto' as mount option to
|
||||
# handle mount on boot. To avoid mount option conflicts, if 'noauto'
|
||||
# specified in 'opts', mount module will ignore 'boot'.
|
||||
@@ -880,19 +907,20 @@ def main():
|
||||
changed = False
|
||||
|
||||
if state == 'absent_from_fstab':
|
||||
name, changed = unset_mount(module, args)
|
||||
elif state == 'absent':
|
||||
name, changed = unset_mount(module, args)
|
||||
name, changed, _dummy = unset_mount(module, args, backup=False)
|
||||
elif state == 'absent' or state == 'absent_keep_mountpoint':
|
||||
name, changed, backup_lines = unset_mount(module, args, backup=True)
|
||||
|
||||
if changed and not module.check_mode:
|
||||
if ismount(name) or is_bind_mounted(module, linux_mounts, name):
|
||||
res, msg = umount(module, name)
|
||||
|
||||
if res:
|
||||
module.fail_json(
|
||||
msg="Error unmounting %s: %s" % (name, msg))
|
||||
# failed to unmount, restore fstab
|
||||
write_fstab(module, backup_lines, args['fstab'])
|
||||
module.fail_json(msg="Error unmounting %s: %s" % (name, msg))
|
||||
|
||||
if os.path.exists(name):
|
||||
if os.path.exists(name) and state == 'absent':
|
||||
try:
|
||||
os.rmdir(name)
|
||||
except (OSError, IOError) as e:
|
||||
@@ -1007,7 +1035,7 @@ def main():
|
||||
|
||||
# If the managed node is Solaris, convert the boot value type to Boolean
|
||||
# to match the type of return value with the module argument.
|
||||
if platform.system().lower() == 'sunos':
|
||||
if PLATFORM == 'sunos':
|
||||
args['boot'] = boolean(args['boot'])
|
||||
module.exit_json(changed=changed, **args)
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@ options:
|
||||
- If V(true), performs a C(/sbin/sysctl -p) if the O(sysctl_file) is
|
||||
updated. If V(false), does not reload C(sysctl) even if the
|
||||
O(sysctl_file) is updated.
|
||||
- For FreeBSD, can not be used with O(sysctl_file) other than C(/etc/sysctl.conf) or C(/etc/sysctl.conf.local).
|
||||
type: bool
|
||||
default: true
|
||||
sysctl_file:
|
||||
@@ -56,6 +57,17 @@ options:
|
||||
- Verify token value with the sysctl command and set with C(-w) if necessary.
|
||||
type: bool
|
||||
default: false
|
||||
attributes:
|
||||
check_mode:
|
||||
support: full
|
||||
description: Can run in check_mode and return changed status prediction without modifying target.
|
||||
diff_mode:
|
||||
support: none
|
||||
description: Does not support differences output.
|
||||
platform:
|
||||
platforms: posix
|
||||
support: full
|
||||
description: Supported on POSIX-compliant systems.
|
||||
author:
|
||||
- David CHANIAL (@davixx)
|
||||
'''
|
||||
@@ -155,6 +167,11 @@ class SysctlModule(object):
|
||||
|
||||
self.platform = platform.system().lower()
|
||||
|
||||
# system specific tests
|
||||
freebsd_sysctl_files = ['/etc/sysctl.conf', '/etc/sysctl.conf.local']
|
||||
if self.platform == 'freebsd' and self.sysctl_file not in freebsd_sysctl_files and self.args['reload']:
|
||||
self.module.fail_json(msg="%s can not be reloaded. Set reload=False." % self.sysctl_file)
|
||||
|
||||
# Whitespace is bad
|
||||
self.args['name'] = self.args['name'].strip()
|
||||
self.args['value'] = self._parse_value(self.args['value'])
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
---
|
||||
#
|
||||
# Check: keysfile is symlink and follow=false
|
||||
#
|
||||
- name: Try to add key with keysfile as symlink
|
||||
ansible.posix.authorized_key:
|
||||
user: testuser
|
||||
key: "{{ rsa_key_basic }}"
|
||||
state: present
|
||||
manage_dir: false
|
||||
follow: false
|
||||
|
||||
- name: Assert target file ownership unchanged
|
||||
ansible.builtin.stat:
|
||||
path: /tmp/symlink_test_target/target_file
|
||||
register: target_file_stat
|
||||
|
||||
- name: Verify target file is still owned by root
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- target_file_stat.stat.uid == 0
|
||||
...
|
||||
@@ -0,0 +1,12 @@
|
||||
---
|
||||
- name: Remove testuser
|
||||
ansible.builtin.user:
|
||||
name: testuser
|
||||
state: absent
|
||||
remove: true
|
||||
|
||||
- name: Remove symlink target directory
|
||||
ansible.builtin.file:
|
||||
path: /tmp/symlink_test_target
|
||||
state: absent
|
||||
...
|
||||
@@ -0,0 +1,38 @@
|
||||
---
|
||||
- name: Create testuser for symlink tests
|
||||
ansible.builtin.user:
|
||||
name: testuser
|
||||
create_home: true
|
||||
register: testuser_result
|
||||
|
||||
- name: Create symlink target directory
|
||||
ansible.builtin.file:
|
||||
path: /tmp/symlink_test_target
|
||||
state: directory
|
||||
owner: root
|
||||
mode: '0700'
|
||||
|
||||
- name: Create a target file owned by root
|
||||
ansible.builtin.copy:
|
||||
dest: /tmp/symlink_test_target/target_file
|
||||
content: "sensitive data"
|
||||
owner: root
|
||||
mode: '0600'
|
||||
|
||||
- name: Remove .ssh directory if exists
|
||||
ansible.builtin.file:
|
||||
path: "{{ testuser_result.home }}/.ssh"
|
||||
state: absent
|
||||
|
||||
- name: Create .ssh directory
|
||||
ansible.builtin.file:
|
||||
path: "{{ testuser_result.home }}/.ssh"
|
||||
state: directory
|
||||
mode: '0700'
|
||||
|
||||
- name: Create symlink from authorized_keys to target file
|
||||
ansible.builtin.file:
|
||||
src: /tmp/symlink_test_target/target_file
|
||||
dest: "{{ testuser_result.home }}/.ssh/authorized_keys"
|
||||
state: link
|
||||
...
|
||||
@@ -17,7 +17,7 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
- name: Setup testing environment
|
||||
- name: Setup for testing environment
|
||||
ansible.builtin.import_tasks: setup_steps.yml
|
||||
|
||||
- name: Test for multiple keys handling
|
||||
@@ -37,3 +37,12 @@
|
||||
|
||||
- name: Test for permission denied files
|
||||
ansible.builtin.import_tasks: check_permissions.yml
|
||||
|
||||
- name: CVE-2026-11837 Setup for symlink tests
|
||||
ansible.builtin.import_tasks: check_symlink_setup.yml
|
||||
|
||||
- name: CVE-2026-11837 Test for symlink tests
|
||||
ansible.builtin.import_tasks: check_symlink.yml
|
||||
|
||||
- name: CVE-2026-11837 Cleanup symlink test
|
||||
ansible.builtin.import_tasks: check_symlink_cleanup.yml
|
||||
|
||||
@@ -297,10 +297,17 @@
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: dest_stat
|
||||
|
||||
- name: Check if the mountpoint still exists
|
||||
ansible.builtin.stat:
|
||||
path: '{{ output_dir }}/mount_dest'
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: mountpoint_stat
|
||||
|
||||
- name: Check that we did not unmount
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- unmount_result['changed']
|
||||
- mountpoint_stat['stat']['exists']
|
||||
- dest_stat['stat']['exists']
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
|
||||
@@ -318,10 +325,65 @@
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: dest_stat
|
||||
|
||||
- name: Check that the mountpoint no longer exists
|
||||
ansible.builtin.stat:
|
||||
path: '{{ output_dir }}/mount_dest'
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: mountpoint_stat
|
||||
|
||||
- name: Check that we unmounted
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- unmount_result['changed']
|
||||
- not mountpoint_stat['stat']['exists']
|
||||
- not dest_stat['stat']['exists']
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
|
||||
# unmount (absent_keep_mountpoint)
|
||||
- name: Bind mount a filesystem (Linux)
|
||||
ansible.posix.mount:
|
||||
src: '{{ output_dir }}/mount_source'
|
||||
name: '{{ output_dir }}/mount_dest'
|
||||
state: mounted
|
||||
fstype: None
|
||||
opts: bind
|
||||
when: ansible_system == 'Linux'
|
||||
register: bind_result_linux
|
||||
|
||||
- name: Bind mount a filesystem (FreeBSD)
|
||||
ansible.posix.mount:
|
||||
src: '{{ output_dir }}/mount_source'
|
||||
name: '{{ output_dir }}/mount_dest'
|
||||
state: mounted
|
||||
fstype: nullfs
|
||||
when: ansible_system == 'FreeBSD'
|
||||
register: bind_result_freebsd
|
||||
|
||||
- name: Unmount the bind mount while keeping the mountpoint
|
||||
ansible.posix.mount:
|
||||
name: '{{ output_dir }}/mount_dest'
|
||||
state: absent_keep_mountpoint
|
||||
when: ansible_system in ('Linux', 'FreeBSD')
|
||||
register: unmount_result
|
||||
|
||||
- name: Make sure the file no longer exists in dest
|
||||
ansible.builtin.stat:
|
||||
path: '{{ output_dir }}/mount_dest/test_file'
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: dest_stat
|
||||
|
||||
- name: Check if the mountpoint still exists
|
||||
ansible.builtin.stat:
|
||||
path: '{{ output_dir }}/mount_dest'
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: mountpoint_stat
|
||||
|
||||
- name: Check that we unmounted and that the mountpoint still exists
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- (ansible_system == 'Linux' and bind_result_linux['changed']) or (ansible_system == 'FreeBSD' and bind_result_freebsd['changed'])
|
||||
- unmount_result['changed']
|
||||
- mountpoint_stat['stat']['exists']
|
||||
- not dest_stat['stat']['exists']
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
|
||||
@@ -1103,10 +1165,16 @@
|
||||
opts: rw
|
||||
opts_no_log: true
|
||||
register: mount_info
|
||||
- name: Assert opts_no_log option true
|
||||
- name: Assert opts_no_log option true (ansible-core < 2.22)
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- mount_info.opts == 'VALUE_SPECIFIED_IN_NO_LOG_PARAMETER'
|
||||
when: ansible_version.full is ansible.builtin.version('2.22', '<')
|
||||
- name: Assert opts_no_log option true (ansible-core >= 2.22)
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- mount_info.opts == 'rw'
|
||||
when: ansible_version.full is ansible.builtin.version('2.22', '>=')
|
||||
- name: Remount the FS with opts_no_log option false
|
||||
ansible.posix.mount:
|
||||
path: /tmp/myfs
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
---
|
||||
# Test that ansible_host set via play-level vars: (present in task_vars but
|
||||
# absent from the hostvars snapshot for the target host) is correctly used
|
||||
# to build the rsync destination instead of falling back to inventory_hostname.
|
||||
# Regression test for https://github.com/ansible-collections/ansible.posix/issues/469
|
||||
fixtures:
|
||||
taskvars_in: taskvars_in.json
|
||||
taskvars_out: taskvars_out.json
|
||||
connection:
|
||||
transport: ssh
|
||||
hostvars:
|
||||
127.0.0.1: {}
|
||||
::1: {}
|
||||
localhost: {}
|
||||
asserts:
|
||||
- hasattr(SAM._connection, 'ismock')
|
||||
- self.execute_called
|
||||
- self.final_module_args['_local_rsync_path'] == 'rsync'
|
||||
- self.final_module_args['src'] == '/tmp/deleteme'
|
||||
- self.final_module_args['dest'] == 'root@el6host.example.org:/tmp/deleteme'
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"inventory_hostname": "el6host",
|
||||
"ansible_user": "root",
|
||||
"ansible_host": "el6host.example.org",
|
||||
"hostvars": {
|
||||
"el6host": {}
|
||||
},
|
||||
"vars": {
|
||||
"ansible_host": "el6host.example.org"
|
||||
}
|
||||
}
|
||||
+1
@@ -0,0 +1 @@
|
||||
{}
|
||||
@@ -55,6 +55,9 @@ class TaskMock(object):
|
||||
become_user = None
|
||||
become_method = None
|
||||
check_mode = False
|
||||
delegate_to = None
|
||||
diff = False
|
||||
no_log = None
|
||||
|
||||
|
||||
class StdinMock(object):
|
||||
@@ -64,6 +67,10 @@ class StdinMock(object):
|
||||
class ConnectionMock(object):
|
||||
ismock = True
|
||||
_play_context = None
|
||||
always_pipeline_modules = False
|
||||
become = None
|
||||
has_pipelining = False
|
||||
socket_path = None
|
||||
# transport = 'ssh'
|
||||
transport = None
|
||||
_new_stdin = StdinMock()
|
||||
@@ -121,6 +128,9 @@ class SynchronizeTester(object):
|
||||
return {}
|
||||
|
||||
def runtest(self, fixturepath='fixtures/synchronize/basic'):
|
||||
# Reset task and connection to avoid state leaking between tests
|
||||
self.task = TaskMock()
|
||||
self.connection = ConnectionMock()
|
||||
|
||||
metapath = os.path.join(fixturepath, 'meta.yaml')
|
||||
with open(metapath, 'rb') as f:
|
||||
@@ -214,6 +224,15 @@ class TestSynchronizeAction(unittest.TestCase):
|
||||
x = SynchronizeTester()
|
||||
x.runtest(fixturepath=os.path.join(self.fixturedir, 'basic'))
|
||||
|
||||
@patch('ansible_collections.ansible.posix.plugins.action.synchronize.connection_loader', FakePluginLoader)
|
||||
def test_ansible_host_from_task_vars(self):
|
||||
# ansible_host set only via play-level vars (present in top-level
|
||||
# task_vars, absent from the hostvars snapshot for the target host)
|
||||
# must still be used to build the rsync destination.
|
||||
# Regression test for https://github.com/ansible-collections/ansible.posix/issues/469
|
||||
x = SynchronizeTester()
|
||||
x.runtest(fixturepath=os.path.join(self.fixturedir, 'ansible_host_from_task_vars'))
|
||||
|
||||
@patch('ansible_collections.ansible.posix.plugins.action.synchronize.connection_loader', FakePluginLoader)
|
||||
def test_basic_become(self):
|
||||
x = SynchronizeTester()
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
from __future__ import absolute_import, division, print_function
|
||||
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible_collections.ansible.posix.tests.unit.compat import unittest
|
||||
from ansible.utils.display import get_text_width
|
||||
|
||||
from ansible_collections.ansible.posix.plugins.callback.profile_tasks import (
|
||||
filled,
|
||||
format_timing_row,
|
||||
pad_to_display_width,
|
||||
truncate_name,
|
||||
)
|
||||
|
||||
|
||||
class ProfileTasksDisplayTestCase(unittest.TestCase):
|
||||
|
||||
COLUMNS = 79
|
||||
LINE_WIDTH = COLUMNS + 1
|
||||
# Reproducer from https://github.com/ansible-collections/ansible.posix/pull/773#issuecomment-5325694910
|
||||
MAINTAINER_ASCII_LONG = (
|
||||
'012345678901234567890123456789012345678901234567890'
|
||||
'12345678901234567890123456789'
|
||||
)
|
||||
MAINTAINER_CJK_LONG = (
|
||||
'零一二三四五六七八九零一二三四五六七八九'
|
||||
'零一二三四五六七八九零一二三四五六七八九'
|
||||
)
|
||||
ASCII_LONG = MAINTAINER_ASCII_LONG
|
||||
CJK_LONG = MAINTAINER_CJK_LONG
|
||||
|
||||
def test_filled_banner_matches_display_width(self):
|
||||
line = filled('TASKS RECAP', self.COLUMNS)
|
||||
self.assertEqual(get_text_width(line), self.LINE_WIDTH)
|
||||
self.assertTrue(line.endswith('*'))
|
||||
|
||||
def test_filled_separator_matches_display_width(self):
|
||||
line = filled('', self.COLUMNS, fchar='=')
|
||||
self.assertEqual(get_text_width(line), self.LINE_WIDTH)
|
||||
self.assertEqual(line, '=' * self.LINE_WIDTH)
|
||||
|
||||
def test_truncate_name_shortens_ascii_to_display_width(self):
|
||||
truncated = truncate_name(self.ASCII_LONG, 71)
|
||||
self.assertLessEqual(get_text_width(truncated), 71)
|
||||
self.assertTrue(truncated.endswith('...'))
|
||||
|
||||
def test_truncate_name_shortens_cjk_to_display_width(self):
|
||||
truncated = truncate_name(self.CJK_LONG, 71)
|
||||
self.assertLessEqual(get_text_width(truncated), 71)
|
||||
self.assertTrue(truncated.endswith('...'))
|
||||
|
||||
def test_truncate_name_leaves_short_names_unchanged(self):
|
||||
short = 'Short task'
|
||||
self.assertEqual(truncate_name(short, 71), short)
|
||||
self.assertEqual(truncate_name(self.CJK_LONG[:5], 71), self.CJK_LONG[:5])
|
||||
|
||||
def test_format_timing_row_ascii_fits_terminal_width(self):
|
||||
row = format_timing_row(self.ASCII_LONG, 0.01, self.COLUMNS, truncate=True)
|
||||
self.assertEqual(get_text_width(row), self.LINE_WIDTH)
|
||||
self.assertIn('0.01s', row)
|
||||
|
||||
def test_format_timing_row_cjk_fits_terminal_width(self):
|
||||
row = format_timing_row(self.CJK_LONG, 0.01, self.COLUMNS, truncate=True)
|
||||
self.assertEqual(get_text_width(row), self.LINE_WIDTH)
|
||||
self.assertIn('0.01s', row)
|
||||
|
||||
def test_maintainer_cjk_reproducer_fits_under_len_budget_but_not_display_width(self):
|
||||
self.assertEqual(len(self.MAINTAINER_CJK_LONG), 40)
|
||||
self.assertEqual(get_text_width(self.MAINTAINER_CJK_LONG), 80)
|
||||
self.assertGreater(len(self.MAINTAINER_CJK_LONG), 0)
|
||||
|
||||
def test_maintainer_cjk_reproducer_truncates_with_ellipsis(self):
|
||||
truncated = truncate_name(self.MAINTAINER_CJK_LONG, 71)
|
||||
self.assertLessEqual(get_text_width(truncated), 71)
|
||||
self.assertTrue(truncated.endswith('...'))
|
||||
self.assertNotEqual(truncated, self.MAINTAINER_CJK_LONG)
|
||||
|
||||
def test_maintainer_ascii_and_cjk_recap_rows_match_terminal_width(self):
|
||||
ascii_row = format_timing_row(
|
||||
self.MAINTAINER_ASCII_LONG, 0.01, self.COLUMNS, truncate=True,
|
||||
)
|
||||
cjk_row = format_timing_row(
|
||||
self.MAINTAINER_CJK_LONG, 0.01, self.COLUMNS, truncate=True,
|
||||
)
|
||||
self.assertEqual(get_text_width(ascii_row), self.LINE_WIDTH)
|
||||
self.assertEqual(get_text_width(cjk_row), self.LINE_WIDTH)
|
||||
self.assertIn('...', ascii_row)
|
||||
self.assertIn('...', cjk_row)
|
||||
|
||||
def test_format_timing_row_uses_dash_padding_for_timing_field(self):
|
||||
row = format_timing_row('Short task', 0.01, self.COLUMNS, truncate=True)
|
||||
self.assertTrue(row.endswith('--- 0.01s'))
|
||||
self.assertEqual(get_text_width(row), self.LINE_WIDTH)
|
||||
|
||||
def test_pad_to_display_width_handles_cjk(self):
|
||||
padded = pad_to_display_width(self.MAINTAINER_CJK_LONG[:5] + u' ', 71)
|
||||
self.assertEqual(get_text_width(padded), 71)
|
||||
self.assertTrue(padded.endswith('-'))
|
||||
|
||||
def test_format_timing_row_cjk_timing_suffix_matches_ascii(self):
|
||||
ascii_row = format_timing_row(self.MAINTAINER_ASCII_LONG, 0.01, self.COLUMNS, truncate=True)
|
||||
cjk_row = format_timing_row(self.MAINTAINER_CJK_LONG, 0.01, self.COLUMNS, truncate=True)
|
||||
self.assertTrue(ascii_row.endswith('--- 0.01s'))
|
||||
self.assertTrue(cjk_row.endswith('--- 0.01s'))
|
||||
self.assertNotIn('----', cjk_row)
|
||||
self.assertEqual(
|
||||
get_text_width(ascii_row[:ascii_row.rindex('.')]),
|
||||
get_text_width(cjk_row[:cjk_row.rindex('.')]),
|
||||
)
|
||||
Reference in New Issue
Block a user