[PR #11926/c0d3464f backport][stable-12] crypttab: fix option parsing when value contains multiple equal signs (#11929)

crypttab: fix option parsing when value contains multiple equal signs (#11926)

* fix(crypttab): preserve option values containing multiple equal signs

Fixes #4963



* fix(crypttab): add changelog fragment for PR 11926



---------


(cherry picked from commit c0d3464fa7)

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

.azure-pipelines/azure-pipelines.yml

@@ -109,19 +109,6 @@ stages:
             - test: 2
             - test: 3
             - test: 4
-  - stage: Sanity_2_18
-    displayName: Sanity 2.18
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.18/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
 ### Units
   - stage: Units_devel
     displayName: Units devel
@@ -138,6 +125,7 @@ stages:
             - test: '3.12'
             - test: '3.13'
             - test: '3.14'
+            - test: '3.15'
   - stage: Units_2_21
     displayName: Units 2.21
     dependsOn: []
@@ -174,18 +162,6 @@ stages:
             - test: 3.8
             - test: "3.11"
             - test: "3.13"
-  - stage: Units_2_18
-    displayName: Units 2.18
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.18/units/{0}/1
-          targets:
-            - test: 3.8
-            - test: "3.11"
-            - test: "3.13"
 
 ## Remote
   - stage: Remote_devel_extra_vms
@@ -282,22 +258,6 @@ stages:
             - 1
             - 2
             - 3
-  - stage: Remote_2_18
-    displayName: Remote 2.18
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.18/{0}
-          targets:
-            # - name: macOS 14.3
-            #   test: macos/14.3
-            - name: FreeBSD 14.1
-              test: freebsd/14.1
-          groups:
-            - 1
-            - 2
-            - 3
 
 ### Docker
   - stage: Docker_devel
@@ -372,24 +332,6 @@ stages:
             - 1
             - 2
             - 3
-  - stage: Docker_2_18
-    displayName: Docker 2.18
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.18/linux/{0}
-          targets:
-            - name: Fedora 40
-              test: fedora40
-            - name: Alpine 3.20
-              test: alpine320
-            - name: Ubuntu 24.04
-              test: ubuntu2404
-          groups:
-            - 1
-            - 2
-            - 3
 
 ### Community Docker
   - stage: Docker_community_devel
@@ -425,8 +367,8 @@ stages:
 #          testFormat: devel/generic/{0}/1
 #          targets:
 #            - test: '3.9'
-#            - test: '3.12'
-#            - test: '3.14'
+#            - test: '3.13'
+#            - test: '3.15'
 #  - stage: Generic_2_21
 #    displayName: Generic 2.21
 #    dependsOn: []
@@ -460,17 +402,6 @@ stages:
 #          testFormat: 2.19/generic/{0}/1
 #          targets:
 #            - test: '3.9'
-#            - test: '3.13'
-#  - stage: Generic_2_18
-#    displayName: Generic 2.18
-#    dependsOn: []
-#    jobs:
-#      - template: templates/matrix.yml
-#        parameters:
-#          nameFormat: Python {0}
-#          testFormat: 2.18/generic/{0}/1
-#          targets:
-#            - test: '3.8'
 #            - test: '3.13'
 
   - stage: Summary
@@ -480,29 +411,24 @@ stages:
       - Sanity_2_21
       - Sanity_2_20
       - Sanity_2_19
-      - Sanity_2_18
       - Units_devel
       - Units_2_21
       - Units_2_20
       - Units_2_19
-      - Units_2_18
       - Remote_devel_extra_vms
       - Remote_devel
       - Remote_2_21
       - Remote_2_20
       - Remote_2_19
-      - Remote_2_18
       - Docker_devel
       - Docker_2_21
       - Docker_2_20
       - Docker_2_19
-      - Docker_2_18
       - Docker_community_devel
 # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
 #      - Generic_devel
 #      - Generic_2_21
 #      - Generic_2_20
 #      - Generic_2_19
-#      - Generic_2_18
     jobs:
       - template: templates/coverage.yml

.github/workflows/ansible-test.yml

@@ -30,6 +30,7 @@ jobs:
       matrix:
         ansible:
           - '2.17'
+          - '2.18'
     runs-on: ubuntu-latest
     steps:
       - name: Perform sanity testing
@@ -63,6 +64,12 @@ jobs:
             python: '3.10'
           - ansible: '2.17'
             python: '3.12'
+          - ansible: '2.18'
+            python: '3.8'
+          - ansible: '2.18'
+            python: '3.11'
+          - ansible: '2.18'
+            python: '3.13'
 
     steps:
       - name: >-
@@ -144,6 +151,52 @@ jobs:
           #   docker: default
           #   python: '3.12'
           #   target: azp/generic/1/
+          # 2.18
+          - ansible: '2.18'
+            docker: fedora40
+            python: ''
+            target: azp/posix/1/
+          - ansible: '2.18'
+            docker: fedora40
+            python: ''
+            target: azp/posix/2/
+          - ansible: '2.18'
+            docker: fedora40
+            python: ''
+            target: azp/posix/3/
+          - ansible: '2.18'
+            docker: ubuntu2404
+            python: ''
+            target: azp/posix/1/
+          - ansible: '2.18'
+            docker: ubuntu2404
+            python: ''
+            target: azp/posix/2/
+          - ansible: '2.18'
+            docker: ubuntu2404
+            python: ''
+            target: azp/posix/3/
+          - ansible: '2.18'
+            docker: alpine320
+            python: ''
+            target: azp/posix/1/
+          - ansible: '2.18'
+            docker: alpine320
+            python: ''
+            target: azp/posix/2/
+          - ansible: '2.18'
+            docker: alpine320
+            python: ''
+            target: azp/posix/3/
+          # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
+          # - ansible: '2.18'
+          #   docker: default
+          #   python: '3.8'
+          #   target: azp/generic/1/
+          # - ansible: '2.18'
+          #   docker: default
+          #   python: '3.13'
+          #   target: azp/generic/1/
 
     steps:
       - name: >-

changelogs/fragments/11361-scaleway-get-resources-none-type.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - scaleway_image_info, scaleway_ip_info, scaleway_organization_info, scaleway_security_group_info, scaleway_server_info, scaleway_snapshot_info, scaleway_volume_info - fix ``NoneType`` error when the Scaleway API returns an empty or non-JSON response body (https://github.com/ansible-collections/community.general/issues/11361, https://github.com/ansible-collections/community.general/pull/11918).

changelogs/fragments/11909-fix-favicon-url.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - "mattermost, rocketchat, slack - update default ``icon_url`` to ansible favicon (https://github.com/ansible-collections/community.general/pull/11909)."

changelogs/fragments/11926-crypttab-fix-opts-equal-sign.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - crypttab - fix parsing of options whose value contains an equal sign (https://github.com/ansible-collections/community.general/issues/4963, https://github.com/ansible-collections/community.general/pull/11926).

changelogs/fragments/12.6.1.yml

@@ -0,0 +1 @@
+release_summary: Regular bugfix release.

galaxy.yml

@@ -5,7 +5,7 @@
 
 namespace: community
 name: general
-version: 12.6.0
+version: 12.6.1
 readme: README.md
 authors:
   - Ansible (https://github.com/ansible)

plugins/module_utils/scaleway.py

@@ -237,10 +237,15 @@ class Scaleway:
         results = self.get(f"/{self.name}")
 
         if not results.ok:
+            api_response = results.json if results.json is not None else results.body
+            message = api_response.get("message") if isinstance(api_response, dict) else api_response
             raise ScalewayException(
-                f"Error fetching {self.name} ({self.module.params.get('api_url')}/{self.name}) [{results.status_code}: {results.json['message']}]"
+                f"Error fetching {self.name} ({self.module.params.get('api_url')}/{self.name}) [{results.status_code}: {message}]"
             )
 
+        if results.json is None:
+            raise ScalewayException(f"Scaleway API returned an empty or non-JSON response for {self.name}")
+
         return results.json.get(self.name)
 
     def _url_builder(self, path, params):

plugins/modules/crypttab.py

@@ -281,7 +281,7 @@ class Options(dict):
         self.itemlist = []
         if opts_string is not None:
             for opt in opts_string.split(","):
-                kv = opt.split("=")
+                kv = opt.split("=", 1)
                 if len(kv) > 1:
                     k, v = (kv[0], kv[1])
                 else:

plugins/modules/mattermost.py

@@ -63,7 +63,7 @@ options:
     type: str
     description:
       - URL for the message sender's icon.
-    default: https://docs.ansible.com/favicon.ico
+    default: https://docs.ansible.com/favicon/favicon.ico
   priority:
     type: str
     description:
@@ -136,7 +136,7 @@ def main():
             text=dict(type="str"),
             channel=dict(type="str"),
             username=dict(type="str", default="Ansible"),
-            icon_url=dict(type="str", default="https://docs.ansible.com/favicon.ico"),
+            icon_url=dict(type="str", default="https://docs.ansible.com/favicon/favicon.ico"),
             priority=dict(type="str", choices=["important", "urgent"]),
             validate_certs=dict(default=True, type="bool"),
             attachments=dict(type="list", elements="dict"),

plugins/modules/packet_volume_attachment.py

@@ -83,7 +83,7 @@ EXAMPLES = r"""
 
   tasks:
     - name: Create volume
-      packet_volume:
+      community.general.packet_volume:
         description: "{{ volname }}"
         project_id: "{{ project_id }}"
         facility: ewr1
@@ -95,7 +95,7 @@ EXAMPLES = r"""
           snapshot_frequency: 1day
 
     - name: Create a device
-      packet_device:
+      community.general.packet_device:
         project_id: "{{ project_id }}"
         hostnames: "{{ devname }}"
         operating_system: ubuntu_16_04

plugins/modules/rocketchat.py

@@ -60,7 +60,7 @@ options:
     type: str
     description:
       - URL for the message sender's icon.
-    default: "https://docs.ansible.com/favicon.ico"
+    default: "https://docs.ansible.com/favicon/favicon.ico"
   icon_emoji:
     type: str
     description:
@@ -223,7 +223,7 @@ def main():
             msg=dict(type="str"),
             channel=dict(type="str"),
             username=dict(type="str", default="Ansible"),
-            icon_url=dict(type="str", default="https://docs.ansible.com/favicon.ico"),
+            icon_url=dict(type="str", default="https://docs.ansible.com/favicon/favicon.ico"),
             icon_emoji=dict(type="str"),
             link_names=dict(type="int", default=1, choices=[0, 1]),
             validate_certs=dict(default=True, type="bool"),

plugins/modules/slack.py

@@ -84,7 +84,7 @@ options:
     type: str
     description:
       - URL for the message sender's icon.
-    default: https://docs.ansible.com/favicon.ico
+    default: https://docs.ansible.com/favicon/favicon.ico
   icon_emoji:
     type: str
     description:
@@ -467,7 +467,7 @@ def main():
             channel=dict(type="str"),
             thread_id=dict(type="str"),
             username=dict(type="str", default="Ansible"),
-            icon_url=dict(type="str", default="https://docs.ansible.com/favicon.ico"),
+            icon_url=dict(type="str", default="https://docs.ansible.com/favicon/favicon.ico"),
             icon_emoji=dict(type="str"),
             link_names=dict(type="int", default=1, choices=[0, 1]),
             parse=dict(type="str", choices=["none", "full"]),