Skip to content

[patch] Catch SSLError and RequestException in validateIBMEntitlementKey, return None instead of raising #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jeel-Oza wants to merge 2 commits into
base: stable
Choose a base branch
from
Open

[patch] Catch SSLError and RequestException in validateIBMEntitlementKey, return None instead of raising #497

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
040141b
[patch] Catch SSLError and RequestException in validateIBMEntitlement…
Sep 18, 2026
eeb3183
Merge branch 'stable' into mascore-16263
Jeel-Oza Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/mas/devops/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def isVersionEqualOrAfter(_compare_to_version, _current_version):
return current_version.compare(compareToVersion) >= 0


def validateIBMEntitlementKey(entitlementKey: str, repository: str = "cp/mas/coreapi", timeout: int = 30) -> bool:
def validateIBMEntitlementKey(entitlementKey: str, repository: str = "cp/mas/coreapi", timeout: int = 30):
"""Validate IBM entitlement key against cp.icr.io registry.

This function validates an IBM entitlement key by attempting to obtain
Expand All @@ -95,10 +95,9 @@ def validateIBMEntitlementKey(entitlementKey: str, repository: str = "cp/mas/cor
timeout (int, optional): Request timeout in seconds. Defaults to 30.

Returns:
bool: True if key is valid and grants access to the repository, False otherwise.

Raises:
requests.exceptions.RequestException: If network request fails.
True if key is valid and grants access to the repository.
False if authentication failed (key is wrong).
None if a network or SSL error prevented validation (key status unknown).
"""
try:
registry_url = f"https://cp.icr.io/v2/{repository}/tags/list"
Expand Down Expand Up @@ -166,6 +165,9 @@ def validateIBMEntitlementKey(entitlementKey: str, repository: str = "cp/mas/cor
logger.error(f"Unexpected response (HTTP {response.status_code})")
return False

except requests.exceptions.SSLError as e:
logger.error(f"SSL certificate verification failed — could not reach cp.icr.io: {e}")
return None
except requests.exceptions.RequestException as e:
logger.error(f"Request failed: {e}")
raise
return None
Loading