[SSHD-700] Fix the issues of the agent forwarding implementation of IETF. #34
Conversation
| public static final byte SSH_AGENT_LIST_KEYS = (byte) 204; | ||
| public static final byte SSH_AGENT_PRIVATE_KEY_OP = (byte) 205; | ||
| // Messages sent by the agent | ||
| public static final byte SSH_AGENT_KEY_LIST = 104; |
There was a problem hiding this comment.
These values must be int since byte is only [-127..127]..
There was a problem hiding this comment.
Make changes based on the suggestions.
| Buffer buffer = createBuffer(SshAgentConstants.SSH2_AGENTC_REQUEST_IDENTITIES, 1); | ||
| byte cmd = SshAgentConstants.SSH2_AGENTC_REQUEST_IDENTITIES; | ||
| byte okcmd = SshAgentConstants.SSH2_AGENT_IDENTITIES_ANSWER; | ||
| if (FactoryManager.AGENT_FORWARDING_TYPE_IETF.equals(channelType)) { |
There was a problem hiding this comment.
Use int instead of byte to allow for values > 127...
There was a problem hiding this comment.
Make changes based on the suggestions.
| buffer = request(prepare(buffer)); | ||
| int type = buffer.getUByte(); | ||
| if (type != SshAgentConstants.SSH2_AGENT_IDENTITIES_ANSWER) { | ||
| if (type != okcmd) { |
There was a problem hiding this comment.
This does not seem equivalent to previous code - you are creating a new buffer whereas the previous code was not doing that.
There was a problem hiding this comment.
The previous code also create a new buffer (line 74).
| Buffer buffer = createBuffer(SshAgentConstants.SSH2_AGENTC_SIGN_REQUEST); | ||
| byte cmd = SshAgentConstants.SSH2_AGENTC_SIGN_REQUEST; | ||
| byte okcmd = SshAgentConstants.SSH2_AGENT_SIGN_RESPONSE; | ||
| if (FactoryManager.AGENT_FORWARDING_TYPE_IETF.equals(channelType)) { |
There was a problem hiding this comment.
Use int to allow for values > 127
There was a problem hiding this comment.
Make changes based on the suggestions.
| Buffer buffer = createBuffer(cmd); | ||
| if (FactoryManager.AGENT_FORWARDING_TYPE_IETF.equals(channelType)) { | ||
| buffer.putString("sign"); | ||
| } | ||
| buffer.putPublicKey(key); |
There was a problem hiding this comment.
The code does not seem equivalent to previous one - there is now a new created buffer.
There was a problem hiding this comment.
The previous code also create a new buffer (line 102).
| KeyUtils.getKeyType(key), KeyUtils.getFingerPrint(key), | ||
| algorithm, BufferUtils.toHex(':', signature)); | ||
| byte[] signature = null; | ||
| if (FactoryManager.AGENT_FORWARDING_TYPE_IETF.equals(channelType)) { |
There was a problem hiding this comment.
Don't initialize signature to null
There was a problem hiding this comment.
Make changes based on the suggestions.
| @@ -49,7 +48,7 @@ public ProxyAgentFactory() { | |||
|
|
|||
| @Override | |||
| public List<NamedFactory<Channel>> getChannelForwardingFactories(FactoryManager manager) { | |||
| return UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS; | |||
| return LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS; | |||
There was a problem hiding this comment.
Shouldn't this depends on the O/S type ? E.g:
return OsUtils.isUnix() ? UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS : LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS;
|
Merged - please close the request |
[SSHD-700] Fix the issues of the agent forwarding implementation of IETF.