Skip to content

Commit e8789ea

Browse files
461 bug in personal certificates (#462)
* fix: nested double quotes * documentation: version * documentation: version bump
1 parent 0ed13a2 commit e8789ea

5 files changed

Lines changed: 12 additions & 8 deletions

File tree

docs/changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
## Latest
44

5+
6+
## 2025.12.11.0
7+
58
- refactor: remove reference to test scripts, since these are not in the pypi build
9+
- fix: nested double quotes
610

711
## 2025.11.14.0
812

ibmsecurity/isam/aac/authentication/policies.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def add(isamAppliance, name, policy, uri, description="", dialect="urn:ibm:secur
123123

124124
if formatting == 'json':
125125
if tools.version_compare(isamAppliance.facts["version"], "10.0.6.0") < 0:
126-
warnings.append(f"Appliance is at version: {isamAppliance.facts["version"]}. JSON format not supported unless at least 10.0.6.0. Setting to xml.")
126+
warnings.append(f"Appliance is at version: {isamAppliance.facts['version']}. JSON format not supported unless at least 10.0.6.0. Setting to xml.")
127127
formatting = 'xml'
128128

129129

@@ -179,11 +179,11 @@ def update(isamAppliance, name, policy, uri, description="",
179179
}
180180
if formatting == 'json':
181181
if tools.version_compare(isamAppliance.facts["version"], "10.0.6.0") < 0:
182-
warnings.append(f"Appliance is at version: {isamAppliance.facts["version"]}. JSON format not supported unless at least 10.0.6.0. Setting to xml.")
182+
warnings.append(f"Appliance is at version: {isamAppliance.facts['version']}. JSON format not supported unless at least 10.0.6.0. Setting to xml.")
183183
formatting = 'xml'
184184
if enabled is not None:
185185
if tools.version_compare(isamAppliance.facts["version"], "9.0.2.1") < 0:
186-
warnings.append(f"Appliance is at version: {isamAppliance.facts["version"]}. Enabled parameter not supported unless at least 9.0.2.1. Ignoring value.")
186+
warnings.append(f"Appliance is at version: {isamAppliance.facts['version']}. Enabled parameter not supported unless at least 9.0.2.1. Ignoring value.")
187187
else:
188188
json_data["enabled"] = enabled
189189
if force is not True:

ibmsecurity/isam/base/ssl_certificates/personal_certificate.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,11 @@ def import_cert(isamAppliance, kdb_id, cert, label=None, password=None, check_mo
246246
# Delete the previous certificate and add the new.
247247
# The certificate exists with these values; so we want to overwrite it
248248
retObjDel = delete(isamAppliance, kdb_id, label, force=True, ignore_error=True)
249-
logger.debug(f"First try deleting {label}\n\n{retObjDel.get("rc", 200)}\n")
249+
logger.debug(f"First try deleting {label}\n\n{retObjDel.get('rc', 200)}\n")
250250
if retObjDel.get("rc", 200) > 400:
251251
# Delete using the subject as label
252252
retObjDel = delete(isamAppliance, kdb_id, certsubject, force=True, ignore_error=True)
253-
logger.debug(f"Second try at deleting using the new subject {certsubject}\n\n{retObjDel.get("rc", 200)}\n")
253+
logger.debug(f"Second try at deleting using the new subject {certsubject}\n\n{retObjDel.get('rc', 200)}\n")
254254
# Try again
255255
retObj = isamAppliance.invoke_post_files(
256256
"Retry Importing a personal certificate into a certificate database",
@@ -329,7 +329,7 @@ def _check(isamAppliance, kdb_id, label=None, certificate=None, password=None, s
329329
newCert['subject'] = x509.subject.rfc4514_string()
330330
newCert['issuer'] = x509.issuer.rfc4514_string()
331331
logger.info(
332-
'Upgrade cryptography to version 36.0.0. Install with pip install cryptography')
332+
'Upgrade cryptography to (at least) version 36.0.0. Install with pip install cryptography')
333333

334334
newCert['notafter'] = x509.not_valid_after_utc.strftime("%Y-%m-%d")
335335
newCert['notbefore'] = x509.not_valid_before_utc.strftime("%Y-%m-%d")

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
77

88
[project]
99
name = "ibmsecurity"
10-
version = "2025.11.14.0"
10+
version = "2025.12.11.0"
1111
authors = [
1212
{ name="IBM", email="secorch@wwpdl.vnet.ibm.com" },
1313
]

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
packages=find_packages(exclude=["test.*","test"]),
66
# Date of release used for version - please be sure to use YYYY.MM.DD.seq#, MM and DD should be two digits e.g. 2017.02.05.0
77
# seq# will be zero unless there are multiple release on a given day - then increment by one for additional release for that date
8-
version="2025.11.14.0",
8+
version="2025.12.11.0",
99
description="Idempotent functions for IBM Security Appliance REST APIs",
1010
author="IBM",
1111
author_email="secorch@wwpdl.vnet.ibm.com",

0 commit comments

Comments
 (0)