tplinkrouterc6u 5.14.0__tar.gz → 5.15.0__tar.gz

{tplinkrouterc6u-5.14.0 → tplinkrouterc6u-5.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.14.0
+Version: 5.15.0
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -57,6 +57,7 @@ Python package for API access and management for TP-Link and Mercusys Routers. S
 from tplinkrouterc6u import (
     TplinkRouterProvider,
     TplinkRouterV1_11,
+    TplinkRouterSG, # For routers like Archer BE3600, Archer BE230
     TplinkRouter,
     TplinkC1200Router,
     TplinkC5400XRouter,
@@ -68,7 +69,7 @@ from tplinkrouterc6u import (
     TPLinkVR400v2Client,
     TPLinkEXClient, # Class for EX series routers which supports old firmwares with AES cipher CBC mode
     TPLinkEXClientGCM, # Class for EX series routers which supports AES cipher GCM mode
-    TPLinkRClient,
+    TPLinkRClient, # For routers like TL-R470GP-AC
     TPLinkXDRClient,
     TPLinkDecoClient,
     TplinkC80Router,
@@ -83,11 +84,11 @@ router = TplinkRouterProvider.get_client('http://192.168.0.1', 'password')
 # You may use client directly like
 # router = TplinkRouter('http://192.168.0.1', 'password')
 # You may also pass username if it is different and a logger to log errors as
-# router = TplinkRouter('http://192.168.0.1','password','admin2', Logger('test'))
+# router = TplinkRouter('http://192.168.0.1','password','admin2', logger=Logger('test'))
 # If you have the TP-link C5400X or similar, you can use the TplinkC5400XRouter class instead of the TplinkRouter class.
 # Remember that the password for this router is different, here you need to use the web encrypted password.
 # To get web encrypted password, read Web Encrypted Password section
-# router = TplinkC5400XRouter('http://192.168.0.1','WebEncryptedPassword', logger: Logger('test'))
+# router = TplinkC5400XRouter('http://192.168.0.1','WebEncryptedPassword', logger=Logger('test'))
 
 try:
     router.authorize()  # authorizing
@@ -202,6 +203,10 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 | packets_received | total packets received | int, None |
 | down_speed | download speed | int, None |
 | up_speed | upload speed | int, None |
+| tx_rate | transmit rate (Mbps) | int, None |
+| rx_rate | receive rate (Mbps) | int, None |
+| online_time | client online time (seconds) | float, None |
+| traffic_usage | total traffic usage (bytes) | int, None |
 | signal | Signal strength | int, None |
 | active | Is active device | bool |
 
@@ -315,6 +320,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer A7 V5
 - Archer A8 (1.0, 2.20)
 - Archer A9 V6
+- Archer A10 v1
 - Archer A20 v1.0
 - Archer AX10 v1.0
 - Archer AX12 v1.0
@@ -344,10 +350,10 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer BE550 v1.0
 - Archer BE800 v1.0
 - Archer BE805 v1.0
-- Archer BE3600 1.6
+- Archer BE3600 (v1.0, v1.6)
 - Archer C1200 (v1.0, v2.0)
 - Archer C2300 (v1.0, v2.0)
-- Archer C3200
+- Archer C3200 v1
 - Archer C6 (v2.0, v3.0, v3.20, 4.0)
 - Archer C6U v1.0
 - Archer C7 (v4.0, v5.0)
@@ -360,7 +366,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer MR200 (v2, v5, v5.3, v6.0)
 - Archer MR550 v1
 - Archer MR600 (v1, v2, v3)
-- Archer NX200 v2.0
+- Archer NX200 (v1.0, v2.0)
 - Archer VR400 (v2, v3)
 - Archer VR600 v3
 - Archer VR900v
@@ -387,6 +393,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - HX510 v1.0
 - M8550 v1
 - NE200-Outdoor v1.0
+- NE211-Outdoor v1.0
 - NX510v v1.0
 - NX600 v2.0
 - TD-W9960 (v1, V1.20)

{tplinkrouterc6u-5.14.0 → tplinkrouterc6u-5.15.0}/README.md

@@ -24,6 +24,7 @@ Python package for API access and management for TP-Link and Mercusys Routers. S
 from tplinkrouterc6u import (
     TplinkRouterProvider,
     TplinkRouterV1_11,
+    TplinkRouterSG, # For routers like Archer BE3600, Archer BE230
     TplinkRouter,
     TplinkC1200Router,
     TplinkC5400XRouter,
@@ -35,7 +36,7 @@ from tplinkrouterc6u import (
     TPLinkVR400v2Client,
     TPLinkEXClient, # Class for EX series routers which supports old firmwares with AES cipher CBC mode
     TPLinkEXClientGCM, # Class for EX series routers which supports AES cipher GCM mode
-    TPLinkRClient,
+    TPLinkRClient, # For routers like TL-R470GP-AC
     TPLinkXDRClient,
     TPLinkDecoClient,
     TplinkC80Router,
@@ -50,11 +51,11 @@ router = TplinkRouterProvider.get_client('http://192.168.0.1', 'password')
 # You may use client directly like
 # router = TplinkRouter('http://192.168.0.1', 'password')
 # You may also pass username if it is different and a logger to log errors as
-# router = TplinkRouter('http://192.168.0.1','password','admin2', Logger('test'))
+# router = TplinkRouter('http://192.168.0.1','password','admin2', logger=Logger('test'))
 # If you have the TP-link C5400X or similar, you can use the TplinkC5400XRouter class instead of the TplinkRouter class.
 # Remember that the password for this router is different, here you need to use the web encrypted password.
 # To get web encrypted password, read Web Encrypted Password section
-# router = TplinkC5400XRouter('http://192.168.0.1','WebEncryptedPassword', logger: Logger('test'))
+# router = TplinkC5400XRouter('http://192.168.0.1','WebEncryptedPassword', logger=Logger('test'))
 
 try:
     router.authorize()  # authorizing
@@ -169,6 +170,10 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 | packets_received | total packets received | int, None |
 | down_speed | download speed | int, None |
 | up_speed | upload speed | int, None |
+| tx_rate | transmit rate (Mbps) | int, None |
+| rx_rate | receive rate (Mbps) | int, None |
+| online_time | client online time (seconds) | float, None |
+| traffic_usage | total traffic usage (bytes) | int, None |
 | signal | Signal strength | int, None |
 | active | Is active device | bool |
 
@@ -282,6 +287,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer A7 V5
 - Archer A8 (1.0, 2.20)
 - Archer A9 V6
+- Archer A10 v1
 - Archer A20 v1.0
 - Archer AX10 v1.0
 - Archer AX12 v1.0
@@ -311,10 +317,10 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer BE550 v1.0
 - Archer BE800 v1.0
 - Archer BE805 v1.0
-- Archer BE3600 1.6
+- Archer BE3600 (v1.0, v1.6)
 - Archer C1200 (v1.0, v2.0)
 - Archer C2300 (v1.0, v2.0)
-- Archer C3200
+- Archer C3200 v1
 - Archer C6 (v2.0, v3.0, v3.20, 4.0)
 - Archer C6U v1.0
 - Archer C7 (v4.0, v5.0)
@@ -327,7 +333,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer MR200 (v2, v5, v5.3, v6.0)
 - Archer MR550 v1
 - Archer MR600 (v1, v2, v3)
-- Archer NX200 v2.0
+- Archer NX200 (v1.0, v2.0)
 - Archer VR400 (v2, v3)
 - Archer VR600 v3
 - Archer VR900v
@@ -354,6 +360,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - HX510 v1.0
 - M8550 v1
 - NE200-Outdoor v1.0
+- NE211-Outdoor v1.0
 - NX510v v1.0
 - NX600 v2.0
 - TD-W9960 (v1, V1.20)

{tplinkrouterc6u-5.14.0 → tplinkrouterc6u-5.15.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tplinkrouterc6u",
-    version="5.14.0",
+    version="5.15.0",
     author="Alex Erohin",
     author_email="alexanderErohin@yandex.ru",
     description="TP-Link Router API (supports also Mercusys Router)",

{tplinkrouterc6u-5.14.0 → tplinkrouterc6u-5.15.0}/test/test_client_c6u.py

@@ -603,6 +603,143 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.devices[6].packets_sent, 134815)
         self.assertEqual(status.devices[6].packets_received, 2953078)
 
+    def test_get_status_with_game_accelerator_fallback_values(self) -> None:
+        response_status = '''
+    {
+        "success": true,
+        "data": {
+            "lan_macaddr": "06:e6:97:9e:23:f5",
+            "access_devices_wireless_host": [
+                {
+                    "wire_type": "5G",
+                    "macaddr": "f4:aa:bb:cc:dd:ee",
+                    "ipaddr": "192.168.1.110",
+                    "hostname": "CLIENT1"
+                }
+            ]
+        }
+    }
+'''
+        response_game_accelerator = '''
+  {
+      "data": [
+          {"mac": "f4:aa:bb:cc:dd:ee", "deviceTag":"5G", "isGuest":false, "ip":"192.168.1.110",
+          "deviceName":"CLIENT1", "downSpeed":112458738, "upSpeed":704111,
+          "txRate":1441170, "rxRate":1080880, "online_time":34990.64,
+          "trafficUsed":19594852347, "signal": -60},
+          {"deviceName":"no-mac-device"}
+      ],
+      "timeout": false,
+      "success": true
+  }
+'''
+        response_stats = '''
+  {
+      "data": [],
+      "timeout": false,
+      "success": true,
+      "operator": "load"
+  }
+'''
+
+        router_class = self.router_class
+        game_accelerator_path = self.game_accelerator_path
+
+        class TPLinkRouterTest(router_class):
+            def request(self, path: str, data: str,
+                        ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
+                if path == 'admin/status?form=all&operation=read':
+                    return loads(response_status)['data']
+                elif path == game_accelerator_path:
+                    return loads(response_game_accelerator)['data']
+                elif path == 'admin/wireless?form=statistics':
+                    return loads(response_stats)['data']
+                raise ClientException()
+
+        client = TPLinkRouterTest('', '')
+        status = client.get_status()
+
+        self.assertEqual(len(status.devices), 1)
+        device = status.devices[0]
+        self.assertEqual(device.macaddr, 'F4-AA-BB-CC-DD-EE')
+        self.assertEqual(device.ipaddr, '192.168.1.110')
+        self.assertEqual(device.hostname, 'CLIENT1')
+        self.assertEqual(device.down_speed, 112458738)
+        self.assertEqual(device.up_speed, 704111)
+        self.assertEqual(device.tx_rate, 1441170)
+        self.assertEqual(device.rx_rate, 1080880)
+        self.assertEqual(device.online_time, 34990.64)
+        self.assertEqual(device.traffic_usage, 19594852347)
+        self.assertEqual(device.signal, -60)
+
+    def test_get_status_with_game_accelerator_alt_keys(self) -> None:
+        response_status = '''
+    {
+        "success": true,
+        "data": {
+            "lan_macaddr": "06:e6:97:9e:23:f5",
+            "access_devices_wireless_host": [
+                {
+                    "wire_type": "5G",
+                    "macaddr": "aa:bb:cc:dd:ee:ff",
+                    "ipaddr": "192.168.1.120",
+                    "hostname": "CLIENT2"
+                }
+            ]
+        }
+    }
+'''
+        response_game_accelerator = '''
+  {
+      "data": [
+          {"mac": "aa:bb:cc:dd:ee:ff", "deviceTag":"5G", "isGuest":false, "ip":"192.168.1.120",
+          "deviceName":"CLIENT2", "downloadSpeed":12345, "uploadSpeed":2345,
+          "txrate":300, "rxrate":400, "onlineTime":123.45,
+          "trafficUsage":987654321, "signal": -55}
+      ],
+      "timeout": false,
+      "success": true
+  }
+'''
+        response_stats = '''
+  {
+      "data": [],
+      "timeout": false,
+      "success": true,
+      "operator": "load"
+  }
+'''
+
+        router_class = self.router_class
+        game_accelerator_path = self.game_accelerator_path
+
+        class TPLinkRouterTest(router_class):
+            def request(self, path: str, data: str,
+                        ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
+                if path == 'admin/status?form=all&operation=read':
+                    return loads(response_status)['data']
+                elif path == game_accelerator_path:
+                    return loads(response_game_accelerator)['data']
+                elif path == 'admin/wireless?form=statistics':
+                    return loads(response_stats)['data']
+                raise ClientException()
+
+        client = TPLinkRouterTest('', '')
+        status = client.get_status()
+
+        self.assertEqual(len(status.devices), 1)
+        device = status.devices[0]
+        self.assertEqual(device.macaddr, 'AA-BB-CC-DD-EE-FF')
+        self.assertEqual(device.ipaddr, '192.168.1.120')
+        self.assertEqual(device.hostname, 'CLIENT2')
+        self.assertEqual(device.down_speed, 12345)
+        self.assertEqual(device.up_speed, 2345)
+        self.assertEqual(device.tx_rate, 300)
+        self.assertEqual(device.rx_rate, 400)
+        self.assertEqual(device.online_time, 123.45)
+        self.assertEqual(device.traffic_usage, 987654321)
+        self.assertEqual(device.signal, -55)
+
     def test_get_status_with_perf_request(self) -> None:
         response_status = '''
     {

{tplinkrouterc6u-5.14.0 → tplinkrouterc6u-5.15.0}/test/test_client_ex.py

@@ -6,6 +6,7 @@ from tplinkrouterc6u import (
     Connection,
     Firmware,
     Status,
+    LTEStatus,
     Device,
     IPv4Reservation,
     IPv4DHCPLease,
@@ -705,6 +706,76 @@ class TestTPLinkEXClient(TestCase):
         self.assertEqual(check_data, '{"data":{"stack":"0,0,0,0,0,0","pstack":"0,0,0,0,0,0",'
                                      '"enable":"1"},"operation":"so","oid":"DEV2_OPENVPN"}')
 
+    def test_get_lte_status(self) -> None:
+
+        DEV2_LTE_LINK_CFG = ('{"data":{"enable":"1","wispConnStat":"0","networkType":"3","endcStatus":"-1",'
+                             '"connectedBand":"B3","availableBand":"B3","roamingStatus":"0","connectStatus":"4",'
+                             '"simStatus":"3","simCardNumber":"0","simCardType":"0","simCardState":"1",'
+                             '"simCardImsi":"0","simCardGid1":"010XXXFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",'
+                             '"dataSwitch":"1","roamSwitch":"0","prefNet":"3","timeFactroyFlag":"0",'
+                             '"wlanFactoryFlag":"0","smsScEnable":"0","smsScAddress":"491712121212",'
+                             '"signalStrength":"0","ipv4":"10.171.53.12","dns1v4":"62.109.121.17",'
+                             '"dns2v4":"62.109.121.18","ipv4_mtu":"1500","ipv6":"2a02:3036:282:7376",'
+                             '"ipv6PrefixLen":"64","dns1v6":"2a02:3018:0","dns2v6":"2a02:3018:0:40ff::bbbb",'
+                             '"ipv6_mtu":"1500","ifName":"rmnet_data0","gatewayV4":"10.171.53.2",'
+                             '"gatewayV6":"fe80::4d7c:fa07","netmask":"255.255.255.248","__indexPrimaryServingCell":"",'
+                             '"stack":"1,0,0,0,0,0"},"operation":"go","oid":"DEV2_LTE_LINK_CFG","success":true}')
+        DEV2_XTP_LTE_INTF_CFG = ('{"data":{"enable":"1","freeDurationEnabled":"0","freeDurationWhenRoaming":"0",'
+                                 '"freeDurationStart":"00:00","freeDurationEnd":"00:00","cfgModified":"0",'
+                                 '"dailyFlow":"294896362.0000","currentDate":"1770073200","ledLimitReached":"1",'
+                                 '"allowDialOnce":"0","enableDataLimit":"0","autoDisconnect":"1","dataLimit":"0",'
+                                 '"limitType":"0","limitation":"0","warningPercent":"90","warnSimNumber":"",'
+                                 '"needSmsTip":"0","enablePaymentDay":"1","nextDue":"1772233200","paymentDay":"28",'
+                                 '"adjustStatistics":"-1","curStatistics":"0","curConnTime":"1545647",'
+                                 '"totalStatistics":"38819729967.0000","totalConnTime":"84667","rxFlow":"0",'
+                                 '"txFlow":"0","curRxSpeed":"31921","curTxSpeed":"28242","plmnLock":"0",'
+                                 '"enablePushNotification":"0","stack":"1,0,0,0,0,0"},"operation":"go",'
+                                 '"oid":"DEV2_XTP_LTE_INTF_CFG","success":true}')
+        DEV2_LTE_NET_STATUS = ('{"data":{"ussdSessionStatus":"0","ussdStatus":"0","smsUnreadCount":"0",'
+                               '"smsSendCause":"0","smsSendResult":"3","rfSwitch":"1","sigLevel":"0","connStat":"4",'
+                               '"roamStat":"0","regStat":"1","netType":"3","srvStat":"2","rfInfoChannel":"0",'
+                               '"rfInfoBand":"0","rfInfoIf":"0","rfInfoRat":"0","rfInfoRssi":"0","rfInfoRsrp":"0",'
+                               '"rfInfoRsrq":"0","rfInfoSnr":"0","rfInfoEcio":"0","region":"","callStatus":"0",'
+                               '"stack":"1,0,0,0,0,0"},"operation":"go","oid":"DEV2_LTE_NET_STATUS","success":true}')
+        DEV2_LTE_PROF_STAT = ('{"data":{"activeProfType":"0","activeProfIndex":"0","spn":"","ispWhich":"0",'
+                              '"ispCount":"3","ispMnc":"3","ispMcc":"262","ispName":"O2 2025","usrWhich":"0",'
+                              '"usrCount":"1","usrMnc":"3","usrMcc":"262","stack":"1,0,0,0,0,0"},"operation":"go",'
+                              '"oid":"DEV2_LTE_PROF_STAT","success":true}')
+
+        class TPLinkEXClientTest(TPLinkEXClient):
+            self._token = True
+
+            def _request(self, url, method='POST', data_str=None, encrypt=False):
+                if 'DEV2_LTE_LINK_CFG' in data_str:
+                    return 200, DEV2_LTE_LINK_CFG
+                elif 'DEV2_XTP_LTE_INTF_CFG' in data_str:
+                    return 200, DEV2_XTP_LTE_INTF_CFG
+                elif 'DEV2_LTE_NET_STATUS' in data_str:
+                    return 200, DEV2_LTE_NET_STATUS
+                elif 'DEV2_LTE_PROF_STAT' in data_str:
+                    return 200, DEV2_LTE_PROF_STAT
+                raise ClientException()
+
+        client = TPLinkEXClientTest('', '')
+        status = client.get_lte_status()
+
+        self.assertIsInstance(status, LTEStatus)
+
+        self.assertIsInstance(status, LTEStatus)
+        self.assertEqual(status.enable, 1)
+        self.assertEqual(status.connect_status, 4)
+        self.assertEqual(status.network_type, 3)
+        self.assertEqual(status.sim_status, 3)
+        self.assertEqual(status.sig_level, 0)
+        self.assertEqual(status.total_statistics, 38819729967)
+        self.assertEqual(status.cur_rx_speed, 31921)
+        self.assertEqual(status.cur_tx_speed, 28242)
+        self.assertEqual(status.sms_unread_count, 0)
+        self.assertEqual(status.rsrp, 0)
+        self.assertEqual(status.rsrq, 0)
+        self.assertEqual(status.snr, 0)
+        self.assertEqual(status.isp_name, 'O2 2025')
+
 
 if __name__ == '__main__':
     main()

tplinkrouterc6u-5.15.0/test/test_client_sg.py

@@ -0,0 +1,217 @@
+import json
+from hashlib import sha256
+from unittest import main, TestCase
+from unittest.mock import patch, Mock
+
+from tplinkrouterc6u import TplinkRouterSG, ClientException
+from test_client_c6u import TestTPLinkClient
+
+
+class TestTPLinkClientSG(TestTPLinkClient):
+    """Inherits get_status and other tests from TestTPLinkClient."""
+
+    router_class = TplinkRouterSG
+    game_accelerator_path = 'admin/smart_network?form=game_accelerator&operation=loadDevice'
+    openvpn_config_path = 'admin/openvpn?form=config&operation=read'
+    pptpd_config_path = 'admin/pptpd?form=config&operation=read'
+    vpn_uses_data_param = False
+
+
+class TestTplinkRouterSGUnit(TestCase):
+    """Unit tests specific to TplinkRouterSG authentication and encryption."""
+
+    def test_supports_password_too_long(self) -> None:
+        long_password = 'a' * 126
+        client = TplinkRouterSG('http://192.168.0.1', long_password)
+        self.assertFalse(client.supports())
+
+    @patch('tplinkrouterc6u.client.sg.post')
+    def test_check_sg_certification_match(self, mock_post: Mock) -> None:
+        response = Mock()
+        response.json.return_value = {
+            'data': {
+                'certification': ['SG CLS L1 STAGE2', 'OTHER']
+            }
+        }
+        mock_post.return_value = response
+
+        client = TplinkRouterSG('http://192.168.0.1', 'testpassword')
+        result = client._check_sg_certification()
+
+        self.assertTrue(result)
+        self.assertEqual(mock_post.call_count, 1)
+        call_args = mock_post.call_args
+        self.assertIn('device_config', call_args[0][0])
+
+    @patch('tplinkrouterc6u.client.sg.post')
+    def test_check_sg_certification_no_match(self, mock_post: Mock) -> None:
+        response = Mock()
+        response.json.return_value = {
+            'data': {
+                'certification': ['SOME_OTHER_CERT']
+            }
+        }
+        mock_post.return_value = response
+
+        client = TplinkRouterSG('http://192.168.0.1', 'testpassword')
+        result = client._check_sg_certification()
+
+        self.assertFalse(result)
+
+    @patch('tplinkrouterc6u.client.sg.post')
+    def test_authorize_success(self, mock_post: Mock) -> None:
+        pwd_keys_response = Mock()
+        pwd_keys_response.json.return_value = {
+            'data': {
+                'password': ['mock_pwd_nn', '010001']
+            }
+        }
+
+        auth_keys_response = Mock()
+        auth_keys_response.json.return_value = {
+            'data': {
+                'seq': 100,
+                'key': ['mock_auth_nn', '010001']
+            }
+        }
+
+        login_response = Mock()
+        login_response.json.return_value = {'data': 'encrypted_login_blob'}
+        login_response.headers = {
+            'set-cookie': 'sysauth=test_sysauth_value; path=/'
+        }
+        login_response.text = 'mock response text'
+
+        mock_post.side_effect = [
+            pwd_keys_response,
+            auth_keys_response,
+            login_response,
+        ]
+
+        client = TplinkRouterSG('http://192.168.0.1', 'testpassword')
+
+        login_result = json.dumps({
+            'success': True,
+            'data': {'stok': 'test_stok_12345'}
+        })
+        with patch.object(client, '_rsa_v15_encrypt', return_value='encrypted_pwd_hex'), \
+             patch.object(client, '_aes_encrypt', return_value='encrypted_data_b64'), \
+             patch.object(client, '_build_login_signature', return_value='mock_sign'), \
+             patch.object(client, '_aes_decrypt', return_value=login_result):
+            client.authorize()
+
+        self.assertTrue(client._logged)
+        self.assertEqual(client._stok, 'test_stok_12345')
+        self.assertEqual(client._sysauth, 'test_sysauth_value')
+        self.assertEqual(mock_post.call_count, 3)
+
+        first_call = mock_post.call_args_list[0]
+        self.assertIn('login?form=keys', first_call[0][0])
+
+        second_call = mock_post.call_args_list[1]
+        self.assertIn('login?form=auth', second_call[0][0])
+
+        third_call = mock_post.call_args_list[2]
+        self.assertIn('login?form=login', third_call[0][0])
+
+    @patch('tplinkrouterc6u.client.sg.post')
+    def test_authorize_failure(self, mock_post: Mock) -> None:
+        pwd_keys_response = Mock()
+        pwd_keys_response.json.return_value = {
+            'data': {
+                'password': ['mock_pwd_nn', '010001']
+            }
+        }
+
+        auth_keys_response = Mock()
+        auth_keys_response.json.return_value = {
+            'data': {
+                'seq': 100,
+                'key': ['mock_auth_nn', '010001']
+            }
+        }
+
+        login_response = Mock()
+        login_response.json.return_value = {'data': 'encrypted_login_blob'}
+        login_response.headers = {}
+        login_response.text = 'mock error response'
+
+        mock_post.side_effect = [
+            pwd_keys_response,
+            auth_keys_response,
+            login_response,
+        ]
+
+        client = TplinkRouterSG('http://192.168.0.1', 'wrongpassword')
+
+        login_result = json.dumps({
+            'success': False,
+            'data': {'errorcode': 'invalid password'}
+        })
+        with patch.object(client, '_rsa_v15_encrypt', return_value='encrypted_pwd_hex'), \
+             patch.object(client, '_aes_encrypt', return_value='encrypted_data_b64'), \
+             patch.object(client, '_build_login_signature', return_value='mock_sign'), \
+             patch.object(client, '_aes_decrypt', return_value=login_result):
+            with self.assertRaises(ClientException) as context:
+                client.authorize()
+
+        self.assertIn('Login failed', str(context.exception))
+        self.assertFalse(client._logged)
+
+    def test_authorize_uses_username(self) -> None:
+        """Verify SHA256 hash uses self.username, not hardcoded 'admin'."""
+        client = TplinkRouterSG(
+            'http://192.168.0.1', 'testpassword', username='customuser')
+
+        expected_hash = sha256(
+            ('customuser' + 'testpassword').encode()).hexdigest()
+        admin_hash = sha256(
+            ('admin' + 'testpassword').encode()).hexdigest()
+
+        # Simulate the hash computation that happens in authorize()
+        client._hash = sha256(
+            (client.username + client.password).encode()).hexdigest()
+
+        self.assertEqual(client._hash, expected_hash)
+        self.assertNotEqual(client._hash, admin_hash)
+
+    @patch('tplinkrouterc6u.client.sg.post')
+    def test_request_hmac_signature(self, mock_post: Mock) -> None:
+        """Verify non-login requests use HMAC-SHA256 signature."""
+        client = TplinkRouterSG('http://192.168.0.1', 'testpassword')
+        client._logged = True
+        client._stok = 'test_stok'
+        client._sysauth = 'test_sysauth'
+        client._aes_key = '1234567890123456'
+        client._aes_iv = '6543210987654321'
+        client._hash = 'fakehash'
+        client._seq = 100
+
+        response = Mock()
+        decrypted_data = json.dumps({
+            'success': True,
+            'data': {'key': 'value'}
+        })
+        response.json.return_value = {'data': 'encrypted'}
+
+        mock_post.return_value = response
+
+        with patch.object(
+            client, '_aes_decrypt', return_value=decrypted_data
+        ):
+            result = client.request(
+                'admin/status?form=all', 'operation=read')
+
+        self.assertEqual(result, {'key': 'value'})
+
+        call_kwargs = mock_post.call_args
+        body = call_kwargs[1]['data']
+        self.assertTrue(body.startswith('sign='))
+        self.assertIn('&data=', body)
+
+        # Hash should have been updated to SHA256 of the encrypted data
+        self.assertNotEqual(client._hash, 'fakehash')
+
+
+if __name__ == '__main__':
+    main()

{tplinkrouterc6u-5.14.0 → tplinkrouterc6u-5.15.0}/tplinkrouterc6u/__init__.py

@@ -1,4 +1,5 @@
 from tplinkrouterc6u.client.c6u import TplinkRouter, TplinkRouterV1_11
+from tplinkrouterc6u.client.sg import TplinkRouterSG
 from tplinkrouterc6u.client.deco import TPLinkDecoClient
 from tplinkrouterc6u.client_abstract import AbstractRouter
 from tplinkrouterc6u.client.mr import TPLinkMRClient, TPLinkMRClientGCM