TISControlProtocol 1.0.61__tar.gz → 1.0.63__tar.gz

{tiscontrolprotocol-1.0.61 → tiscontrolprotocol-1.0.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TISControlProtocol
-Version: 1.0.61
+Version: 1.0.63
 Summary: A library for TIS Control Protocol
 Project-URL: Homepage, https://github.com/TISControlHass
 Project-URL: Issues, https://github.com/TISControlHass/issues

{tiscontrolprotocol-1.0.61 → tiscontrolprotocol-1.0.63}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "TISControlProtocol"
-version = "1.0.61"
+version = "1.0.63"
 description = "A library for TIS Control Protocol"
 readme = "README.md"
 requires-python = ">=3.11"

{tiscontrolprotocol-1.0.61 → tiscontrolprotocol-1.0.63}/src/TISControlProtocol/Protocols/udp/ProtocolHandler.py

@@ -260,6 +260,33 @@ class TISProtocolHandler:
             ),
         )
 
+    def generate_dali_light_control_packet(
+        self, entity, brightness: int, temperature: int
+    ) -> tuple[TISPacket, TISPacket]:
+        """
+        Generate packets to control a DALI light.
+        :param entity: The entity object containing device information.
+        :param brightness: An integer representing the brightness level.
+        :param temperature: An integer representing the temperature level.
+        :return: A tuple of Packet instances.
+        """
+        return (
+            TISPacket(
+                device_id=entity.device_id,
+                operation_code=TISProtocolHandler.OPERATION_CONTROL,
+                source_ip=entity.api.host,
+                destination_ip=entity.gateway,
+                additional_bytes=[entity.brightness_channel, brightness, 0x00, 0x00],
+            ),
+            TISPacket(
+                device_id=entity.device_id,
+                operation_code=TISProtocolHandler.OPERATION_CONTROL,
+                source_ip=entity.api.host,
+                destination_ip=entity.gateway,
+                additional_bytes=[entity.temperature_channel, temperature, 0x00, 0x00],
+            ),
+        )
+
     def generate_no_pos_cover_packet(
         self, entity, mode: Literal["open", "close", "stop"]
     ) -> tuple[TISPacket, TISPacket]:

{tiscontrolprotocol-1.0.61 → tiscontrolprotocol-1.0.63}/src/TISControlProtocol/api.py

@@ -125,6 +125,8 @@ class TISApi:
         if self.hass.services.has_service(self.domain, "send_cms_data"):
             return
 
+        logging.info("Registering CMS data service")
+
         async def handle_cms_data(call):
             data = call.data.get("data", None)
 
@@ -172,6 +174,8 @@ class TISApi:
         if self.hass.services.has_service(self.domain, "send_cms_data"):
             self.hass.services.async_remove(self.domain, "send_cms_data")
 
+        logging.info("CMS data service unregistered")
+
         if getattr(self, "_cms_task_unsub", None):
             self._cms_task_unsub()
             self._cms_task_unsub = None

{tiscontrolprotocol-1.0.61 → tiscontrolprotocol-1.0.63}/src/TISControlProtocol/apis/bill_config_endpoint.py

@@ -1,10 +1,12 @@
-from homeassistant.components.http import HomeAssistantView
-from aiohttp import web
 import asyncio
+import ipaddress
+import json
 import logging
 import os
-import json
+
 import aiofiles
+from aiohttp import web
+from homeassistant.components.http import HomeAssistantView
 
 
 class BillConfigEndpoint(HomeAssistantView):
@@ -18,6 +20,14 @@ class BillConfigEndpoint(HomeAssistantView):
         self.tis_api = tis_api
 
     async def post(self, request):
+        remote_ip = ipaddress.ip_address(request.remote)
+        is_local = remote_ip.is_private or remote_ip.is_loopback
+
+        if not is_local:
+            return web.json_response(
+                {"error": "Unauthorized: Local network access only"}, status=403
+            )
+
         try:
             data = await request.json()
 
@@ -51,5 +61,7 @@ class BillConfigEndpoint(HomeAssistantView):
 
     async def reload_platforms(self):
         # Reload the platforms
-        for entry in self.tis_api.hass.config_entries.async_entries(self.tis_api.domain):
+        for entry in self.tis_api.hass.config_entries.async_entries(
+            self.tis_api.domain
+        ):
             await self.tis_api.hass.config_entries.async_reload(entry.entry_id)

{tiscontrolprotocol-1.0.61 → tiscontrolprotocol-1.0.63}/src/TISControlProtocol/apis/change_password_endpoint.py

@@ -1,8 +1,10 @@
-from homeassistant.components.http import HomeAssistantView
-from aiohttp import web
 import asyncio
+import ipaddress
 import logging
 
+from aiohttp import web
+from homeassistant.components.http import HomeAssistantView
+
 
 class ChangeSecurityPassEndpoint(HomeAssistantView):
     """Change Security Password API Endpoint."""
@@ -15,6 +17,14 @@ class ChangeSecurityPassEndpoint(HomeAssistantView):
         self.tis_api = tis_api
 
     async def post(self, request):
+        remote_ip = ipaddress.ip_address(request.remote)
+        is_local = remote_ip.is_private or remote_ip.is_loopback
+
+        if not is_local:
+            return web.json_response(
+                {"error": "Unauthorized: Local network access only"}, status=403
+            )
+
         try:
             old_pass = request.query.get("old_pass")
             new_pass = request.query.get("new_pass")

{tiscontrolprotocol-1.0.61 → tiscontrolprotocol-1.0.63}/src/TISControlProtocol/apis/get_bill_config_endpoint.py

@@ -1,7 +1,9 @@
-from homeassistant.components.http import HomeAssistantView
-from aiohttp import web
+import ipaddress
 import logging
 
+from aiohttp import web
+from homeassistant.components.http import HomeAssistantView
+
 
 class GetBillConfigEndpoint(HomeAssistantView):
     """Get Bill Configurations"""
@@ -14,6 +16,14 @@ class GetBillConfigEndpoint(HomeAssistantView):
         self.tis_api = tis_api
 
     async def get(self, request):
+        remote_ip = ipaddress.ip_address(request.remote)
+        is_local = remote_ip.is_private or remote_ip.is_loopback
+
+        if not is_local:
+            return web.json_response(
+                {"error": "Unauthorized: Local network access only"}, status=403
+            )
+
         try:
             if self.tis_api.bill_configs:
                 configs = self.tis_api.bill_configs

{tiscontrolprotocol-1.0.61 → tiscontrolprotocol-1.0.63}/src/TISControlProtocol/apis/passwords_endpoint.py

@@ -1,7 +1,8 @@
-from homeassistant.components.http import HomeAssistantView
-from aiohttp import web
-import logging
 import asyncio
+import logging
+
+from aiohttp import web
+from homeassistant.components.http import HomeAssistantView
 
 
 class PasswordsEndpoint(HomeAssistantView):

{tiscontrolprotocol-1.0.61 → tiscontrolprotocol-1.0.63}/src/TISControlProtocol/apis/tis_endpoint.py

@@ -37,7 +37,7 @@ class TISEndPoint(HomeAssistantView):
 
         # Parse the JSON data from the request body
         try:
-            data = await request.json()
+            data: dict = await request.json()
         except Exception:
             return web.json_response({"error": "Invalid JSON"}, status=400)
 
@@ -56,6 +56,8 @@ class TISEndPoint(HomeAssistantView):
             _LOGGER.warning("Unauthorized")
             return web.json_response({"error": "Unauthorized"}, status=403)
 
+        data.pop("mac_address", None) # Remove MAC from data to avoid confusion.
+
         # 3. Process the valid request
         directory = "/config/custom_components/tis_integration/"
         await self.api.save_appliances(data, directory)