catalystwan 0.41.5.dev1__tar.gz → 0.41.5.dev2__tar.gz

{catalystwan-0.41.5.dev1 → catalystwan-0.41.5.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: catalystwan
-Version: 0.41.5.dev1
+Version: 0.41.5.dev2
 Summary: Cisco Catalyst WAN SDK for Python
 Author: sbasan
 Author-email: sbasan@cisco.com

{catalystwan-0.41.5.dev1 → catalystwan-0.41.5.dev2}/catalystwan/models/common.py

@@ -815,8 +815,8 @@ SecondaryRegion = Literal[
 WebReputation = Literal["low-risk", "moderate-risk", "high-risk", "suspicious", "trustworthy"]
 
 WebCategory = Literal[
-    "abused-drugs",
     "abortion",
+    "abused-drugs",
     "adult-and-pornography",
     "alcohol-and-tobacco",
     "auctions",
@@ -826,17 +826,17 @@ WebCategory = Literal[
     "cheating",
     "computer-and-internet-info",
     "computer-and-internet-security",
-    "games",
-    "gambling",
-    "financial-services",
-    "fashion-and-beauty",
-    "entertainment-and-arts",
-    "educational-institutions",
-    "dynamic-content",
-    "dead-sites",
     "confirmed-spam-sources",
     "cult-and-occult",
     "dating",
+    "dead-sites",
+    "dynamic-content",
+    "educational-institutions",
+    "entertainment-and-arts",
+    "fashion-and-beauty",
+    "financial-services",
+    "gambling",
+    "games",
     "government",
     "gross",
     "hacking",
@@ -856,6 +856,14 @@ WebCategory = Literal[
     "local-information",
     "malware-sites",
     "marijuana",
+    "military",
+    "motor-vehicles",
+    "music",
+    "news-and-media",
+    "nudity",
+    "online-greeting-cards",
+    "online-personal-storage",
+    "open-http-proxies",
     "p2p",
     "parked-sites",
     "pay-to-surf",
@@ -875,8 +883,8 @@ WebCategory = Literal[
     "shopping",
     "social-network",
     "society",
-    "sports",
     "spam-urls",
+    "sports",
     "spyware-and-adware",
     "streaming-media",
     "swimsuits-and-intimate-apparel",
@@ -890,14 +898,12 @@ WebCategory = Literal[
     "web-advertisements",
     "web-based-email",
     "web-hosting",
-    "open-http-proxies",
-    "online-personal-storage",
-    "online-greeting-cards",
-    "nudity",
-    "news-and-media",
-    "music",
-    "motor-vehicles",
-    "military",
+    "unused-food-and-dining",
+    "unused-reputation",
+    "self-harm",
+    "dns-over-https",
+    "low-thc-cannabis-products",
+    "generative-ai",
 ]
 
 IkeMode = Literal[

{catalystwan-0.41.5.dev1 → catalystwan-0.41.5.dev2}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/ssl_decryption_profile.py

@@ -92,6 +92,12 @@ Categories = Literal[
     "web-advertisements",
     "web-based-email",
     "web-hosting",
+    "unused-food-and-dining",
+    "unused-reputation",
+    "self-harm",
+    "dns-over-https",
+    "low-thc-cannabis-products",
+    "generative-ai",
 ]
 
 DecryptThreshold = Literal["high-risk", "low-risk", "moderate-risk", "suspicious", "trustworthy"]

{catalystwan-0.41.5.dev1 → catalystwan-0.41.5.dev2}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/url_filtering.py

@@ -91,6 +91,12 @@ WebCategories = Literal[
     "web-advertisements",
     "web-based-email",
     "web-hosting",
+    "unused-food-and-dining",
+    "unused-reputation",
+    "self-harm",
+    "dns-over-https",
+    "low-thc-cannabis-products",
+    "generative-ai",
 ]
 
 WebCategoriesAction = Literal["block", "allow"]

{catalystwan-0.41.5.dev1 → catalystwan-0.41.5.dev2}/catalystwan/models/configuration/network_hierarchy/cflowd.py

@@ -95,6 +95,9 @@ class CflowdParcel(_ParcelBase):
             # export_interval should be default 600 only if bfd_metrics_export is True
             export_interval = 600
 
+        if not self._can_add_collector(vpn_id, address, udp_port):
+            return
+
         self.collectors.append(
             Collectors(
                 address=as_optional_global(address),
@@ -126,3 +129,17 @@ class CflowdParcel(_ParcelBase):
 
     def set_protocol(self, protocol: Protocol):
         self.protocol = Global[Protocol](value=protocol)
+
+    def _can_add_collector(self, vpn_id: Optional[int], address: Optional[str], udp_port: Optional[int]) -> bool:
+        if self.collectors is None:
+            return True
+
+        for collector in self.collectors:
+            if (
+                collector.vpn_id == as_optional_global(vpn_id)
+                and collector.address == as_optional_global(address)
+                and collector.udp_port == as_optional_global(udp_port)
+            ):
+                return False
+
+        return True

{catalystwan-0.41.5.dev1 → catalystwan-0.41.5.dev2}/catalystwan/response.py

@@ -54,6 +54,8 @@ def response_debug(response: Optional[Response], request: Union[Request, Prepare
         "json": getattr(_request, "json", None),
     }
     if content_type := {k.lower(): v for k, v in _request.headers.items()}.get("content-type"):
+        if isinstance(content_type, bytes):
+            content_type = content_type.decode("latin-1")
         if not re.search(PRINTABLE_CONTENT, content_type):
             del request_debug["body"]
     if urlparse(_request.url).path in SENSITIVE_URL_PATHS:

{catalystwan-0.41.5.dev1 → catalystwan-0.41.5.dev2}/catalystwan/vmanage_auth.py

@@ -3,7 +3,7 @@
 import logging
 from http.cookies import SimpleCookie
 from threading import RLock
-from typing import Optional, Union
+from typing import Optional, Union, cast
 from urllib.parse import urlparse
 
 from packaging.version import Version  # type: ignore
@@ -52,7 +52,7 @@ def update_headers(
         # preserve existing cookies and insert JSESSIONID
         # PreparedRequest.preparce_cookies cannot be used as they can be already set in session context
         cookie: SimpleCookie = SimpleCookie()
-        cookie.load(request.headers.get("Cookie", ""))
+        cookie.load(_normalize_header_value(request.headers.get("Cookie", "")))
         cookie["JSESSIONID"] = jsessionid
         request.headers["Cookie"] = cookie.output(header="", sep=";").strip()
     if xsrftoken is not None:
@@ -61,6 +61,16 @@ def update_headers(
         request.headers["VSessionId"] = vsessionid
 
 
+def _normalize_headers(headers: dict) -> dict:
+    return {key: _normalize_header_value(value) for key, value in headers.items() if value is not None}
+
+
+def _normalize_header_value(value: Union[str, bytes]) -> str:
+    if isinstance(value, bytes):
+        return value.decode("latin-1")
+    return value
+
+
 class vManageAuth(AuthBase, AuthProtocol):
     """Attaches vManage Authentication to the given Requests object.
 
@@ -94,7 +104,7 @@ class vManageAuth(AuthBase, AuthProtocol):
             return request
 
     def sync_cookies(self, cookies: RequestsCookieJar) -> None:
-        self.cookies = merge_cookies(self.cookies, cookies)
+        self.cookies = cast(RequestsCookieJar, merge_cookies(self.cookies, cookies))
 
     @property
     def jsessionid(self) -> Optional[str]:
@@ -153,11 +163,17 @@ class vManageAuth(AuthBase, AuthProtocol):
                 headers = {"x-xsrf-token": self.xsrftoken, "User-Agent": USER_AGENT}
                 if version >= Version("20.12"):
                     response = post(
-                        f"{self._base_url}/logout", headers=headers, cookies=self.cookies, verify=self.verify
+                        f"{self._base_url}/logout",
+                        headers=_normalize_headers(headers),
+                        cookies=self.cookies,
+                        verify=self.verify,
                     )
                 else:
                     response = get(
-                        f"{self._base_url}/logout", headers=headers, cookies=self.cookies, verify=self.verify
+                        f"{self._base_url}/logout",
+                        headers=_normalize_headers(headers),
+                        cookies=self.cookies,
+                        verify=self.verify,
                     )
                 self.logger.debug(auth_response_debug(response, str(self)))
                 if response.status_code != 200:
@@ -184,7 +200,7 @@ class vManageAuth(AuthBase, AuthProtocol):
                 jsessionid = None
             else:
                 cookie: SimpleCookie = SimpleCookie()
-                cookie.load(last_request.headers.get("Cookie", ""))
+                cookie.load(_normalize_header_value(last_request.headers.get("Cookie", "")))
                 try:
                     jsessionid = cookie["JSESSIONID"].value
                 except KeyError:
@@ -231,7 +247,7 @@ class vSessionAuth(vManageAuth):
         response: Response = get(
             url=url,
             cookies=self.cookies,
-            headers=headers,
+            headers=_normalize_headers(headers),
             verify=self.verify,
         )
         self.sync_cookies(response.cookies)
@@ -248,7 +264,7 @@ class vSessionAuth(vManageAuth):
         response: Response = post(
             url=url,
             cookies=self.cookies,
-            headers=headers,
+            headers=_normalize_headers(headers),
             verify=self.verify,
         )
         self.sync_cookies(response.cookies)

{catalystwan-0.41.5.dev1 → catalystwan-0.41.5.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "catalystwan"
-version = "0.41.5dev1"
+version = "0.41.5dev2"
 description = "Cisco Catalyst WAN SDK for Python"
 authors = ["sbasan <sbasan@cisco.com>"]
 readme = "README.md"