1.0.2 (2023-02-07)

------------------
* [fix] ccsrftoken for fortios v7

Author: vprusakovs

CHANGELOG.rst

@@ -4,6 +4,11 @@
 CHANGELOG
 =========
 
+1.0.2 (2023-02-07)
+------------------
+* [fix] ccsrftoken for fortios v7
+
+
 1.0.1 (2022-11-01)
 ------------------
 * [fix] py.typed

README.rst

@@ -36,7 +36,7 @@ or install the package from github.com release
 
 .. code:: bash
 
-    pip install https://github.com/vladimirs-git/fortigate-api/archive/refs/tags/1.0.1.tar.gz
+    pip install https://github.com/vladimirs-git/fortigate-api/archive/refs/tags/1.0.2.tar.gz
 
 or install the package from github.com repository
 

fortigate_api/fortigate.py

@@ -155,13 +155,19 @@ def login(self) -> None:
                          verify=self.verify)
         except Exception as ex:
             raise self._hide_secret_ex(ex)
-        csrf_token_name = f"ccsrftoken_{self.port}"
-        for cookie in session.cookies:
-            if cookie.name == csrf_token_name and isinstance(cookie.value, str):
-                session.headers.update({"X-CSRFTOKEN": cookie.value[1:-1]})
-                break
-        else:
-            raise ValueError(f"invalid login credentials, absent cookie {csrf_token_name}")
+
+        cookie_name = "ccsrftoken"
+        cookies = [o for o in session.cookies if o.name == cookie_name]
+        if not cookies:
+            regex = cookie_name + r"_\d+$"
+            cookies = [o for o in session.cookies if re.match(regex, o.name)]
+        cookies = [o for o in cookies if isinstance(o.value, str)]
+        if not cookies:
+            raise ValueError("invalid login credentials, absent cookie ccsrftoken")
+        cookie = cookies[0]
+        token = cookie.value.strip("\"")
+        session.headers.update({"X-CSRFTOKEN": token})
+
         response: Response = session.get(url=f"{self.url}/api/v2/cmdb/system/vdom")
         response.raise_for_status()
         self._session = session

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fortigate_api"
-version = "1.0.1"
+version = "1.0.2"
 authors = [
   { name="Vladimir Prusakov", email="[email protected]" },
 ]
@@ -30,7 +30,7 @@ classifiers = [
 "Homepage" = "https://github.com/vladimirs-git/fortigate-api"
 "Repository" = "https://github.com/vladimirs-git/fortigate-api"
 "Bug Tracker" = "https://github.com/vladimirs-git/fortigate-api/issues"
-"Download URL" = "https://github.com/vladimirs-git/fortigate-api/archive/refs/tags/1.0.1.tar.gz"
+"Download URL" = "https://github.com/vladimirs-git/fortigate-api/archive/refs/tags/1.0.2.tar.gz"
 [tool.setuptools.packages.find]
 include = ["fortigate_api"]
 [tool.setuptools.package-data]