DXE-4394 Merge pull request #72 from akamai/release/v2.0.2

Release/v2.0.2

Author: wzagrajcz

CHANGELOG.md

@@ -1,29 +1,36 @@
 # RELEASE NOTES
 
-## 2.0.1 (June 18, 2024)
+## 2.0.2 (Dec 10, 2024)
 
-#### FEATURES/ENHANCEMENTS:
+### FEATURES/ENHANCEMENTS:
 
-* Updated various dependencies
+* Modified code to use `yaml.SafeLoader` to improve security when loading `yaml` configuration files.
+* Updated various dependencies.
 
-## 2.0.0 (January 18, 2023)
+## 2.0.1 (Jun 18, 2024)
 
-#### BREAKING CHANGES:
+### FEATURES/ENHANCEMENTS:
 
-* Default section is now `default`, was `cps`
-* Update to v11 for:
+* Updated various dependencies.
+
+## 2.0.0 (Jan 18, 2023)
+
+### BREAKING CHANGES:
+
+* Changed default section from `cps` to `default`.
+* Updated to v11 for:
   * create, update enrollment API call
   * accept to get enrollments
 
-#### BUG FIXES:
+### FEATURES/ENHANCEMENTS:
 
-* Fix case when listing enrollments didn't show updates on enrollment after having it cached
-* Fix non recognizing `accountkey` option ([#48](https://github.com/akamai/cli-cps/issues/48))
+* Added support for arm64.
+* Updated various dependencies.
+* Third party cert: modified `status` to show both ecsda and rsa csr.
+* Third party cert: modified `proceed` to allow upload of signed ecdsa or rsa.
+* Added support for `--force-renewal` (optional) argument for updates.
 
-#### FEATURES/ENHANCEMENTS:
+### BUG FIXES:
 
-* Added support for arm64
-* Updated various dependencies
-* Third party cert: status shows both ecsda and rsa csr
-* Third party cert: proceed allows upload of signed ecdsa or rsa
-* Update allows for --force-renewal (optional) argument
+* Fixed a case when listing enrollments didn't show updates on enrollment after having it cached.
+* Fixed a non-recognizing `accountkey` option ([#48](https://github.com/akamai/cli-cps/issues/48)).

LICENSE

@@ -186,10 +186,10 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright 2024 Akamai Technologies, Inc. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
+   you may not use these files except in compliance with the License.
    You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0

README.md

@@ -243,12 +243,14 @@ The flags of interest for delete are (please specify either --cn or --enrollment
 --enrollment-id <value>       Enrollment id
 ```
 
-# Contribution
+## Contribution
 
 By submitting a contribution (the “Contribution”) to this project, and for good and valuable consideration, the receipt and sufficiency of which are hereby acknowledged, you (the “Assignor”) irrevocably convey, transfer, and assign the Contribution to the owner of the repository (the “Assignee”), and the Assignee hereby accepts, all of your right, title, and interest in and to the Contribution along with all associated copyrights, copyright registrations, and/or applications for registration and all issuances, extensions and renewals thereof (collectively, the “Assigned Copyrights”). You also assign all of your rights of any kind whatsoever accruing under the Assigned Copyrights provided by applicable law of any jurisdiction, by international treaties and conventions and otherwise throughout the world. 
 
-# Notice
+## License
 
-Copyright 2020 – Akamai Technologies, Inc.
- 
-All works contained in this repository, excepting those explicitly otherwise labeled, are the property of Akamai Technologies, Inc.
+Copyright 2024 Akamai Technologies, Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

bin/akamai-cps

@@ -1,16 +1,3 @@
-"""
-Copyright 2017 Akamai Technologies, Inc. All Rights Reserved.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-"""
-
 """
 This code leverages akamai OPEN API. to control Certificates deployed in Akamai Network.
 In case you need quick explanation contact the initiators.

bin/cps.py

@@ -1,17 +1,3 @@
-"""
-Copyright 2017 Akamai Technologies, Inc. All Rights Reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-"""
-
 """
 This code leverages akamai OPEN API. to control Certificates deployed in Akamai Network.
 In case you need quick explanation contact the initiators.
@@ -36,7 +22,7 @@
 from cpsApiWrapper import cps
 from headers import headers
 
-PACKAGE_VERSION = "2.0.1"
+PACKAGE_VERSION = "2.0.2"
 
 # Setup logging
 if not os.path.exists('logs'):
@@ -1464,9 +1450,9 @@ def create(args):
             exit(0)
 
         if filePath.endswith('.yml') or filePath.endswith('.yaml'):
-            jsonFormattedContent = yaml.load(file_content, yaml.Loader)
-            updateJsonContent = json.dumps(yaml.load(file_content, yaml.Loader), indent=2)
-            certificateContent = yaml.load(file_content, yaml.Loader)
+            jsonFormattedContent = yaml.load(file_content, yaml.SafeLoader)
+            updateJsonContent = json.dumps(yaml.load(file_content, yaml.SafeLoader), indent=2)
+            certificateContent = yaml.load(file_content, yaml.SafeLoader)
         elif filePath.endswith('.json'):
             jsonFormattedContent = json.loads(file_content)
             updateJsonContent = json.dumps(jsonFormattedContent, indent=2)
@@ -1572,10 +1558,10 @@ def update(args):
         exit(0)
 
     if fileName.endswith('.yml') or fileName.endswith('.yaml'):
-        jsonFormattedContent = yaml.load(file_content, yaml.Loader)
+        jsonFormattedContent = yaml.load(file_content, yaml.SafeLoader)
         updateJsonContent = json.dumps(
-            yaml.load(file_content, yaml.Loader), indent=2)
-        certificateContent = yaml.load(file_content, yaml.Loader)
+            yaml.load(file_content, yaml.SafeLoader), indent=2)
+        certificateContent = yaml.load(file_content, yaml.SafeLoader)
     elif fileName.endswith('.json'):
         jsonFormattedContent = json.loads(file_content)
         updateJsonContent = json.dumps(jsonFormattedContent, indent=2)

bin/cpsApiWrapper.py

@@ -1,15 +1,3 @@
-""" Copyright 2017 Akamai Technologies, Inc. All Rights Reserved.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-"""
-
 import json
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend

bin/headers.py

@@ -1,15 +1,3 @@
-""" Copyright 2017 Akamai Technologies, Inc. All Rights Reserved.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-"""
-
 class headers(object):
     def __init__(self):
         self.data = {

cli.json

@@ -6,7 +6,7 @@
     {
       "name": "cps",
       "aliases": ["certs"],
-      "version": "2.0.1",
+      "version": "2.0.2",
       "description": "Access Certificate Provisioning System (CPS) Information"
     }
   ]

requirements.txt

@@ -1,4 +1,4 @@
-edgegrid-python==1.3.1
+edgegrid-python==2.0.0
 requests==2.32.3
 prettytable==3.10.0
 cryptography==43.0.1