tplinkrouterc6u 5.8.0__tar.gz → 5.9.0__tar.gz

{tplinkrouterc6u-5.8.0 → tplinkrouterc6u-5.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.8.0
+Version: 5.9.0
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -59,6 +59,7 @@ from tplinkrouterc6u import (
     TPLinkXDRClient,
     TPLinkDecoClient,
     TplinkC80Router,
+    TplinkWDRRouter,
     Connection
 )
 from logging import Logger
@@ -312,6 +313,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 BE400 v1.0
 - Archer BE550 v1.0
 - Archer BE800 v1.0
 - Archer BE805 v1.0
@@ -334,6 +336,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer VR1200v v1
 - Archer VR2100v v1
 - Archer VX1800v v1.0
+- BE11000 2.0
 - Deco M4 2.0
 - Deco M4R 2.0
 - Deco M5 v3
@@ -359,6 +362,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
 - TL-WDR3600 V1
+- VX420-G2h v1.1
 - XC220-G3v v2.30
 ### <a id="mercusys">MERCUSYS routers</a>
 - MR47BE v1.0

{tplinkrouterc6u-5.8.0 → tplinkrouterc6u-5.9.0}/README.md

@@ -27,6 +27,7 @@ from tplinkrouterc6u import (
     TPLinkXDRClient,
     TPLinkDecoClient,
     TplinkC80Router,
+    TplinkWDRRouter,
     Connection
 )
 from logging import Logger
@@ -280,6 +281,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 BE400 v1.0
 - Archer BE550 v1.0
 - Archer BE800 v1.0
 - Archer BE805 v1.0
@@ -302,6 +304,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer VR1200v v1
 - Archer VR2100v v1
 - Archer VX1800v v1.0
+- BE11000 2.0
 - Deco M4 2.0
 - Deco M4R 2.0
 - Deco M5 v3
@@ -327,6 +330,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
 - TL-WDR3600 V1
+- VX420-G2h v1.1
 - XC220-G3v v2.30
 ### <a id="mercusys">MERCUSYS routers</a>
 - MR47BE v1.0

{tplinkrouterc6u-5.8.0 → tplinkrouterc6u-5.9.0}/setup.py

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

{tplinkrouterc6u-5.8.0 → tplinkrouterc6u-5.9.0}/test/test_client_c1200.py

@@ -5,7 +5,6 @@ from tplinkrouterc6u import (
     Connection,
     ClientException,
 )
-from tplinkrouterc6u.common.package_enum import VPN
 
 
 class TestTPLinkC1200Client(TestCase):
@@ -201,13 +200,13 @@ class TestTPLinkC1200Client(TestCase):
                 ignore_response: bool = False,
                 ignore_errors: bool = False,
             ) -> dict | None:
-                if path == "/admin/openvpn?form=config&operation=read":
+                if path == "admin/openvpn?form=config&operation=read":
                     return loads(response_openvpn_read)
-                if path == "/admin/pptpd?form=config&operation=read":
+                if path == "admin/pptpd?form=config&operation=read":
                     return loads(response_pptp_read)
-                if path == "/admin/vpnconn?form=config&operation=list&vpntype=openvpn":
+                if path == "admin/vpnconn?form=config&operation=list&vpntype=openvpn":
                     return loads(respone_vpnconn_openvpn)
-                if path == "/admin/vpnconn?form=config&operation=list&vpntype=pptp":
+                if path == "admin/vpnconn?form=config&operation=list&vpntype=pptp":
                     return loads(respone_vpnconn_pptpvpn)
                 raise ClientException()
 
@@ -219,41 +218,6 @@ class TestTPLinkC1200Client(TestCase):
         self.assertEqual(vpn_status.openvpn_clients_total, 2)
         self.assertEqual(vpn_status.pptpvpn_clients_total, 3)
 
-    def test_set_vpn(self) -> None:
-        response_openvpn_read = """
-        {
-            "enabled": "on",
-            "proto": "udp",
-            "access": "home",
-            "cert_exist": true,
-            "mask": "255.255.255.0",
-            "port": "1194",
-            "serverip": "10.8.0.0"
-        }
-        """
-
-        class TPLinkRouterTest(TplinkC1200Router):
-            def request(
-                self,
-                path: str,
-                data: str,
-                ignore_response: bool = False,
-                ignore_errors: bool = False,
-            ) -> dict | None:
-                if path == "/admin/openvpn?form=config&operation=read":
-                    return loads(response_openvpn_read)
-                self.captured_path = path
-
-        client = TPLinkRouterTest("", "")
-        client.set_vpn(VPN.OPEN_VPN, True)
-
-        expected_path = (
-            "/admin/openvpn?form=config&operation=write&enabled=on"
-            "&proto=udp&access=home&cert_exist=True"
-            "&mask=255.255.255.0&port=1194&serverip=10.8.0.0"
-        )
-        self.assertEqual(client.captured_path, expected_path)
-
 
 if __name__ == "__main__":
     main()

{tplinkrouterc6u-5.8.0 → tplinkrouterc6u-5.9.0}/test/test_client_c6u.py

@@ -9,6 +9,7 @@ from tplinkrouterc6u import (
     IPv4Status,
     Device,
     ClientException,
+    VPN,
 )
 
 
@@ -768,6 +769,107 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(result.wan_ipv4_gateway, '0.0.0.0')
         self.assertEqual(result.lan_macaddr, '06-E6-97-9E-23-F5')
 
+    def test_vpn_status(self) -> None:
+        response_openvpn_read = """
+        {
+            "enabled": "on",
+            "proto": "udp",
+            "access": "home",
+            "cert_exist": true,
+            "mask": "255.255.255.0",
+            "port": "1194",
+            "serverip": "10.8.0.0"
+        }
+        """
+
+        response_pptp_read = """
+        {
+            "enabled": "off",
+            "unencrypted_access": "on",
+            "samba_access": "on",
+            "netbios_pass": "on",
+            "remoteip": "10.0.0.11-20"
+        }
+        """
+
+        respone_vpnconn_openvpn = """[
+            {"username": "admin", "remote_ip": "192.168.0.200", "ipaddr": "10.0.0.11",
+             "extra": "7450", "vpntype": "openvpn", "key": "7450"},
+            {"username": "admin", "remote_ip": "192.168.0.200", "ipaddr": "10.0.0.11",
+             "extra": "7450", "vpntype": "openvpn", "key": "7450"}
+        ]"""
+
+        respone_vpnconn_pptpvpn = """[
+            {"username": "admin", "remote_ip": "192.168.0.200", "ipaddr": "10.0.0.11",
+             "extra": "7450", "vpntype": "pptp", "key": "7450"},
+            {"username": "admin", "remote_ip": "192.168.0.200", "ipaddr": "10.0.0.11",
+             "extra": "7450", "vpntype": "pptp", "key": "7450"},
+            {"username": "admin", "remote_ip": "192.168.0.200", "ipaddr": "10.0.0.11",
+             "extra": "7450", "vpntype": "pptp", "key": "7450"}
+        ]"""
+
+        class TPLinkRouterTest(TplinkRouter):
+            def request(
+                self,
+                path: str,
+                data: str,
+                ignore_response: bool = False,
+                ignore_errors: bool = False,
+            ) -> dict | None:
+                if path == "admin/openvpn?form=config":
+                    return loads(response_openvpn_read)
+                if path == "admin/pptpd?form=config":
+                    return loads(response_pptp_read)
+                if path == "admin/vpnconn?form=config" and data == "operation=list&vpntype=openvpn":
+                    return loads(respone_vpnconn_openvpn)
+                if path == "admin/vpnconn?form=config" and data == "operation=list&vpntype=pptp":
+                    return loads(respone_vpnconn_pptpvpn)
+                raise ClientException()
+
+        client = TPLinkRouterTest("", "")
+
+        vpn_status = client.get_vpn_status()
+        self.assertTrue(vpn_status.openvpn_enable)
+        self.assertFalse(vpn_status.pptpvpn_enable)
+        self.assertEqual(vpn_status.openvpn_clients_total, 2)
+        self.assertEqual(vpn_status.pptpvpn_clients_total, 3)
+
+    def test_set_vpn(self) -> None:
+        response_openvpn_read = """
+        {
+            "enabled": "on",
+            "proto": "udp",
+            "access": "home",
+            "cert_exist": true,
+            "mask": "255.255.255.0",
+            "port": "1194",
+            "serverip": "10.8.0.0"
+        }
+        """
+
+        class TPLinkRouterTest(TplinkRouter):
+            def request(
+                self,
+                path: str,
+                data: str,
+                ignore_response: bool = False,
+                ignore_errors: bool = False,
+            ) -> dict | None:
+                if path == "admin/openvpn?form=config" and data == "operation=read":
+                    return loads(response_openvpn_read)
+                self.captured_path = path
+                self.captured_data = data
+
+        client = TPLinkRouterTest("", "")
+        client.set_vpn(VPN.OPEN_VPN, True)
+
+        expected_data = (
+            "operation=write&enabled=on"
+            "&proto=udp&access=home&cert_exist=True&mask=255.255.255.0&port=1194&serverip=10.8.0.0"
+        )
+        self.assertEqual(client.captured_path, 'admin/openvpn?form=config')
+        self.assertEqual(client.captured_data, expected_data)
+
 
 if __name__ == '__main__':
     main()

{tplinkrouterc6u-5.8.0 → tplinkrouterc6u-5.9.0}/tplinkrouterc6u/client/c1200.py

@@ -1,11 +1,8 @@
 from re import search
 from requests import post, Response
-from urllib.parse import urlencode
 from tplinkrouterc6u.common.encryption import EncryptionWrapper
 from tplinkrouterc6u.common.exception import ClientException, AuthorizeError
 from tplinkrouterc6u.client.c5400x import TplinkC5400XRouter
-from tplinkrouterc6u.common.dataclass import VPNStatus
-from tplinkrouterc6u.common.package_enum import VPN
 
 
 class TplinkC1200Router(TplinkC5400XRouter):
@@ -103,36 +100,3 @@ class TplinkC1200Router(TplinkC5400XRouter):
     @staticmethod
     def _get_login_data(crypted_pwd: str) -> str:
         return 'operation=login&password={}'.format(crypted_pwd)
-
-    def get_vpn_status(self) -> VPNStatus:
-        status = VPNStatus()
-
-        values = [
-            self.request("/admin/openvpn?form=config&operation=read", "operation=read"),
-            self.request("/admin/pptpd?form=config&operation=read", "operation=read"),
-            self.request("/admin/vpnconn?form=config&operation=list&vpntype=openvpn",
-                         "operation=list&operation=list&vpntype=openvpn"),
-            self.request("/admin/vpnconn?form=config&operation=list&vpntype=pptp",
-                         "operation=list&operation=list&vpntype=pptp"),
-        ]
-
-        status.openvpn_enable = values[0]['enabled'] == 'on'
-        status.pptpvpn_enable = values[1]['enabled'] == 'on'
-
-        if isinstance(values[2], list):
-            status.openvpn_clients_total = len(values[2])
-            status.pptpvpn_clients_total = len(values[3])
-        else:
-            status.openvpn_clients_total = 0
-            status.pptpvpn_clients_total = 0
-
-        return status
-
-    def set_vpn(self, vpn: VPN, enable: bool) -> None:
-        path = "/admin/{}?form=config&operation=read".format(vpn.lowercase)
-        current_config = self.request(path, "operation=read")
-        current_config['enabled'] = "on" if enable else "off"
-        data = urlencode(current_config)
-        data = "&operation=write&{}".format(data)
-        path = "/admin/{}?form=config{}".format(vpn.lowercase, data)
-        self.request(path, data)

{tplinkrouterc6u-5.8.0 → tplinkrouterc6u-5.9.0}/tplinkrouterc6u/client/c6u.py

@@ -1,14 +1,23 @@
 from hashlib import md5
 from re import search
 from json import loads
+from urllib.parse import urlencode
 from requests import post, Response
 from macaddress import EUI48
 from ipaddress import IPv4Address
 from logging import Logger
 from tplinkrouterc6u.common.helper import get_ip, get_mac
 from tplinkrouterc6u.common.encryption import EncryptionWrapper
-from tplinkrouterc6u.common.package_enum import Connection
-from tplinkrouterc6u.common.dataclass import Firmware, Status, Device, IPv4Reservation, IPv4DHCPLease, IPv4Status
+from tplinkrouterc6u.common.package_enum import Connection, VPN
+from tplinkrouterc6u.common.dataclass import (
+    Firmware,
+    Status,
+    Device,
+    IPv4Reservation,
+    IPv4DHCPLease,
+    IPv4Status,
+    VPNStatus,
+)
 from tplinkrouterc6u.common.exception import ClientException, ClientError
 from tplinkrouterc6u.client_abstract import AbstractRouter
 from abc import abstractmethod
@@ -231,6 +240,10 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
         self._url_firmware = 'admin/firmware?form=upgrade&operation=read'
         self._url_ipv4_reservations = 'admin/dhcps?form=reservation&operation=load'
         self._url_ipv4_dhcp_leases = 'admin/dhcps?form=client&operation=load'
+        self._url_openvpn = 'admin/openvpn?form=config&operation=read'
+        self._url_pptpd = 'admin/pptpd?form=config&operation=read'
+        self._url_vpnconn_openvpn = 'admin/vpnconn?form=config&operation=list&vpntype=openvpn'
+        self._url_vpnconn_pptpd = 'admin/vpnconn?form=config&operation=list&vpntype=pptp'
         referer = '{}/webpages/index.html'.format(self.host)
         self._headers_request = {'Referer': referer}
         self._headers_login = {'Referer': referer, 'Content-Type': 'application/x-www-form-urlencoded'}
@@ -401,6 +414,36 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
 
         return dhcp_leases
 
+    def get_vpn_status(self) -> VPNStatus:
+        status = VPNStatus()
+
+        values = [
+            self.request(self._url_openvpn, "operation=read"),
+            self.request(self._url_pptpd, "operation=read"),
+            self.request(self._url_vpnconn_openvpn, "operation=list&vpntype=openvpn"),
+            self.request(self._url_vpnconn_pptpd, "operation=list&vpntype=pptp"),
+        ]
+
+        status.openvpn_enable = values[0]['enabled'] == 'on'
+        status.pptpvpn_enable = values[1]['enabled'] == 'on'
+
+        if isinstance(values[2], list):
+            status.openvpn_clients_total = len(values[2])
+            status.pptpvpn_clients_total = len(values[3])
+        else:
+            status.openvpn_clients_total = 0
+            status.pptpvpn_clients_total = 0
+
+        return status
+
+    def set_vpn(self, vpn: VPN, enable: bool) -> None:
+        path = self._url_openvpn if VPN.OPEN_VPN == vpn else self._url_pptpd
+        current_config = self.request(path, "operation=read")
+        current_config['enabled'] = "on" if enable else "off"
+        data = urlencode(current_config)
+        data = "operation=write&{}".format(data)
+        self.request(path, data)
+
     @staticmethod
     def _str2bool(v) -> bool | None:
         return str(v).lower() in ("yes", "true", "on") if v is not None else None
@@ -435,3 +478,7 @@ class TplinkRouter(TplinkEncryption, TplinkBaseRouter):
         self._url_firmware = 'admin/firmware?form=upgrade'
         self._url_ipv4_reservations = 'admin/dhcps?form=reservation'
         self._url_ipv4_dhcp_leases = 'admin/dhcps?form=client'
+        self._url_openvpn = 'admin/openvpn?form=config'
+        self._url_pptpd = 'admin/pptpd?form=config'
+        self._url_vpnconn_openvpn = 'admin/vpnconn?form=config'
+        self._url_vpnconn_pptpd = 'admin/vpnconn?form=config'

{tplinkrouterc6u-5.8.0 → tplinkrouterc6u-5.9.0}/tplinkrouterc6u.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.8.0
+Version: 5.9.0
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -59,6 +59,7 @@ from tplinkrouterc6u import (
     TPLinkXDRClient,
     TPLinkDecoClient,
     TplinkC80Router,
+    TplinkWDRRouter,
     Connection
 )
 from logging import Logger
@@ -312,6 +313,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 BE400 v1.0
 - Archer BE550 v1.0
 - Archer BE800 v1.0
 - Archer BE805 v1.0
@@ -334,6 +336,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Archer VR1200v v1
 - Archer VR2100v v1
 - Archer VX1800v v1.0
+- BE11000 2.0
 - Deco M4 2.0
 - Deco M4R 2.0
 - Deco M5 v3
@@ -359,6 +362,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - TL-WA3001 v1.0
 - TL-XDR3010 V2
 - TL-WDR3600 V1
+- VX420-G2h v1.1
 - XC220-G3v v2.30
 ### <a id="mercusys">MERCUSYS routers</a>
 - MR47BE v1.0