diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2022-04-25 08:15:06 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2022-04-25 08:15:06 -0400 |
| commit | 47529be4385cffba6851f10e505f5683290d116e (patch) | |
| tree | 0e1169c507de4a9b00ea9af7cad7656b1414b498 | |
| parent | 7a2c84afaada7a513ee482ba36e8848528b6f5f3 (diff) | |
| parent | d7fe051087fc9bd31dc0c42da63b3ae4852f6d2d (diff) | |
Merge branch '2.9' into 2.10
| -rw-r--r-- | paramiko/pkey.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 6 | ||||
| -rw-r--r-- | tests/test_pkey.py | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/paramiko/pkey.py b/paramiko/pkey.py index 797e7723..f1919660 100644 --- a/paramiko/pkey.py +++ b/paramiko/pkey.py @@ -140,7 +140,7 @@ class PKey(object): return cmp(self.asbytes(), other.asbytes()) # noqa def __eq__(self, other): - return self._fields == other._fields + return isinstance(other, PKey) and self._fields == other._fields def __hash__(self): return hash(self._fields) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index eb1e0704..21117b8f 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,12 @@ Changelog ========= +- :bug:`1964` (via :issue:`2024` as also reported in :issue:`2023`) + `~paramiko.pkey.PKey` instances' ``__eq__`` did not have the usual safety + guard in place to ensure they were being compared to another ``PKey`` object, + causing occasional spurious ``BadHostKeyException`` (among other things). + This has been fixed. Thanks to Shengdun Hua for the original report/patch and + to Christopher Papke for the final version of the fix. - :bug:`2035` Servers offering certificate variants of hostkey algorithms (eg ``ssh-rsa-cert-v01@openssh.com``) could not have their host keys verified by Paramiko clients, as it only ever considered non-cert key types for that part diff --git a/tests/test_pkey.py b/tests/test_pkey.py index e1a3a362..3bc0459a 100644 --- a/tests/test_pkey.py +++ b/tests/test_pkey.py @@ -624,6 +624,11 @@ class KeyTest(unittest.TestCase): for key1, key2 in self.keys(): assert key1 == key2 + def test_keys_are_not_equal_to_other(self): + for value in [None, True, ""]: + for key1, _ in self.keys(): + assert key1 != value + def test_keys_are_hashable(self): # NOTE: this isn't a great test due to hashseed randomization under # Python 3 preventing use of static values, but it does still prove |