From ead63f202155c2dbfdd7d9e222ac2c2137ddb904 Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Sun, 10 Jan 2021 12:16:09 -0600
Subject: [PATCH] [stable-2.9] Fix reset_connection paramiko, winrm, psrp
 (#72688) (#72926)

* Ensure we only reset the connection when one has been previously established. Fixes #65812

* Ensure psrp doesn't trace

* winrm too

(cherry picked from commit a3b6485073a0bbd2574285b4087d10dcfd80d494)

Co-authored-by: Matt Martz <matt@sivel.net>
---
 changelogs/fragments/65812-paramiko-attribute-error.yml      | 3 +++
 lib/ansible/plugins/connection/paramiko_ssh.py               | 2 ++
 lib/ansible/plugins/connection/psrp.py                       | 2 ++
 lib/ansible/plugins/connection/winrm.py                      | 2 ++
 test/integration/targets/connection/test.sh                  | 2 ++
 .../integration/targets/connection/test_reset_connection.yml | 5 +++++
 6 files changed, 16 insertions(+)
 create mode 100644 changelogs/fragments/65812-paramiko-attribute-error.yml
 create mode 100644 test/integration/targets/connection/test_reset_connection.yml

diff --git a/changelogs/fragments/65812-paramiko-attribute-error.yml b/changelogs/fragments/65812-paramiko-attribute-error.yml
new file mode 100644
index 00000000000..be95fe9d57f
--- /dev/null
+++ b/changelogs/fragments/65812-paramiko-attribute-error.yml
@@ -0,0 +1,3 @@
+bugfixes:
+- paramiko connection plugin - Ensure we only reset the connection when one has been
+  previously established (https://github.com/ansible/ansible/issues/65812)
diff --git a/lib/ansible/plugins/connection/paramiko_ssh.py b/lib/ansible/plugins/connection/paramiko_ssh.py
index d955543248f..d29bba29e8b 100644
--- a/lib/ansible/plugins/connection/paramiko_ssh.py
+++ b/lib/ansible/plugins/connection/paramiko_ssh.py
@@ -538,6 +538,8 @@ class Connection(ConnectionBase):
         f.close()
 
     def reset(self):
+        if not self._connected:
+            return
         self.close()
         self._connect()
 
diff --git a/lib/ansible/plugins/connection/psrp.py b/lib/ansible/plugins/connection/psrp.py
index 9fab96935f8..38a6259bcd2 100644
--- a/lib/ansible/plugins/connection/psrp.py
+++ b/lib/ansible/plugins/connection/psrp.py
@@ -407,6 +407,8 @@ class Connection(ConnectionBase):
         return self
 
     def reset(self):
+        if not self._connected:
+            return
         display.vvvvv("PSRP: Reset Connection", host=self._psrp_host)
         self.runspace = None
         self._connect()
diff --git a/lib/ansible/plugins/connection/winrm.py b/lib/ansible/plugins/connection/winrm.py
index 0334c0a6e7a..0573a992daa 100644
--- a/lib/ansible/plugins/connection/winrm.py
+++ b/lib/ansible/plugins/connection/winrm.py
@@ -525,6 +525,8 @@ class Connection(ConnectionBase):
         return self
 
     def reset(self):
+        if not self._connected:
+            return
         self.protocol = None
         self.shell_id = None
         self._connect()
diff --git a/test/integration/targets/connection/test.sh b/test/integration/targets/connection/test.sh
index 4e7aa8dda13..6de82bfdea3 100755
--- a/test/integration/targets/connection/test.sh
+++ b/test/integration/targets/connection/test.sh
@@ -8,3 +8,5 @@ set -eux
 
                 ansible-playbook test_connection.yml -i "${INVENTORY}" "$@"
 LC_ALL=C LANG=C ansible-playbook test_connection.yml -i "${INVENTORY}" "$@"
+
+ansible-playbook test_reset_connection.yml -i "${INVENTORY}" "$@"
\ No newline at end of file
diff --git a/test/integration/targets/connection/test_reset_connection.yml b/test/integration/targets/connection/test_reset_connection.yml
new file mode 100644
index 00000000000..2f6cb8dcd62
--- /dev/null
+++ b/test/integration/targets/connection/test_reset_connection.yml
@@ -0,0 +1,5 @@
+- hosts: "{{ target_hosts }}"
+  gather_facts: no
+  tasks:
+    # https://github.com/ansible/ansible/issues/65812
+    - meta: reset_connection