Merge pull request #127 from telekom-mms/fix/forti-7.6

fix: since fortios 7.6 tcp/udp service protocol is 'TCP/UDP/UDP-Lite/…

Author: neubi4

.github/workflows/main.yml

@@ -12,8 +12,6 @@ jobs:
     strategy:
       matrix:
         python:
-          - "3.9"
-          - "3.10"
           - "3.11"
           - "3.12"
     steps:

fortilib/__init__.py

@@ -1,13 +1,20 @@
 __version__ = "1.0.7"
 
+from enum import StrEnum
 from typing import (
     Dict,
     List,
 )
 
 
+class FortigateTCPUDPServiceProtocol(StrEnum):
+    TCP_UDP_SCTP = "TCP/UDP/SCTP"
+    TCP_UDP_UDP_Lite_SCTP = "TCP/UDP/UDP-Lite/SCTP"
+
+
 class FortilibSettings:
     strict_address_group_member_matching: bool = True
+    tcp_udp_service_protocol = FortigateTCPUDPServiceProtocol.TCP_UDP_SCTP
 
 
 def get_by(attrname, attrvalue, haystack):

fortilib/firewall.py

@@ -269,7 +269,7 @@ def get_services(self) -> List[FortigateService]:
                 service = FortigateICMPService.from_dict(raw)
             if raw["protocol"] == "ICMP6":
                 service = FortigateICMP6Service.from_dict(raw)
-            elif raw["protocol"] in "TCP/UDP/SCTP":
+            elif raw["protocol"].startswith("TCP/UDP"):
                 service = FortigateTCPUDPService.from_dict(raw)
             elif raw["protocol"] == "IP":
                 service = FortigateIPService.from_dict(raw)

fortilib/service.py

@@ -1,3 +1,4 @@
+from fortilib import FortilibSettings
 from fortilib.base import FortigateNamedObject
 
 
@@ -38,7 +39,7 @@ class FortigateTCPUDPService(FortigateService):
     def __init__(self):
         super().__init__()
 
-        self.protocol = "TCP/UDP/SCTP"
+        self.protocol = str(FortilibSettings.tcp_udp_service_protocol)
         self.tcp_portrange: str = ""
         self.udp_portrange: str = ""
 

poetry.lock

@@ -20,7 +20,7 @@ keywords = ["firewall", "fortinet", "fortigate"]
 Changelog = "https://github.com/telekom-mms/fortilib/blob/master/CHANGELOG.md"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<4.0"
+python = ">=3.11,<4.0"
 httpx = ">=0.23.0"
 
 [tool.poetry.dev-dependencies]