tplinkrouterc6u 5.12.0__tar.gz → 5.12.1__tar.gz

{tplinkrouterc6u-5.12.0 → tplinkrouterc6u-5.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.12.0
+Version: 5.12.1
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -323,6 +323,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX73 (V1, V2.0)
 - Archer AX75 V1
 - Archer AX90 V1.20
+- Archer AX95 v1.0
 - Archer AXE75 V1
 - Archer AXE5400 v1.0
 - Archer AXE16000
@@ -330,6 +331,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
+- Archer BE220 v1.0
 - Archer BE230 v1.0
 - Archer BE400 v1.0
 - Archer BE550 v1.0
@@ -391,6 +393,8 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - VX420-G2h v1.1
 - VX800v v1
 - XC220-G3v v2.30
+- RE305 4.0
+- RE315 1.0
 - RE330 v1
 ### <a id="mercusys">MERCUSYS routers</a>
 - AC10 1.20

{tplinkrouterc6u-5.12.0 → tplinkrouterc6u-5.12.1}/README.md

@@ -290,6 +290,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX73 (V1, V2.0)
 - Archer AX75 V1
 - Archer AX90 V1.20
+- Archer AX95 v1.0
 - Archer AXE75 V1
 - Archer AXE5400 v1.0
 - Archer AXE16000
@@ -297,6 +298,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
+- Archer BE220 v1.0
 - Archer BE230 v1.0
 - Archer BE400 v1.0
 - Archer BE550 v1.0
@@ -358,6 +360,8 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - VX420-G2h v1.1
 - VX800v v1
 - XC220-G3v v2.30
+- RE305 4.0
+- RE315 1.0
 - RE330 v1
 ### <a id="mercusys">MERCUSYS routers</a>
 - AC10 1.20

{tplinkrouterc6u-5.12.0 → tplinkrouterc6u-5.12.1}/setup.py

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

tplinkrouterc6u-5.12.1/test/test_client_mr_200.py

@@ -0,0 +1,43 @@
+from unittest import main, TestCase
+from unittest.mock import patch, MagicMock
+from requests import Session
+from tplinkrouterc6u import TPLinkMR200Client
+
+
+class TestTPLinkMR200Client(TestCase):
+    def setUp(self):
+        self.obj = TPLinkMR200Client('', '')
+
+    def test_supports_false(self):
+        responses = [
+            'var param1="0x1A"\nvar param2="0x2B"\nignored line\n',
+            '404',
+            'var nn="dfgdfg"\nvar ee="0x2B"\n'
+        ]
+
+        fake_responses = []
+        for text in responses:
+            r = MagicMock()
+            r.text = text
+            fake_responses.append(r)
+
+        with patch.object(Session, "get", side_effect=fake_responses):
+            for _ in range(len(fake_responses)):
+                result = self.obj.supports()
+                self.assertFalse(result)
+
+    def test_supports_true(self):
+        fake_response = MagicMock()
+        fake_response.text = (
+            'var nn="0x1A"\n'
+            'var ee="0x2B"\n'
+        )
+
+        with patch.object(Session, "get", return_value=fake_response):
+            result = self.obj.supports()
+
+        self.assertEqual(result, True)
+
+
+if __name__ == '__main__':
+    main()

{tplinkrouterc6u-5.12.0 → tplinkrouterc6u-5.12.1}/tplinkrouterc6u/client/mr200.py

@@ -22,12 +22,10 @@ class TPLinkMR200Client(TPLinkMRClient):
             return False
 
     def authorize(self) -> None:
-        params = self.__get_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))
+        pub_key = RSA.construct((self._nn, self._ee))
 
         # Create an RSA cipher with PKCS#1 v1.5 padding (same as rsa.encrypt)
         cipher = PKCS1_v1_5.new(pub_key)
@@ -116,7 +114,7 @@ class TPLinkMR200Client(TPLinkMRClient):
 
         return status
 
-    def __get_params(self, retry=False):
+    def __get_params(self, retry=False) -> None:
         self.req.headers = {'referer': f'{self.host}/', 'origin': self.host}
         try:
             r = self.req.get(f"{self.host}/cgi/getParm", timeout=5)
@@ -124,11 +122,13 @@ class TPLinkMR200Client(TPLinkMRClient):
             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:
+
+            self._nn = int(result["nn"])
+            self._ee = int(result["ee"])
+        except Exception as e:
             if not retry:
-                return self.__get_params(True)
-            raise ClientException()
+                self.__get_params(True)
+            raise ClientException(str(e))
 
     def req_act(self, acts: list):
         '''

{tplinkrouterc6u-5.12.0 → tplinkrouterc6u-5.12.1}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.12.0
+Version: 5.12.1
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -323,6 +323,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX73 (V1, V2.0)
 - Archer AX75 V1
 - Archer AX90 V1.20
+- Archer AX95 v1.0
 - Archer AXE75 V1
 - Archer AXE5400 v1.0
 - Archer AXE16000
@@ -330,6 +331,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
+- Archer BE220 v1.0
 - Archer BE230 v1.0
 - Archer BE400 v1.0
 - Archer BE550 v1.0
@@ -391,6 +393,8 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - VX420-G2h v1.1
 - VX800v v1
 - XC220-G3v v2.30
+- RE305 4.0
+- RE315 1.0
 - RE330 v1
 ### <a id="mercusys">MERCUSYS routers</a>
 - AC10 1.20

{tplinkrouterc6u-5.12.0 → tplinkrouterc6u-5.12.1}/tplinkrouterc6u.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ test/test_client_c80.py
 test/test_client_deco.py
 test/test_client_ex.py
 test/test_client_mr.py
+test/test_client_mr_200.py
 test/test_client_re330.py
 test/test_client_wdr.py
 test/test_client_xdr.py