From 9088671c4ebe99e3b53cb270c3731ae9a8967a03 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 22 Oct 2018 18:19:53 -0700 Subject: [PATCH] Fix python3 problem in user module cve fix --- lib/ansible/modules/system/user.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/system/user.py b/lib/ansible/modules/system/user.py index 4118f7a4527..385194ed150 100644 --- a/lib/ansible/modules/system/user.py +++ b/lib/ansible/modules/system/user.py @@ -891,16 +891,16 @@ class User(object): chunk = os.read(master_out_fd, 10240) out_buffer += chunk if prompt in out_buffer: - os.write(master_in_fd, self.ssh_passphrase + b'\r') + os.write(master_in_fd, to_bytes(self.ssh_passphrase, errors='strict') + b'\r') prompt = second_prompt else: chunk = os.read(master_err_fd, 10240) err_buffer += chunk if prompt in err_buffer: - os.write(master_in_fd, self.ssh_passphrase + b'\r') + os.write(master_in_fd, to_bytes(self.ssh_passphrase, errors='strict') + b'\r') prompt = second_prompt if b'Overwrite (y/n)?' in out_buffer or b'Overwrite (y/n)?' in err_buffer: - # This created between us checking for existence and now + # The key was created between us checking for existence and now return (None, 'Key already exists', '') rc = p.returncode