Skip to content

[Keyvault] az keyvault key sign/verify: Fix --digest to accept base64 encoded string #30521

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

Merged
evelyn-ys merged 2 commits into from
Dec 23, 2024
Merged

[Keyvault] az keyvault key sign/verify: Fix --digest to accept base64 encoded string #30521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bfedaa
az keyvault key sign/verify: Fix `--digest` to accept base64 encoded …
evelyn-ys Dec 16, 2024
838ab41
address comments
evelyn-ys Dec 17, 2024
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
8 changes: 3 additions & 5 deletions src/azure-cli/azure/cli/command_modules/keyvault/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# --------------------------------------------------------------------------------------------

# pylint: disable=too-many-lines
import base64
import codecs
import hashlib
import json
Expand Down Expand Up @@ -1130,16 +1131,15 @@ def sign_key(cmd, client, algorithm, digest, name=None, version=None):
SignatureAlgorithm = cmd.loader.get_sdk('SignatureAlgorithm', mod='crypto._enums',
resource_type=ResourceType.DATA_KEYVAULT_KEYS)
crypto_client = client.get_cryptography_client(name, key_version=version)
return crypto_client.sign(SignatureAlgorithm(algorithm), digest.encode('utf-8'))
return crypto_client.sign(SignatureAlgorithm(algorithm), base64.b64decode(digest.encode('utf-8')))


def verify_key(cmd, client, algorithm, digest, signature, name=None, version=None):
import base64
SignatureAlgorithm = cmd.loader.get_sdk('SignatureAlgorithm', mod='crypto._enums',
resource_type=ResourceType.DATA_KEYVAULT_KEYS)
crypto_client = client.get_cryptography_client(name, key_version=version)
return crypto_client.verify(SignatureAlgorithm(algorithm),
digest.encode('utf-8'),
base64.b64decode(digest.encode('utf-8')),
base64.b64decode(signature.encode('utf-8')))


Expand Down Expand Up @@ -1493,7 +1493,6 @@ def download_secret(client, file_path, name=None, encoding=None, version=''): #
f.write(secret_value)
else:
if encoding == 'base64':
import base64
decoded = base64.b64decode(secret_value)
elif encoding == 'hex':
import binascii
Expand Down Expand Up @@ -1558,7 +1557,6 @@ def download_certificate(client, file_path, certificate_name=None, encoding='PEM
if encoding == 'DER':
f.write(cert)
else:
import base64
encoded = base64.encodebytes(cert)
if isinstance(encoded, bytes):
encoded = encoded.decode("utf-8")
Expand Down
Loading