CVE fixes

f5_cccl/api.py

@@ -17,7 +17,7 @@
 """F5 Common Controller Core Library to read, diff and apply BIG-IP config."""
 
 import logging
-import pkg_resources
+import importlib.resources
 
 from f5_cccl.bigip import BigIPProxy
 from f5_cccl.service.manager import ServiceManager
@@ -67,8 +67,8 @@ def __init__(self, bigip, partition, user_agent=None, prefix=None,
                                        prefix=prefix)
 
         if schema_path is None:
-            schema_path = pkg_resources.resource_filename(resource_package,
-                                                          ltm_api_schema)
+            schema_path = str(
+                importlib.resources.files(resource_package).joinpath(ltm_api_schema))
         self._service_manager = ServiceManager(self._bigip_proxy,
                                                partition,
                                                schema_path)
@@ -132,4 +132,4 @@ def get_statistics(self):
         """
         statistics = {}
 
-        return statistics
+        return statistics

f5_cccl/schemas/cccl-ltm-api-schema.yml

@@ -149,15 +149,15 @@ definitions:
           Ordered list of actions to perform on successful match.
           The order of the action in the list indicates the name of the action.
         items:
-          $ref: "#definitions/l7RuleActionType"
+          $ref: "#/definitions/l7RuleActionType"
           type: "array"
       conditions:
         description: >
           Ordered list of conditions to evaluate.  The order of the condition
           in the list indicates the name and the order in which the condition
           is evaluated.
         items:
-          $ref: "#definitions/l7ConditionType"
+          $ref: "#/definitions/l7ConditionType"
           type: "array"
       description:
         description: "Descriptive text that describes the rule"
@@ -439,7 +439,7 @@ definitions:
           type: "array"
           description: >
             List of rules associated with this policy.  This can be an empty list
-          $ref: "#definitions/l7RuleType"
+          $ref: "#/definitions/l7RuleType"
     required:
       - "name"
       - "rules"
@@ -597,7 +597,7 @@ definitions:
       members:
         description: "List of pool members"
         items:
-          $ref: "#definitions/poolMemberType"
+          $ref: "#/definitions/poolMemberType"
           type: "array"
       monitors:
         description: >
@@ -731,7 +731,7 @@ definitions:
           description: "List of pool members"
           items:
             type: "array"
-            $ref: "#definitions/poolMemberType"
+            $ref: "#/definitions/poolMemberType"
       tables:
         description: >
           Specifies an array of tables, e.g. L7 policies
@@ -891,7 +891,7 @@ definitions:
           type: "array"
           description: >
             List of records associated with this data group.
-          $ref: "#definitions/internalDataGroupRecordType"
+          $ref: "#/definitions/internalDataGroupRecordType"
     required:
       - "name"
 

f5_cccl/schemas/cccl-net-api-schema.yml

@@ -60,7 +60,7 @@ definitions:
           type: "array"
           description: >
             "List of records associated with this tunnel."
-          $ref: "#definitions/recordType"
+          $ref: "#/definitions/recordType"
     required:
     - "name"
     - "records"

requirements.test.txt

@@ -27,7 +27,7 @@ enum34==1.1.6
 cryptography==3.3.2
 idna==2.7
 pycparser==2.19
-urllib3==1.26.18
+urllib3==2.7.0
 six==1.15.0
 attrs==18.2.0
 cffi==1.12.2

setup.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-
 # Copyright (c) 2014-2021, F5 Networks, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,19 +14,22 @@
 # limitations under the License.
 #
 
-try:  # for pip >= 10
-    from pip._internal.req import parse_requirements as parse_reqs
-except ImportError:  # for pip <= 9.0.3
-    from pip.req import parse_requirements as parse_reqs
 from setuptools import setup
 from setuptools import find_packages
 
 import f5_cccl
 
-install_requires = [str(x.req) for x in parse_reqs('./setup_requirements.txt',
-                       session='setup')]
+
+def parse_requirements(filename):
+    """Parse requirements from a file."""
+    with open(filename, 'r') as f:
+        return [line.strip() for line in f if line.strip() and not line.startswith('#')]
+
+
+install_requires = parse_requirements('./setup_requirements.txt')
 
 print(('install_requires', install_requires))
+
 setup(
     name='f5-cccl',
     description='F5 Networks Common Controller Core Library',
@@ -45,4 +47,4 @@
     classifiers=[
     ],
     entry_points={}
-)
+)

setup_requirements.txt

@@ -1,24 +1,24 @@
-# F5-CCCL Install Requirements
+# F5-CCCL Install Requirements (Python 3.12 compatible)
 #f5-icontrol-rest==1.3.13
 f5-sdk==3.0.21
-ipaddress==1.0.17
-netaddr==0.7.19
-PyJWT==2.4.0
-PyYAML==6.0.1
-requests==2.32.4
-simplejson==3.10.0
-jsonpatch==1.16
-jsonpointer==2.0
-jsonschema==3.0.0
-asn1crypto==0.24.0
+ipaddress==1.0.23
+netaddr==0.10.1
+PyJWT==2.12.0
+PyYAML==6.0.2
+requests==2.33.0
+simplejson==3.19.2
+jsonpatch==1.33
+jsonpointer==2.4
+jsonschema==4.21.1
+asn1crypto==1.5.1
 certifi==2024.07.04
-chardet==3.0.4
+chardet==5.2.0
 enum34==1.1.6
 idna==3.7
-pycparser==2.19
-urllib3==2.6.0
-six==1.12.0
-attrs==18.2.0
-cffi==1.15.0
-pyrsistent==0.14.11
-setuptools==78.1.1
+pycparser==2.22
+urllib3==2.7.0
+six==1.16.0
+attrs==23.2.0
+cffi==1.16.0
+pyrsistent==0.20.0
+setuptools==82.0.1