From a57347b55da571d31934701bb54f193a6d1add38 Mon Sep 17 00:00:00 2001 From: "Laurent Mignon (ACSONE)" Date: Mon, 5 Feb 2018 10:30:08 +0100 Subject: [PATCH] [IMP] keychain: get_password must not be accessible from outside --- keychain/__manifest__.py | 2 +- keychain/models/keychain.py | 2 +- keychain/tests/test_keychain.py | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/keychain/__manifest__.py b/keychain/__manifest__.py index 0e99a5cb7..657433280 100644 --- a/keychain/__manifest__.py +++ b/keychain/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Keychain", "summary": "Store accounts and credentials", - "version": "10.0.1.0.0", + "version": "10.0.2.0.0", "category": "Uncategorized", "website": "https://akretion.com/", "author": "Akretion, Odoo Community Association (OCA)", diff --git a/keychain/models/keychain.py b/keychain/models/keychain.py index a94ffb23c..40848864c 100644 --- a/keychain/models/keychain.py +++ b/keychain/models/keychain.py @@ -62,7 +62,7 @@ class KeychainAccount(models.Model): # Only needed in v8 for _description_searchable issues return True - def get_password(self): + def _get_password(self): """Password in clear text.""" try: return self._decode_password(self.password) diff --git a/keychain/tests/test_keychain.py b/keychain/tests/test_keychain.py index d5fd5222a..040262213 100644 --- a/keychain/tests/test_keychain.py +++ b/keychain/tests/test_keychain.py @@ -68,7 +68,7 @@ class TestKeychain(TransactionCase): account.clear_password = password account._inverse_set_password() self.assertTrue(account.clear_password != account.password) - self.assertEqual(account.get_password(), password) + self.assertEqual(account._get_password(), password) def test_wrong_key(self): """It should raise an exception when encoded key != decoded.""" @@ -78,7 +78,7 @@ class TestKeychain(TransactionCase): account._inverse_set_password() config['keychain_key'] = Fernet.generate_key() try: - account.get_password() + account._get_password() self.assertTrue(False, 'It should not work with another key') except Warning as err: self.assertTrue(True, 'It should raise a Warning') @@ -134,13 +134,13 @@ class TestKeychain(TransactionCase): account.clear_password = 'abc' account._inverse_set_password() self.assertEqual( - account.get_password(), + account._get_password(), 'abc', 'Should work with dev') config['running_env'] = 'prod' with self.assertRaises(Warning): self.assertEqual( - account.get_password(), + account._get_password(), 'abc', 'Should not work with prod key') def test_multienv_blank(self): @@ -154,12 +154,12 @@ class TestKeychain(TransactionCase): account.clear_password = 'abc' account._inverse_set_password() self.assertEqual( - account.get_password(), + account._get_password(), 'abc', 'Should work with dev') config['running_env'] = 'prod' self.assertEqual( - account.get_password(), + account._get_password(), 'abc', 'Should work with prod') def test_multienv_force(self): @@ -178,12 +178,12 @@ class TestKeychain(TransactionCase): with self.assertRaises(Warning): self.assertEqual( - account.get_password(), + account._get_password(), 'abc', 'Should not work with dev') config['running_env'] = 'prod' self.assertEqual( - account.get_password(), + account._get_password(), 'abc', 'Should work with prod') def test_wrong_json(self):