tplinkrouterc6u 4.2.2__py3-none-any.whl → 5.0.0__py3-none-any.whl

test/test_client_deco.py

@@ -71,7 +71,7 @@ class TestTPLinkDecoClient(TestCase):
                 "online": true, "name": "d2lyZWxlc3M0", "enable_priority": false, "remain_time": 0, "owner_id": "",
                 "client_type": "other", "interface": "guest"},
         {"mac": "56:32:c3:de:ce:f0", "up_speed": 3, "down_speed": 1, "wire_type": "wireless", "access_host": "1",
-                "connection_type": "band2_4", "space_id": "1", "ip": "192.168.68.105", "client_mesh": true,
+                "connection_type": "band2_4", "space_id": "1", "ip": "UNKNOWN", "client_mesh": true,
                 "online": true, "name": "d2lyZWxlc3M1", "enable_priority": false, "remain_time": 0, "owner_id": "",
                 "client_type": "other", "interface": "guest"}
 ]}, "error_code": 0}
@@ -150,7 +150,7 @@ class TestTPLinkDecoClient(TestCase):
         self.assertIsInstance(status.devices[4], Device)
         self.assertEqual(status.devices[4].type, Connection.GUEST_2G)
         self.assertEqual(status.devices[4].macaddr, '56-32-C3-DE-CE-F0')
-        self.assertEqual(status.devices[4].ipaddr, '192.168.68.105')
+        self.assertEqual(status.devices[4].ipaddr, '0.0.0.0')
         self.assertEqual(status.devices[4].hostname, 'wireless5')
         self.assertEqual(status.devices[4].packets_sent, None)
         self.assertEqual(status.devices[4].packets_received, None)

tplinkrouterc6u/__init__.py

@@ -6,7 +6,7 @@ from tplinkrouterc6u.client import (
     AbstractRouter,
     TPLinkDecoClient,
 )
-from tplinkrouterc6u.enum import Connection
+from tplinkrouterc6u.package_enum import Connection
 from tplinkrouterc6u.dataclass import (
     Firmware,
     Status,

tplinkrouterc6u/client.py

@@ -10,8 +10,9 @@ from datetime import timedelta
 from macaddress import EUI48
 from ipaddress import IPv4Address
 from logging import Logger
+from tplinkrouterc6u.helper import get_ip
 from tplinkrouterc6u.encryption import EncryptionWrapper, EncryptionWrapperMR
-from tplinkrouterc6u.enum import Connection
+from tplinkrouterc6u.package_enum import Connection
 from tplinkrouterc6u.dataclass import Firmware, Status, Device, IPv4Reservation, IPv4DHCPLease, IPv4Status
 from tplinkrouterc6u.exception import ClientException, ClientError
 from abc import ABC, abstractmethod
@@ -353,15 +354,9 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
 
         devices = {}
 
-        def _getIP(ip: str) -> IPv4Address:
-            try:
-                return IPv4Address(ip)
-            except Exception:
-                return IPv4Address('0.0.0.0')
-
         def _add_device(conn: Connection, item: dict) -> None:
             devices[item['macaddr']] = Device(conn, EUI48(item['macaddr']),
-                                              _getIP(item['ipaddr']),
+                                              get_ip(item['ipaddr']),
                                               item['hostname'])
 
         for item in data.get('access_devices_wired', []):
@@ -387,7 +382,7 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
             for item in smart_network:
                 if item['mac'] not in devices:
                     conn = self._map_wire_type(item.get('deviceTag'), not item.get('isGuest'))
-                    devices[item['mac']] = Device(conn, EUI48(item['mac']), _getIP(item['ip']),
+                    devices[item['mac']] = Device(conn, EUI48(item['mac']), get_ip(item['ip']),
                                                   item['deviceName'])
                     if conn.is_iot():
                         if status.iot_clients_total is None:
@@ -585,10 +580,9 @@ class TPLinkDecoClient(TplinkEncryption, AbstractRouter):
                     status.iot_clients_total = 0
                 status.iot_clients_total += 1
 
-            ip = item['ip'] if item.get('ip') else '0.0.0.0'
             device = Device(conn,
                             EUI48(item['mac']),
-                            IPv4Address(ip),
+                            get_ip(item.get('ip', '0.0.0.0')),
                             b64decode(item['name']).decode())
             device.down_speed = item.get('down_speed')
             device.up_speed = item.get('up_speed')
@@ -689,36 +683,100 @@ class TplinkC6V4Router(AbstractRouter):
 
 
 class TplinkC1200Router(TplinkBaseRouter):
+    username = ''
+    password = ''
+    _pwdNN = ''
+    _pwdEE = ''
+    _encryption = EncryptionWrapper()
+
     def supports(self) -> bool:
-        return True
+        if len(self.password) > 125:
+            return False
+
+        try:
+            self._request_pwd()
+            return True
+        except ClientException:
+            return False
 
     def authorize(self) -> None:
-        if len(self.password) < 200:
-            raise Exception('You need to use web encrypted password instead. Check the documentation!')
+        if self._pwdNN == '':
+            self._request_pwd()
 
-        url = '{}/cgi-bin/luci/;stok=/login?form=login'.format(self.host)
+        response = self._try_login()
+
+        is_valid_json = False
+        try:
+            response.json()
+            is_valid_json = True
+        except BaseException:
+            """Ignore"""
+
+        if is_valid_json is False or response.status_code == 403:
+            self._logged = False
+            self._request_pwd()
+            response = self._try_login()
+
+        data = response.text
+        try:
+            data = response.json()
+            data = self._decrypt_response(data)
+
+            self._stok = data[self._data_block]['stok']
+            regex_result = search(
+                'sysauth=(.*);', response.headers['set-cookie'])
+            self._sysauth = regex_result.group(1)
+            self._logged = True
+
+        except Exception as e:
+            error = ("TplinkRouter - C1200 - {} - Cannot authorize! Error - {}; Response - {}"
+                     .format(self.__class__.__name__, e, data))
+            if self._logger:
+                self._logger.error(error)
+            raise ClientException(error)
 
+    def _request_pwd(self) -> None:
+        url = '{}/cgi-bin/luci/;stok=/login?form=login'.format(self.host)
         response = post(
-            url,
-            params={'operation': 'login', 'username': self.username, 'password': self.password},
-            headers=self._headers_login,
+            url, params={'operation': 'read'},
             timeout=self.timeout,
             verify=self._verify_ssl,
         )
 
         try:
-            self._stok = response.json().get('data').get('stok')
-            regex_result = search('sysauth=(.*);', response.headers['set-cookie'])
-            self._sysauth = regex_result.group(1)
-            self._logged = True
-            self._smart_network = False
+            data = response.json()
+
+            args = data[self._data_block]['password']
+
+            self._pwdNN = args[0]
+            self._pwdEE = args[1]
 
         except Exception as e:
-            error = "TplinkRouter - C1200 - Cannot authorize! Error - {}; Response - {}".format(e, response.text)
+            error = ('TplinkRouter - C1200 - {} - Unknown error for pwd! Error - {}; Response - {}'
+                     .format(self.__class__.__name__, e, response.text))
             if self._logger:
                 self._logger.error(error)
             raise ClientException(error)
 
+    def _try_login(self) -> Response:
+        url = '{}/cgi-bin/luci/;stok=/login?form=login'.format(self.host)
+
+        crypted_pwd = self._encryption.encrypt_password_C1200(self.password, self._pwdNN, self._pwdEE)
+
+        body = self._get_login_data(crypted_pwd)
+
+        return post(
+            url,
+            data=body,
+            headers=self._headers_login,
+            timeout=self.timeout,
+            verify=self._verify_ssl,
+        )
+
+    @staticmethod
+    def _get_login_data(crypted_pwd: str) -> str:
+        return 'operation=login&password={}'.format(crypted_pwd)
+
     def set_led(self, enable: bool) -> None:
         current_state = (self.request('admin/ledgeneral?form=setting&operation=read', 'operation=read')
                          .get('enable', 'off') == 'on')
@@ -1131,7 +1189,7 @@ class TPLinkMRClient(AbstractRouter):
         lines = response.split('\n')
         for line in lines:
             if line.startswith('['):
-                regexp = search('\[\d,\d,\d,\d,\d,\d\](\d)', line)
+                regexp = search(r'\[\d,\d,\d,\d,\d,\d\](\d)', line)
                 if regexp is not None:
                     obj = {}
                     index = regexp.group(1)
@@ -1321,7 +1379,7 @@ class TPLinkMRClient(AbstractRouter):
         Return value:
             return code (int)
         '''
-        result = search('\$\.ret=(.*);', response_text)
+        result = search(r'\$\.ret=(.*);', response_text)
         assert result is not None
         assert result.group(1).isnumeric()
 
@@ -1346,4 +1404,7 @@ class TplinkRouterProvider:
             if router.supports():
                 return router
 
-        return None
+        raise ClientException(('Your router is not supported. Please add your router support to '
+                               'https://github.com/AlexandrErohin/TP-Link-Archer-C6U'
+                               'by implementing methods for AbstractRouter class'
+                               ))

tplinkrouterc6u/dataclass.py

@@ -1,7 +1,7 @@
 from macaddress import EUI48
 from ipaddress import IPv4Address
 from dataclasses import dataclass
-from tplinkrouterc6u.enum import Connection
+from tplinkrouterc6u.package_enum import Connection
 
 
 @dataclass

tplinkrouterc6u/encryption.py

@@ -64,6 +64,24 @@ class EncryptionWrapper:
     def _get_aes_string(self) -> str:
         return 'k={}&i={}'.format(self._key.decode(), self._iv.decode())
 
+    @staticmethod
+    def encrypt_password_C1200(password: str, nn: str, ee: str) -> str:
+        n = int(nn, 16)
+        e = int(ee, 16)
+        key = RSA.construct((n, e))
+
+        modulus_byte_length = (key.size_in_bits() + 7) // 8
+        password_bytes = password.encode('utf-8')
+        if len(password_bytes) > modulus_byte_length:
+            raise ValueError("Password too long for the RSA key size.")
+
+        padded_password = password_bytes.ljust(modulus_byte_length, b'\x00')
+        message_int = bytes_to_long(padded_password)
+        encrypted_int = pow(message_int, e, n)
+        encrypted_hex = format(encrypted_int, 'x').zfill(256)
+
+        return encrypted_hex
+
 
 class EncryptionWrapperMR:
     RSA_USE_PKCS_V1_5 = False

tplinkrouterc6u/helper.py

@@ -0,0 +1,8 @@
+from ipaddress import IPv4Address
+
+
+def get_ip(ip: str) -> IPv4Address:
+    try:
+        return IPv4Address(ip)
+    except Exception:
+        return IPv4Address('0.0.0.0')

{tplinkrouterc6u-4.2.2.dist-info → tplinkrouterc6u-5.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 4.2.2
+Version: 5.0.0
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -53,10 +53,6 @@ router = TplinkRouterProvider.get_client('http://192.168.0.1', 'password')
 # 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'))
-# If you have the TP-link C1200 V2 or similar, you can use the TplinkC1200Router 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 = TplinkC1200Router('http://192.168.0.1','WebEncryptedPassword', Logger('test'))
 
 try:
     router.authorize()  # authorizing
@@ -86,16 +82,6 @@ finally:
 The TP-Link Web Interface only supports upto 1 user logged in at a time (for security reasons, apparently).
 So before action you need to authorize and after logout
 
-### <a id="encrypted_pass">Web Encrypted Password</a>
-If you got exception - `You need to use web encrypted password instead. Check the documentation!`
-or you have TP-link C1200 V2 or similar router you need to get web encrypted password by these actions:
-1. Go to the login page of your router. (default: 192.168.0.1).
-2. Type in the password you use to login into the password field.
-3. Click somewhere else on the page so that the password field is not selected anymore.
-4. Open the JavaScript console of your browser (usually by pressing F12 and then clicking on "Console").
-5. Type `document.getElementById("login-password").value;`
-6. Copy the returned value as password and use it.
-
 ## Functions
 | Function | Args | Description | Return |
 |---|---|---|---|
@@ -225,6 +211,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 ## <a id="supports">Supported routers</a>
 ### Fully tested Hardware Versions
 - Archer A7 V5
+- Archer A9 V6
 - Archer AX10 v1.0
 - Archer AX12 v1.0
 - Archer AX20 v1.0
@@ -237,6 +224,7 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX72 V1
 - Archer AX73 V1
 - Archer AX75 V1
+- Archer AX90 V1.20
 - Archer AXE75 V1
 - Archer AXE16000
 - Archer AX3000 V1
@@ -244,15 +232,15 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX11000 V1
 - Archer BE800 v1.0
 - Archer BE805 v1.0
-- Archer C1200 (v1.0, v2.0) (You need to use [web encrypted password](#encrypted_pass))
-- Archer C2300 v1.0 (You need to use [web encrypted password](#encrypted_pass))
+- Archer C1200 (v1.0, v2.0)
+- Archer C2300 v1.0
 - Archer C6 (v2.0, v3.0)
 - Archer C6U v1.0
 - Archer C7 (v4.0, v5.0)
 - Archer C5400X V1
 - Archer GX90 v1.0
 - Archer MR200 (v5, v5.3)
-- Archer MR600 (v1, v3)
+- Archer MR600 (v1, v2, v3)
 - Archer VR2100v v1
 - Archer VR900v
 - Deco M4 2.0
@@ -270,15 +258,14 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - TL-MR100 v2.0
 - TL-MR105
 - TL-MR6400 (v5, v5.3)
+- TL-MR6500v
 - TL-WA3001 v1.0
 
 ### Not fully tested Hardware Versions
 - AD7200 V2
 - Archer A6 (V2 and V3)
-- Archer A9 V6
 - Archer A10 (V1 and V2)
 - Archer A20 (V1, V3)
-- Archer C7 V4
 - Archer C8 (V3 and V4)
 - Archer C9 (V4 and V5)
 - Archer C59 V2

tplinkrouterc6u-5.0.0.dist-info/RECORD

@@ -0,0 +1,17 @@
+test/__init__.py,sha256=McQmUjeN3AwmwdS6QNfwGXXE77OKoPK852I2BM9XsrU,210
+test/test_client.py,sha256=8cK4qnheszu-zpUJqttKp5Z5WJXrQy1t_fMzMzNnmvw,30638
+test/test_client_c1200.py,sha256=O6NK9uXIEb_vks6lI3g7j6q8TYJ9MSDFYzGA_wOBhOA,4620
+test/test_client_deco.py,sha256=OqJ9e6_TcX60Ccqj_UH9AQ3Ty25hfdbtPvtzLnWpMn0,30464
+test/test_client_mr.py,sha256=znDA8PBxHOGKbZHzsyERbEEWjkP0U5KpV8Z-kaRnXIM,23046
+tplinkrouterc6u/__init__.py,sha256=EpcrPHORAk_m76WDHMLea_RzCPjqZYAs_774JZChLGs,410
+tplinkrouterc6u/client.py,sha256=CWWU_IXA33PADfxA3XEWeXGyDEonhPDaTlc4f3iMLq8,53434
+tplinkrouterc6u/dataclass.py,sha256=SuAOqKun_ThaeUEa8F9wi6qu4ucUatYMzebo39Kk10s,6617
+tplinkrouterc6u/encryption.py,sha256=4HelTxzN6esMfDZRBt3m8bwB9Nj_biKijnCnrGWPWKg,6228
+tplinkrouterc6u/exception.py,sha256=PUTPsadxiylQhIRUMfkN1RWXh07cHmdav9Pdgxs3Lmw,90
+tplinkrouterc6u/helper.py,sha256=mbPkS_9GfOYMxEIx-q-xLlupR0-m_MDgCWQgx8xxOA8,172
+tplinkrouterc6u/package_enum.py,sha256=bqmnu4gQMEntMCgsya2R7dRcrSJIDPWMj8vNN6JxeME,1382
+tplinkrouterc6u-5.0.0.dist-info/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
+tplinkrouterc6u-5.0.0.dist-info/METADATA,sha256=z8zgcEfcEO358npxVgWcDCDDuHsEoKtusw428SU_mt0,11859
+tplinkrouterc6u-5.0.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+tplinkrouterc6u-5.0.0.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
+tplinkrouterc6u-5.0.0.dist-info/RECORD,,

{tplinkrouterc6u-4.2.2.dist-info → tplinkrouterc6u-5.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tplinkrouterc6u-4.2.2.dist-info/RECORD

@@ -1,16 +0,0 @@
-test/__init__.py,sha256=McQmUjeN3AwmwdS6QNfwGXXE77OKoPK852I2BM9XsrU,210
-test/test_client.py,sha256=8cK4qnheszu-zpUJqttKp5Z5WJXrQy1t_fMzMzNnmvw,30638
-test/test_client_c1200.py,sha256=O6NK9uXIEb_vks6lI3g7j6q8TYJ9MSDFYzGA_wOBhOA,4620
-test/test_client_deco.py,sha256=8mo_9KEqVBsrazBHaGUdQTIsSvXcHtCT-l7MBxXSP3o,30478
-test/test_client_mr.py,sha256=znDA8PBxHOGKbZHzsyERbEEWjkP0U5KpV8Z-kaRnXIM,23046
-tplinkrouterc6u/__init__.py,sha256=CECjWGaoM8ABX3-95GUa4Xg9DCKzX2k8IprPg1fvnYw,402
-tplinkrouterc6u/client.py,sha256=7-S8FFD9ML5qHT0-7mzb-FQhmcmytNlB0J778235N4Q,51626
-tplinkrouterc6u/dataclass.py,sha256=VVLeWzH6_HYvjiw31aWisW5w8UTgiojWTgnQB7Tb5eM,6609
-tplinkrouterc6u/encryption.py,sha256=2InKlHLQSWkcI8yP8EIGSG-bGXft_KU-bplGjcoeE-k,5546
-tplinkrouterc6u/enum.py,sha256=bqmnu4gQMEntMCgsya2R7dRcrSJIDPWMj8vNN6JxeME,1382
-tplinkrouterc6u/exception.py,sha256=PUTPsadxiylQhIRUMfkN1RWXh07cHmdav9Pdgxs3Lmw,90
-tplinkrouterc6u-4.2.2.dist-info/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
-tplinkrouterc6u-4.2.2.dist-info/METADATA,sha256=50OdAco8AZW3sdxHol7OuMlVYU56h_cQiws-XjG6kFY,13036
-tplinkrouterc6u-4.2.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-tplinkrouterc6u-4.2.2.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
-tplinkrouterc6u-4.2.2.dist-info/RECORD,,