tplinkrouterc6u 5.10.2__tar.gz → 5.10.3__tar.gz

{tplinkrouterc6u-5.10.2 → tplinkrouterc6u-5.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.10.2
+Version: 5.10.3
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -343,7 +343,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer MR200 (v5, v5.3, v6.0)
 - Archer MR550 v1
 - Archer MR600 (v1, v2, v3)
-- Archer NX200
+- Archer NX200 v2.0
 - Archer VR400 v3
 - Archer VR600 v3
 - Archer VR900v

{tplinkrouterc6u-5.10.2 → tplinkrouterc6u-5.10.3}/README.md

@@ -311,7 +311,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer MR200 (v5, v5.3, v6.0)
 - Archer MR550 v1
 - Archer MR600 (v1, v2, v3)
-- Archer NX200
+- Archer NX200 v2.0
 - Archer VR400 v3
 - Archer VR600 v3
 - Archer VR900v

{tplinkrouterc6u-5.10.2 → tplinkrouterc6u-5.10.3}/setup.py

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

{tplinkrouterc6u-5.10.2 → tplinkrouterc6u-5.10.3}/tplinkrouterc6u/__init__.py

@@ -2,6 +2,7 @@ from tplinkrouterc6u.client.c6u import TplinkRouter
 from tplinkrouterc6u.client.deco import TPLinkDecoClient
 from tplinkrouterc6u.client_abstract import AbstractRouter
 from tplinkrouterc6u.client.mr import TPLinkMRClient
+from tplinkrouterc6u.client.mr200 import TPLinkMR200Client
 from tplinkrouterc6u.client.ex import TPLinkEXClient
 from tplinkrouterc6u.client.vr import TPLinkVRClient
 from tplinkrouterc6u.client.c80 import TplinkC80Router

tplinkrouterc6u-5.10.3/tplinkrouterc6u/client/mr200.py

@@ -0,0 +1,57 @@
+import base64
+from tplinkrouterc6u.common.exception import ClientException, AuthorizeError
+from tplinkrouterc6u.client.mr import TPLinkMRClient
+from Crypto.PublicKey import RSA
+from re import search
+from binascii import hexlify
+from Crypto.Cipher import PKCS1_v1_5
+
+
+class TPLinkMR200Client(TPLinkMRClient):
+
+    def authorize(self) -> None:
+        params = self.__get_params()
+
+        # Construct the RSA public key manually using modulus (n) and exponent (e)
+        n = int(params["nn"])
+        e = int(params["ee"])
+        pub_key = RSA.construct((n, e))
+
+        # Create an RSA cipher with PKCS#1 v1.5 padding (same as rsa.encrypt)
+        cipher = PKCS1_v1_5.new(pub_key)
+
+        # Encrypt username
+        rsa_username = cipher.encrypt(self.username.encode("utf-8"))
+        rsa_username_hex = hexlify(rsa_username).decode("utf-8")
+
+        # Encrypt password (after base64 encoding, as in your original code)
+        rsa_password = cipher.encrypt(base64.b64encode(self.password.encode("utf-8")))
+        rsa_password_hex = hexlify(rsa_password).decode("utf-8")
+
+        # Send login request
+        self.req.post(
+            f'{self.host}/cgi/login?UserName={rsa_username_hex}&Passwd={rsa_password_hex}&Action=1&LoginStatus=0'
+        )
+
+        # Try to extract token
+        r = self.req.get(self.host)
+        try:
+            self._token = search(r'var token="(.*)";', r.text).group(1)
+        except AttributeError:
+            raise AuthorizeError()
+
+    def __get_params(self, retry=False):
+        try:
+            r = self.req.get(f"{self.host}/cgi/getParm", timeout=5)
+            result = {}
+            for line in r.text.splitlines()[0:2]:
+                match = search(r"var (.*)=\"(.*)\"", line)
+                result[match.group(1)] = int(match.group(2), 16)
+            return result
+        except Exception:
+            if not retry:
+                return self.__get_params(True)
+            raise ClientException()
+
+    def _request(self, url, method='POST', data_str=None, encrypt=False, is_login=False):
+        return super()._request(url, method, data_str, False, is_login)

{tplinkrouterc6u-5.10.2 → tplinkrouterc6u-5.10.3}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.10.2
+Version: 5.10.3
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -343,7 +343,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer MR200 (v5, v5.3, v6.0)
 - Archer MR550 v1
 - Archer MR600 (v1, v2, v3)
-- Archer NX200
+- Archer NX200 v2.0
 - Archer VR400 v3
 - Archer VR600 v3
 - Archer VR900v

{tplinkrouterc6u-5.10.2 → tplinkrouterc6u-5.10.3}/tplinkrouterc6u.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ tplinkrouterc6u/client/c80.py
 tplinkrouterc6u/client/deco.py
 tplinkrouterc6u/client/ex.py
 tplinkrouterc6u/client/mr.py
+tplinkrouterc6u/client/mr200.py
 tplinkrouterc6u/client/vr.py
 tplinkrouterc6u/client/wdr.py
 tplinkrouterc6u/client/xdr.py