jacobpascual/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #394 from romanz/latest-ssh

Browse Source 
Don't fail if not all request is parsed
This commit is contained in:
Roman Zeyde
2022-05-21 13:17:26 +03:00
committed by GitHub
parent 80bfda7899 8d4536b37a
commit 5832d4a67b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libagent/ssh/client.py
View File

@@ -76,5 +76,7 @@ def parse_ssh_blob(data):
public_key = util.read_frame(i) public_key = util.read_frame(i)
res['public_key'] = formats.parse_pubkey(public_key) res['public_key'] = formats.parse_pubkey(public_key)
assert not i.read() unparsed = i.read()
if unparsed:
log.warning('unparsed blob: %r', unparsed)
return res return res

9
libagent/ssh/protocol.py
View File

@@ -88,7 +88,7 @@ class Handler:
msg_code('SSH_AGENTC_REQUEST_RSA_IDENTITIES'): _legacy_pubs, msg_code('SSH_AGENTC_REQUEST_RSA_IDENTITIES'): _legacy_pubs,
msg_code('SSH2_AGENTC_REQUEST_IDENTITIES'): self.list_pubs, msg_code('SSH2_AGENTC_REQUEST_IDENTITIES'): self.list_pubs,
msg_code('SSH2_AGENTC_SIGN_REQUEST'): self.sign_message, msg_code('SSH2_AGENTC_SIGN_REQUEST'): self.sign_message,
msg_code('SSH_AGENTC_EXTENSION'): self.unsupported_extension, msg_code('SSH_AGENTC_EXTENSION'): _unsupported_extension,
} }
def handle(self, msg): def handle(self, msg):
@@ -166,6 +166,7 @@ class Handler:
code = util.pack('B', msg_code('SSH2_AGENT_SIGN_RESPONSE')) code = util.pack('B', msg_code('SSH2_AGENT_SIGN_RESPONSE'))
return util.frame(code, data) return util.frame(code, data)
def unsupported_extension(self, buf):
code = util.pack('B', msg_code('SSH_AGENT_EXTENSION_FAILURE')) def _unsupported_extension():
return util.frame(code) code = util.pack('B', msg_code('SSH_AGENT_EXTENSION_FAILURE'))
return util.frame(code)