Merge c401a5d331 into 9343c6f56f

README.md

@@ -2,7 +2,7 @@
 <!-- Add CI and code coverage badges here. Samples included below. -->
 [![Build Status](
 https://dev.azure.com/ansible/ansible.posix/_apis/build/status/CI?branchName=main)](https://dev.azure.com/ansible/ansible.posix/_build?definitionId=26)
-[![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/ansible.posix)](https://codecov.io/gh/ansible-collections/ansible.posix)
+[![Run Status](https://api.shippable.com/projects/5e669aaf8b17a60007e4d18d/badge?branch=main)]() <!--[![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/ansible.posix)](https://codecov.io/gh/ansible-collections/ansible.posix)-->
 
 ## Communication
 

changelogs/fragments/639_fix_authorized_key.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-  - ansible.posix.authorized_key - fixes error on permission denied in authorized_key module (https://github.com/ansible-collections/ansible.posix/issues/462).

plugins/modules/authorized_key.py

@@ -225,8 +225,6 @@ import os.path
 import tempfile
 import re
 import shlex
-import errno
-import traceback
 from operator import itemgetter
 
 from ansible.module_utils._text import to_native
@@ -477,18 +475,16 @@ def parsekey(module, raw_key, rank=None):
     return (key, key_type, options, comment, rank)
 
 
-def readfile(module, filename):
+def readfile(filename):
+
+    if not os.path.isfile(filename):
+        return ''
+
+    f = open(filename)
     try:
-        with open(filename, 'r') as f:
+        return f.read()
-            return f.read()
+    finally:
-    except IOError as e:
+        f.close()
-        if e.errno == errno.EACCES:
-            module.fail_json(msg="Permission denied on file or path for authorized keys file: %s" % filename,
-                             exception=traceback.format_exc())
-        elif e.errno == errno.ENOENT:
-            return ''
-        else:
-            raise
 
 
 def parsekeys(module, lines):
@@ -601,7 +597,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)
-    existing_content = readfile(module, params["keyfile"])
+    existing_content = readfile(params["keyfile"])
     existing_keys = parsekeys(module, existing_content)
 
     # Add a place holder for keys that should exist in the state=present and

tests/integration/targets/authorized_key/tasks/check_permissions.yml

@@ -1,41 +0,0 @@
----
-# -------------------------------------------------------------
-# check permissions
-
-- name: Create a file that is not accessible
-  ansible.builtin.file:
-    state: touch
-    path: "{{ output_dir | expanduser }}/file_permissions"
-    owner: root
-    mode: '0000'
-
-- name: Create unprivileged user
-  ansible.builtin.user:
-    name: nopriv
-    create_home: true
-
-- name: Try to delete a key from an unreadable file
-  become: true
-  become_user: nopriv
-  ansible.posix.authorized_key:
-    user: root
-    key: "{{ dss_key_basic }}"
-    state: absent
-    path: "{{ output_dir | expanduser }}/file_permissions"
-  register: result
-  ignore_errors: true
-
-- name: Assert that the key deletion has failed
-  ansible.builtin.assert:
-    that:
-      - result is failed
-
-- name: Remove the file
-  ansible.builtin.file:
-    state: absent
-    path: "{{ output_dir | expanduser }}/file_permissions"
-
-- name: Remove the user
-  ansible.builtin.user:
-    name: nopriv
-    state: absent

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

@@ -34,6 +34,3 @@
 
 - name: Test for specifying key as a path
   ansible.builtin.import_tasks: check_path.yml
-
-- name: Test for permission denied files
-  ansible.builtin.import_tasks: check_permissions.yml