Handle failure when a bad passphrase is paired with an encrypted key

Author: jpeacock-zenoss

src/Products/DataCollector/SshClient.py

@@ -27,7 +27,7 @@
     transport,
     userauth,
 )
-from twisted.conch.ssh.keys import Key
+from twisted.conch.ssh.keys import BadKeyError, Key
 from twisted.internet import defer, reactor
 from zope.component import queryUtility
 from Products.ZenCollector.interfaces import IEventService
@@ -390,7 +390,7 @@ def _getKey(self):
             try:
                 data = "".join(open(keyPath).readlines()).strip()
                 key = Key.fromString(data, passphrase=self.factory.password)
-            except IOError as ex:
+            except (BadKeyError, IOError) as ex:
                 message = "Unable to read the SSH key file because %s" % ex
                 log.warn(message)
                 device = "localhost"  # Fallback