Skip to content
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.

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

Improve error handling for invalid App Store Connect API keys #381

Merged
merged 2 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Version 0.48.1
-------------

**Bugfixes**
- Fix error handling for invalid App Store Connect API private keys for `app-store-connect` actions. [PR #381](https://github.com/codemagic-ci-cd/cli-tools/pull/381)

Version 0.48.0
-------------

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "codemagic-cli-tools"
version = "0.48.0"
version = "0.48.1"
description = "CLI tools used in Codemagic builds"
readme = "README.md"
authors = [
Expand Down
2 changes: 1 addition & 1 deletion src/codemagic/__version__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__title__ = "codemagic-cli-tools"
__description__ = "CLI tools used in Codemagic builds"
__version__ = "0.48.0.dev"
__version__ = "0.48.1.dev"
__url__ = "https://github.com/codemagic-ci-cd/cli-tools"
__licence__ = "GNU General Public License v3.0"
28 changes: 27 additions & 1 deletion src/codemagic/tools/app_store_connect.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
from typing import Union
from typing import cast

import jwt

from codemagic import cli
from codemagic.apple import AppStoreConnectApiError
from codemagic.apple.app_store_connect import AppStoreConnectApiClient
Expand Down Expand Up @@ -49,6 +51,7 @@
from codemagic.models import Certificate
from codemagic.models import PrivateKey
from codemagic.models import ProvisioningProfile
from codemagic.utilities import log
from codemagic.utilities import versions

from ._app_store_connect.action_groups import AppsActionGroup
Expand Down Expand Up @@ -228,12 +231,33 @@ def _resolve_app_store_connect_private_key(self):
else:
raise ValueError()

def _validate_api_client_key(self, client: AppStoreConnectApiClient):
"""
When running from a CLI context, ensure that App Store Connect API client is using valid
private key for JWT generation. In case of invalid key exit with descriptive argument error.
"""

if not self.is_cli_invocation():
return

try:
client.generate_auth_headers()
except jwt.InvalidKeyError:
log.get_file_logger(self.__class__).exception("Invalid App Store Connect API key")
asc_docs_base_url = "https://developer.apple.com/documentation/appstoreconnectapi"
error_message = (
"Invalid App Store Connect API key. Make sure to use the private API key downloaded from "
"App Store Connect. Read more about creating App Store Connect API keys from "
f"{asc_docs_base_url}/creating_api_keys_for_app_store_connect_api"
)
AppStoreConnectArgument.PRIVATE_KEY.raise_argument_error(error_message)

@lru_cache(1)
def _get_api_client(self) -> AppStoreConnectApiClient:
assert self._key_identifier is not None
assert self._issuer_id is not None
assert self._private_key is not None
return AppStoreConnectApiClient(
client = AppStoreConnectApiClient(
self._key_identifier,
self._issuer_id,
self._private_key,
Expand All @@ -242,6 +266,8 @@ def _get_api_client(self) -> AppStoreConnectApiClient:
server_error_retries=self._server_error_retries,
enable_jwt_cache=self._enable_jwt_cache,
)
self._validate_api_client_key(client)
return client

@property
def api_client(self) -> AppStoreConnectApiClient:
Expand Down