Auth

additional_tests/exchanges_tests/__init__.py

@@ -22,6 +22,7 @@
 import octobot_commons.constants as commons_constants
 import octobot_commons.asyncio_tools as asyncio_tools
 import octobot_commons.os_util as os_util
+import octobot_commons.configuration as configuration
 import octobot_commons.tests.test_config as test_config
 import octobot_trading.api as trading_api
 import octobot_trading.exchanges as exchanges
@@ -61,15 +62,18 @@ def get_name(self):
 
 
 @contextlib.asynccontextmanager
-async def get_authenticated_exchange_manager(exchange_name, exchange_tentacle_name, config=None,
-                                             credentials_exchange_name=None, market_filter=None):
+async def get_authenticated_exchange_manager(
+    exchange_name, exchange_tentacle_name, config=None,
+    credentials_exchange_name=None, market_filter=None,
+    use_invalid_creds=False
+):
     credentials_exchange_name = credentials_exchange_name or exchange_name
     _load_exchange_creds_env_variables_if_necessary()
     config = {**test_config.load_test_config(), **config} if config else test_config.load_test_config()
     if exchange_name not in config[commons_constants.CONFIG_EXCHANGES]:
         config[commons_constants.CONFIG_EXCHANGES][exchange_name] = {}
     config[commons_constants.CONFIG_EXCHANGES][exchange_name].update(_get_exchange_auth_details(
-        credentials_exchange_name
+        credentials_exchange_name, use_invalid_creds
     ))
     exchange_type = config[commons_constants.CONFIG_EXCHANGES][exchange_name].get(
         commons_constants.CONFIG_EXCHANGE_TYPE, exchanges.get_default_exchange_type(exchange_name))
@@ -129,15 +133,35 @@ def _load_exchange_creds_env_variables_if_necessary():
         LOADED_EXCHANGE_CREDS_ENV_VARIABLES = True
 
 
-def _get_exchange_auth_details(exchange_name):
-    return {
+def _get_exchange_auth_details(exchange_name, use_invalid_creds):
+    config = {
         commons_constants.CONFIG_EXCHANGE_KEY:
             _get_exchange_credential_from_env(exchange_name, commons_constants.CONFIG_EXCHANGE_KEY),
-        commons_constants.CONFIG_EXCHANGE_SECRET:
-            _get_exchange_credential_from_env(exchange_name, commons_constants.CONFIG_EXCHANGE_SECRET),
+        commons_constants.CONFIG_EXCHANGE_SECRET: _get_exchange_credential_from_env(
+            exchange_name, commons_constants.CONFIG_EXCHANGE_SECRET
+        ),
         commons_constants.CONFIG_EXCHANGE_PASSWORD:
             _get_exchange_credential_from_env(exchange_name, commons_constants.CONFIG_EXCHANGE_PASSWORD),
     }
+    if use_invalid_creds:
+        _invalidate(config)
+    return config
+
+
+def _invalidate(exchange_config: dict):
+    # try to invalidate key while returning a "plausible" value to avoid signature / parsing issues
+    decoded = configuration.decrypt_element_if_possible(
+        commons_constants.CONFIG_EXCHANGE_KEY, exchange_config, None
+    )
+    updated_decoded = decoded
+    for numb in range(9):
+        if str(numb) in decoded:
+            number_index = decoded.index(str(numb))
+            updated_decoded = f"{decoded[:number_index]}{numb + 1}{decoded[number_index+1:]}"
+            break
+    if updated_decoded == decoded:
+        raise ValueError("No number to invalid api key")
+    exchange_config[commons_constants.CONFIG_EXCHANGE_KEY] = configuration.encrypt(updated_decoded).decode()
 
 
 def _get_exchange_credential_from_env(exchange_name, cred_suffix):

additional_tests/exchanges_tests/abstract_authenticated_exchange_tester.py

@@ -143,6 +143,17 @@ async def inner_test_get_account_id(self):
             with pytest.raises(NotImplementedError):
                 await self.exchange_manager.exchange.get_account_id()
 
+    async def test_invalid_api_key_error(self):
+        with pytest.raises(trading_errors.AuthenticationError):
+            created_exchange = mock.Mock()
+            async with self.local_exchange_manager(use_invalid_creds=True):
+                created_exchange()
+                # should fail
+                await self.get_portfolio()
+                raise AssertionError("Did not raise")
+            # ensure self.local_exchange_manager did not raise
+            created_exchange.assert_called_once()
+
     async def test_get_api_key_permissions(self):
         async with self.local_exchange_manager():
             await self.inner_test_get_api_key_permissions()
@@ -735,7 +746,7 @@ async def get_price(self, symbol=None):
         ))
 
     @contextlib.asynccontextmanager
-    async def local_exchange_manager(self, market_filter=None, identifiers_suffix=None):
+    async def local_exchange_manager(self, market_filter=None, identifiers_suffix=None, use_invalid_creds=False):
         try:
             exchange_tentacle_name = self.EXCHANGE_TENTACLE_NAME or self.EXCHANGE_NAME.capitalize()
             credentials_exchange_name = self.CREDENTIALS_EXCHANGE_NAME or self.EXCHANGE_NAME
@@ -746,7 +757,8 @@ async def local_exchange_manager(self, market_filter=None, identifiers_suffix=No
                     exchange_tentacle_name,
                     self.get_config(),
                     credentials_exchange_name=credentials_exchange_name,
-                    market_filter=market_filter
+                    market_filter=market_filter,
+                    use_invalid_creds=use_invalid_creds,
             ) as exchange_manager:
                 self.exchange_manager = exchange_manager
                 yield

additional_tests/exchanges_tests/test_ascendex.py

@@ -44,6 +44,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_binance.py

@@ -47,6 +47,9 @@ async def test_get_portfolio_with_market_filter(self):
     async def test_get_account_id(self):
         await super().test_get_account_id()
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         await super().test_get_api_key_permissions()
 

additional_tests/exchanges_tests/test_binance_futures.py

@@ -51,6 +51,9 @@ async def test_get_portfolio_with_market_filter(self):
     async def test_get_account_id(self):
         await super().test_get_account_id()
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_bingx.py

@@ -46,6 +46,9 @@ async def test_get_portfolio_with_market_filter(self):
     async def test_get_account_id(self):
         await super().test_get_account_id()
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         await super().test_get_api_key_permissions()
 

additional_tests/exchanges_tests/test_bitget.py

@@ -46,6 +46,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_bitmart.py

@@ -44,6 +44,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_bybit.py

@@ -48,6 +48,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_bybit_futures.py

@@ -51,6 +51,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_coinbase.py

@@ -44,6 +44,9 @@ async def test_get_portfolio_with_market_filter(self):
     async def test_get_account_id(self):
         await super().test_get_account_id()
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         await super().test_get_api_key_permissions()
 

additional_tests/exchanges_tests/test_coinex.py

@@ -43,6 +43,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_cryptocom.py

@@ -44,6 +44,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_gateio.py

@@ -45,6 +45,10 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        # await super().test_invalid_api_key_error() # raises Request timeout
+        pass
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_hollaex.py

@@ -46,6 +46,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_htx.py

@@ -45,6 +45,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_kucoin.py

@@ -47,6 +47,9 @@ async def test_create_and_cancel_limit_orders(self):
     async def test_get_account_id(self):
         await super().test_get_account_id()
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         await super().test_get_api_key_permissions()
 

additional_tests/exchanges_tests/test_kucoin_futures.py

@@ -48,6 +48,9 @@ async def test_get_portfolio_with_market_filter(self):
     async def test_get_account_id(self):
         await super().test_get_account_id()
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         await super().test_get_api_key_permissions()
 

additional_tests/exchanges_tests/test_mexc.py

@@ -45,6 +45,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

additional_tests/exchanges_tests/test_okx.py

@@ -47,6 +47,9 @@ async def test_create_and_cancel_limit_orders(self):
     async def test_get_account_id(self):
         await super().test_get_account_id()
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         await super().test_get_api_key_permissions()
 

additional_tests/exchanges_tests/test_okx_futures.py

@@ -46,6 +46,9 @@ async def test_get_portfolio_with_market_filter(self):
     async def test_get_account_id(self):
         await super().test_get_account_id()
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         await super().test_get_api_key_permissions()
 

additional_tests/exchanges_tests/test_phemex.py

@@ -43,6 +43,9 @@ async def test_get_account_id(self):
         # pass if not implemented
         pass
 
+    async def test_invalid_api_key_error(self):
+        await super().test_invalid_api_key_error()
+
     async def test_get_api_key_permissions(self):
         # pass if not implemented
         pass

requirements.txt

@@ -1,6 +1,6 @@
 # Drakkar-Software requirements
 OctoBot-Commons==1.9.58
-OctoBot-Trading==2.4.108
+OctoBot-Trading==2.4.109
 OctoBot-Evaluators==1.9.6
 OctoBot-Tentacles-Manager==2.9.16
 OctoBot-Services==1.6.17