arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-30 02:18:16 +00:00
Code Issues Releases Wiki Activity

fixup! TEMP logging

Browse Source
This commit is contained in:
M1nd3r 2025-05-06 14:29:33 +02:00
parent 879d7cb8dd
commit d2a2c972e5
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/src/apps/base.py
View File

@ -284,7 +284,6 @@ if utils.USE_THP:
async def handle_ThpCredentialRequest( async def handle_ThpCredentialRequest(
message: ThpCredentialRequest, message: ThpCredentialRequest,
) -> ThpCredentialResponse | Failure: ) -> ThpCredentialResponse | Failure:
from storage.cache_common import CHANNEL_HOST_STATIC_PUBKEY
from trezor.messages import ThpCredentialMetadata, ThpCredentialResponse from trezor.messages import ThpCredentialMetadata, ThpCredentialResponse
from trezor.wire.context import get_context from trezor.wire.context import get_context
from trezor.wire.thp import crypto from trezor.wire.thp import crypto
@ -301,31 +300,22 @@ if utils.USE_THP:
# Assert that context `ctx` is `GenericSessionContext` # Assert that context `ctx` is `GenericSessionContext`
assert isinstance(ctx, GenericSessionContext) assert isinstance(ctx, GenericSessionContext)
host_static_pubkey = ctx.channel.channel_cache.get(CHANNEL_HOST_STATIC_PUBKEY) # Check that request contains a host static pubkey
if message.host_static_pubkey is None:
assert host_static_pubkey is not None return _get_autoconnect_failure(
"Credential request must contain a host static pubkey."
)
# Check that request contains valid credential # Check that request contains valid credential
if message.credential is None: if message.credential is None:
return _get_autoconnect_failure() return _get_autoconnect_failure(
"Credential request must contain a previously issued pairing credential."
)
credential = decode_credential(message.credential) credential = decode_credential(message.credential)
if __debug__: if not validate_credential(credential, message.host_static_pubkey):
from trezor import log return _get_autoconnect_failure(
from trezor.utils import get_bytes_as_str "Credential request contains an invalid pairing credential."
log.warning(
__name__,
"Host key in message %s",
get_bytes_as_str(message.host_static_pubkey),
) )
log.warning(
__name__,
"Host key in channel cache (from handshake) %s",
get_bytes_as_str(host_static_pubkey),
)
if not validate_credential(credential, host_static_pubkey):
return _get_autoconnect_failure()
autoconnect = False autoconnect = False
if message.autoconnect is not None: if message.autoconnect is not None:
@ -342,7 +332,7 @@ if utils.USE_THP:
ctx, cred_metadata.host_name ctx, cred_metadata.host_name
) )
new_cred = issue_credential( new_cred = issue_credential(
host_static_pubkey=host_static_pubkey, host_static_pubkey=message.host_static_pubkey,
credential_metadata=cred_metadata, credential_metadata=cred_metadata,
) )
trezor_static_pubkey = crypto.get_trezor_static_pubkey() trezor_static_pubkey = crypto.get_trezor_static_pubkey()
@ -351,15 +341,16 @@ if utils.USE_THP:
trezor_static_pubkey=trezor_static_pubkey, credential=new_cred trezor_static_pubkey=trezor_static_pubkey, credential=new_cred
) )
def _get_autoconnect_failure() -> Failure: def _get_autoconnect_failure(msg: str) -> Failure:
from trezor.enums import FailureType from trezor.enums import FailureType
from trezor.messages import Failure from trezor.messages import Failure
return Failure( return Failure(
code=FailureType.DataError, code=FailureType.DataError,
message="Credential request must contain a valid credential (previously issued).", message=msg,
) )
else: else:
async def handle_Initialize(msg: Initialize) -> Features: async def handle_Initialize(msg: Initialize) -> Features: