From 888be697cb958105ccdc933695c1e17d8873fe35 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Wed, 12 Aug 2020 13:29:04 -0400 Subject: [PATCH] Revert "Change default file permissions so they are not world readable (#70221)" (#71231) * Revert "Change default file permissions so they are not world readable (#70221)" This reverts commit 5260527c4a71bfed99d803e687dd19619423b134. * Revert "Fix warning for new default permissions when mode is not specified (#70976)" This reverts commit dc79528cc6609ccef41a4e9708973b992851ab31. --- .../67794-atomic_move-default-perms.yml | 4 - .../67794-default-permissions-warning-fix.yml | 4 - .../porting_guide_base_2.10.rst | 2 +- .../porting_guide_base_2.11.rst | 75 +------------------ lib/ansible/module_utils/basic.py | 26 ------- lib/ansible/module_utils/common/file.py | 2 +- .../targets/apt_repository/tasks/mode.yaml | 16 ++-- .../targets/module_utils_basic/aliases | 1 - .../library/test_perm_warning.py | 36 --------- .../targets/module_utils_basic/meta/main.yml | 2 - .../targets/module_utils_basic/tasks/main.yml | 33 -------- .../module_utils/basic/test_atomic_move.py | 12 +-- 12 files changed, 17 insertions(+), 196 deletions(-) delete mode 100644 changelogs/fragments/67794-atomic_move-default-perms.yml delete mode 100644 changelogs/fragments/67794-default-permissions-warning-fix.yml delete mode 100644 test/integration/targets/module_utils_basic/aliases delete mode 100644 test/integration/targets/module_utils_basic/library/test_perm_warning.py delete mode 100644 test/integration/targets/module_utils_basic/meta/main.yml delete mode 100644 test/integration/targets/module_utils_basic/tasks/main.yml diff --git a/changelogs/fragments/67794-atomic_move-default-perms.yml b/changelogs/fragments/67794-atomic_move-default-perms.yml deleted file mode 100644 index cef82ee203a..00000000000 --- a/changelogs/fragments/67794-atomic_move-default-perms.yml +++ /dev/null @@ -1,4 +0,0 @@ -security_fixes: - - > - **security issue** atomic_move - change default permissions when creating - temporary files so they are not world readable (https://github.com/ansible/ansible/issues/67794) (CVE-2020-1736) diff --git a/changelogs/fragments/67794-default-permissions-warning-fix.yml b/changelogs/fragments/67794-default-permissions-warning-fix.yml deleted file mode 100644 index 7a69f0e7a25..00000000000 --- a/changelogs/fragments/67794-default-permissions-warning-fix.yml +++ /dev/null @@ -1,4 +0,0 @@ -bugfixes: - - > - Fix warning for default permission change when no mode is specified. Follow up - to https://github.com/ansible/ansible/issues/67794. (CVE-2020-1736) diff --git a/docs/docsite/rst/porting_guides/porting_guide_base_2.10.rst b/docs/docsite/rst/porting_guides/porting_guide_base_2.10.rst index 20f3fb538da..c89929eccc5 100644 --- a/docs/docsite/rst/porting_guides/porting_guide_base_2.10.rst +++ b/docs/docsite/rst/porting_guides/porting_guide_base_2.10.rst @@ -58,7 +58,7 @@ A new warning will be displayed when all of the following conditions are true: - The file at the final destination, not the temporary file, does not exist - A module supports setting ``mode`` but it was not specified for the task - - The module calls ``atomic_move()`` but does not later call ``set_fs_attributes_if_different()`` or ``set_mode_if_different()`` with a ``mode`` specified + - The module calls ``atomic_move()`` but does not later call ``set_fs_attributes_if_different()`` or ``set_mode_if_different()`` The following modules call ``atomic_move()`` but do not call ``set_fs_attributes_if_different()`` or ``set_mode_if_different()`` and do not support setting ``mode``. This means for files they create, the default permissions have changed and there is no indication: diff --git a/docs/docsite/rst/porting_guides/porting_guide_base_2.11.rst b/docs/docsite/rst/porting_guides/porting_guide_base_2.11.rst index 98e81169bc0..fdc259badb1 100644 --- a/docs/docsite/rst/porting_guides/porting_guide_base_2.11.rst +++ b/docs/docsite/rst/porting_guides/porting_guide_base_2.11.rst @@ -17,7 +17,6 @@ The complete list of porting guides can be found at :ref:`porting guides