[PR #7382/33133f3b backport][stable-7] kernel_blacklist: bugfix (#7409)

kernel_blacklist: bugfix (#7382)

* kernel_blacklist: bugfix

* add fix + changelog frag

* skip aix,freebsd,macos,osx in integration test

* Update changelogs/fragments/7382-kernel-blacklist-bugfix.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 33133f3ba9)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>

changelogs/fragments/7382-kernel-blacklist-bugfix.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - kernel_blacklist - simplified the mechanism to update the file, fixing the error (https://github.com/ansible-collections/community.general/pull/7382, https://github.com/ansible-collections/community.general/issues/7362).

plugins/modules/kernel_blacklist.py

@@ -53,7 +53,6 @@ EXAMPLES = '''
 
 import os
 import re
-import tempfile
 
 from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper
 
@@ -106,16 +105,10 @@ class Blacklist(StateModuleHelper):
 
     def __quit_module__(self):
         if self.has_changed() and not self.module.check_mode:
-            dummy, tmpfile = tempfile.mkstemp()
+            bkp = self.module.backup_local(self.vars.filename)
-            try:
+            with open(self.vars.filename, "w") as fd:
-                os.remove(tmpfile)
+                fd.writelines(["{0}\n".format(x) for x in self.vars.lines])
-                self.module.preserved_copy(self.vars.filename, tmpfile)  # ensure right perms/ownership
+            self.module.add_cleanup_file(bkp)
-                with open(tmpfile, 'w') as fd:
-                    fd.writelines(["{0}\n".format(x) for x in self.vars.lines])
-                self.module.atomic_move(tmpfile, self.vars.filename)
-            finally:
-                if os.path.exists(tmpfile):
-                    os.remove(tmpfile)
 
 
 def main():

tests/integration/targets/kernel_blacklist/aliases

@@ -3,3 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 azp/posix/1
+skip/aix
+skip/freebsd
+skip/osx
+skip/macos

tests/integration/targets/kernel_blacklist/handlers/main.yml

@@ -0,0 +1,10 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+- name: Remove modprobe.d
+  ansible.builtin.file:
+    path: /etc/modprobe.d
+    state: absent
+    

tests/integration/targets/kernel_blacklist/tasks/main.yml

@@ -46,12 +46,12 @@
 - name: assert file is unchanged
   assert:
     that:
-    - bl_test_1 is not changed
+      - bl_test_1 is not changed
-    - bl_test_1a is not changed
+      - bl_test_1a is not changed
-    - orig_stat.stat.size == stat_test_1.stat.size
+      - orig_stat.stat.size == stat_test_1.stat.size
-    - orig_stat.stat.checksum == stat_test_1.stat.checksum
+      - orig_stat.stat.checksum == stat_test_1.stat.checksum
-    - orig_stat.stat.mtime == stat_test_1.stat.mtime
+      - orig_stat.stat.mtime == stat_test_1.stat.mtime
-    - stat_test_1.stat.checksum == expected_content | checksum
+      - stat_test_1.stat.checksum == expected_content | checksum
   vars:
     expected_content: |
       # Copyright (c) Ansible Project
@@ -65,7 +65,7 @@
 - name: test deprecation
   assert:
     that:
-    - "'deprecations' not in bl_test_1 or (ansible_version.major == 2 and ansible_version.minor == 12)"
+      - "'deprecations' not in bl_test_1 or (ansible_version.major == 2 and ansible_version.minor == 12)"
 
 - name: add new item to list
   community.general.kernel_blacklist:
@@ -82,8 +82,8 @@
 - name: assert element is added
   assert:
     that:
-    - bl_test_2 is changed
+      - bl_test_2 is changed
-    - slurp_test_2.content|b64decode == content
+      - slurp_test_2.content|b64decode == content
   vars:
     content: |
       # Copyright (c) Ansible Project
@@ -107,11 +107,11 @@
     src: '{{ bl_file }}'
   register: slurp_test_3
 
-- name: assert element is added
+- name: assert element is removed
   assert:
     that:
-    - bl_test_3 is changed
+      - bl_test_3 is changed
-    - slurp_test_3.content|b64decode == content
+      - slurp_test_3.content|b64decode == content
   vars:
     content: |
       # Copyright (c) Ansible Project
@@ -121,3 +121,35 @@
       blacklist aaaa
       blacklist cccc
       blacklist dddd
+
+############################################################################################################################################
+#
+# Issue 7362
+#
+
+- name: Create /etc/modprobe.d
+  ansible.builtin.file:
+    path: /etc/modprobe.d
+    state: directory
+    mode: '0755'
+    owner: root
+    group: root
+  notify: Remove modprobe.d
+
+- name: Create cls_rsvp file
+  ansible.builtin.copy:
+    dest: /etc/modprobe.d/cls_rsvp-blacklist.conf
+    content: |
+      blacklist cls_rsvp
+    mode: '0644'
+
+- name: Block potentially affected (and unused) modules (7362)
+  community.general.kernel_blacklist:
+    name: "{{ line_item }}"
+    state: present
+    blacklist_file: "/etc/modprobe.d/{{ line_item }}-blacklist.conf"
+  with_items:
+    - cifs
+    - cls_rsvp
+  loop_control:
+    loop_var: line_item