INT-4243: Upgrade to sshd 1.4 #2090
Conversation
JIRA: https://jira.spring.io/browse/INT-4243 Remove newline char from key exchange.
| byte[] decodeBuffer = Base64.decodeBase64(StreamUtils.copyToByteArray(stream)); | ||
| byte[] keyBytes = StreamUtils.copyToByteArray(stream); | ||
| // strip any newline chars | ||
| while (keyBytes[keyBytes.length - 1] == 0x0a || keyBytes[keyBytes.length - 1] == 0x0c) { |
There was a problem hiding this comment.
Any ideas why that failed sporadically?
Thanks
Merging BTW
There was a problem hiding this comment.
See my comment on the JIRA - problem is unrelated but we should do the upgrade anyway.
| server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser"))); | ||
| server.setSubsystemFactories(Collections.<NamedFactory<Command>>singletonList(new SftpSubsystemFactory())); | ||
| server.setFileSystemFactory( | ||
| new VirtualFileSystemFactory(Paths.get(remoteTemporaryFolder.getRoot().getAbsolutePath()))); |
There was a problem hiding this comment.
Why remoteTemporaryFolder.getRoot().toPath() doesn't work for you?
| while (keyBytes[keyBytes.length - 1] == 0x0a || keyBytes[keyBytes.length - 1] == 0x0c) { | ||
| keyBytes = Arrays.copyOf(keyBytes, keyBytes.length - 1); | ||
| } | ||
| byte[] decodeBuffer = Base64Utils.decode(keyBytes); |
There was a problem hiding this comment.
Hm... Fails for me on Windows like this:
java.lang.IllegalArgumentException: Illegal base64 character d
at java.util.Base64$Decoder.decode0(Base64.java:714)
at java.util.Base64$Decoder.decode(Base64.java:526)
at org.springframework.util.Base64Utils.decode(Base64Utils.java:63)
at org.springframework.integration.sftp.session.SftpServerTests.decodePublicKey(SftpServerTests.java:135)
There was a problem hiding this comment.
Oops, my mistake should be 0x0d not ox0c
More diagnostics. It appears the new server doesn't close the file when the session is closed. In the streaming test, consume the stream before closing the session.
| import java.io.File; | ||
| import java.io.InputStream; | ||
| import java.util.List; | ||
| import java.util.regex.Matcher; | ||
|
|
||
| import org.apache.log4j.lf5.util.StreamUtils; |
There was a problem hiding this comment.
??? Let me guess you were going to use org.springframework.util.StreamUtils
| @@ -117,12 +119,14 @@ public void testSftpInboundStreamFlow() throws Exception { | |||
| assertNotNull(message); | |||
| assertThat(message.getPayload(), instanceOf(InputStream.class)); | |||
| assertThat(message.getHeaders().get(FileHeaders.REMOTE_FILE), isOneOf(" sftpSource1.txt", "sftpSource2.txt")); | |||
| StreamUtils.copy((InputStream) message.getPayload(), new ByteArrayOutputStream()); | |||
There was a problem hiding this comment.
Well, my solution is actually like this:
((InputStream) message.getPayload()).close();
Because the problem with the file on Windows that we have an open stream to it. And, yeah..., exactly payload is InputStream in case of streaming inbound channel adapter.
There was a problem hiding this comment.
ok; feel free to fix that way.
There was a problem hiding this comment.
Interestingly, windows did not say that the file deletion failed, just silently left the file in place, preventing the deletion of the directory.
There was a problem hiding this comment.
Well, actually it does, if we check the result of the File.delete().
And that is exactly what we are doing now with all those your new log diagnostics.
OK, merging having your agreement...
I also will increase the timeout in that Redis test
There was a problem hiding this comment.
Right that's what I am saying; on my Windows VM, the file.delete() was successful (I didn't get the "couldn't delete" message) - that's why I added the additional "Contents" log when the directory delete fails.
| } | ||
| } | ||
| } | ||
| file.delete(); | ||
| logger.info("Deleting: " + file + " in " + testName.getMethodName()); |
There was a problem hiding this comment.
I think we have figure out the problem with files and we don't need these diagnostics any more.
Let me know and I'll polish on merge respectively.
Thank you for the fix any way!
There was a problem hiding this comment.
I figured it won't hurt leaving these at INFO level - in case we have problems in future.
|
Back-ported to |
JIRA: https://jira.spring.io/browse/INT-4243
Remove newline char from key exchange.
we could consider just backporting the newline stripping if updating the test server version will cause issues with IO