-
Notifications
You must be signed in to change notification settings - Fork 594
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
adds fallback to posix-rename@openssh.com extension if possible and c… (
#827) * adds fallback to posix-rename@openssh.com extension if possible and communicates possible problems with flags to the developer * Adds '{}' around if/else statements * adds basic tests for file rename * fix comments * fixes indentation * adds helper methods to make existing sftp rename tests more concise * adds basic test for atomic rewrite * adds possibility to request a specific client version (e.g. for testing purposes) * adds testcases for SFTP rename flags fallback behaviour * refactoring to make SFTPEngine.init(int requestedVersion) protected --------- Co-authored-by: Florian Klemenz <florian.klemenz@fau.de> Co-authored-by: Jeroen van Erp <jeroen@hierynomus.com>
- Loading branch information
3 people
committed
Oct 23, 2023
1 parent
542bb35
commit 4774721
Showing
2 changed files
with
321 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
237 changes: 237 additions & 0 deletions
237
src/test/java/net/schmizz/sshj/sftp/RemoteFileRenameTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,237 @@ | ||
| /* | ||
| * Copyright (C)2009 - SSHJ Contributors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package net.schmizz.sshj.sftp; | ||
|
|
||
| import com.hierynomus.sshj.test.SshServerExtension; | ||
| import net.schmizz.sshj.SSHClient; | ||
| import net.schmizz.sshj.common.ByteArrayUtils; | ||
| import org.apache.sshd.common.util.io.IoUtils; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.RegisterExtension; | ||
| import org.junit.jupiter.api.io.TempDir; | ||
|
|
||
| import java.io.*; | ||
| import java.util.EnumSet; | ||
| import java.util.HashSet; | ||
| import java.util.Random; | ||
| import java.util.Set; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.fail; | ||
|
|
||
| /** | ||
| * Testing of remote file rename using different combinations of net.schmizz.sshj.sftp.RenameFlags with | ||
| * possible workarounds for SFTP protocol versions lower than 5 that do not natively support these flags. | ||
| */ | ||
| public class RemoteFileRenameTest { | ||
| @RegisterExtension | ||
| public SshServerExtension fixture = new SshServerExtension(); | ||
|
|
||
| @TempDir | ||
| public File temp; | ||
|
|
||
| @Test | ||
| public void shouldOverwriteFileWhenRequested() throws IOException { | ||
| // create source file | ||
| final byte[] sourceBytes = generateBytes(32); | ||
| File sourceFile = newTempFile("shouldOverwriteFileWhenRequested-source.bin", sourceBytes); | ||
|
|
||
| // create target file | ||
| final byte[] targetBytes = generateBytes(32); | ||
| File targetFile = newTempFile("shouldOverwriteFileWhenRequested-target.bin", targetBytes); | ||
|
|
||
| // rename with overwrite | ||
| Set<RenameFlags> flags = EnumSet.of(RenameFlags.OVERWRITE); | ||
| SFTPEngine sftp = sftpInit(); | ||
| sftp.rename(sourceFile.getPath(), targetFile.getPath(), flags); | ||
|
|
||
| // check if rename was successful | ||
| assertThat("The source file should not exist anymore", !sourceFile.exists()); | ||
| assertThat("The contents of the target file should be equal to the contents previously written " + | ||
| "to the source file", fileContentEquals(targetFile, sourceBytes)); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldNotOverwriteFileWhenNotRequested() throws IOException { | ||
| // create source file | ||
| final byte[] sourceBytes = generateBytes(32); | ||
| File sourceFile = newTempFile("shouldNotOverwriteFileWhenNotRequested-source.bin", sourceBytes); | ||
|
|
||
| // create target file | ||
| final byte[] targetBytes = generateBytes(32); | ||
| File targetFile = newTempFile("shouldNotOverwriteFileWhenNotRequested-target.bin", targetBytes); | ||
|
|
||
| // rename without overwrite -> should fail | ||
| Boolean exceptionThrown = false; | ||
| Set<RenameFlags> flags = new HashSet<>(); | ||
| SFTPEngine sftp = sftpInit(); | ||
| try { | ||
| sftp.rename(sourceFile.getPath(), targetFile.getPath(), flags); | ||
| } | ||
| catch (SFTPException e) { | ||
| exceptionThrown = true; | ||
| } | ||
|
|
||
| // check if rename failed as it should | ||
| assertThat("The source file should still exist", sourceFile.exists()); | ||
| assertThat("The contents of the target file should be equal to the contents previously written to it", | ||
| fileContentEquals(targetFile, targetBytes)); | ||
| assertThat("An appropriate exception should have been thrown", exceptionThrown); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldUseAtomicRenameWhenRequestedWithOverwriteOnInsufficientProtocolVersion() throws IOException { | ||
| // create source file | ||
| final byte[] sourceBytes = generateBytes(32); | ||
| File sourceFile = newTempFile("shouldUseAtomicRenameWhenRequestedWithOverwriteOnInsufficientProtocolVersion-source.bin", sourceBytes); | ||
|
|
||
| // create target file | ||
| final byte[] targetBytes = generateBytes(32); | ||
| File targetFile = newTempFile("shouldUseAtomicRenameWhenRequestedWithOverwriteOnInsufficientProtocolVersion-target.bin", targetBytes); | ||
|
|
||
| // atomic rename with overwrite -> should work | ||
| Set<RenameFlags> flags = EnumSet.of(RenameFlags.OVERWRITE, RenameFlags.ATOMIC); | ||
| int version = Math.min(SFTPEngine.MAX_SUPPORTED_VERSION, 4); // choose a supported version smaller than 5 | ||
| SFTPEngine sftp = sftpInit(version); | ||
| sftp.rename(sourceFile.getPath(), targetFile.getPath(), flags); | ||
|
|
||
| assertThat("The connection should use the requested protocol version", sftp.getOperativeProtocolVersion() == version); | ||
| assertThat("The source file should not exist anymore", !sourceFile.exists()); | ||
| assertThat("The contents of the target file should be equal to the contents previously written " + | ||
| "to the source file", fileContentEquals(targetFile, sourceBytes)); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void shouldIgnoreAtomicFlagWhenRequestedWithNativeOnInsufficientProtocolVersion() throws IOException { | ||
| // create source file | ||
| final byte[] sourceBytes = generateBytes(32); | ||
| File sourceFile = newTempFile("shouldIgnoreAtomicFlagWhenRequestedWithNativeOnInsufficientProtocolVersion-source.bin", sourceBytes); | ||
|
|
||
| // create target file | ||
| final byte[] targetBytes = generateBytes(32); | ||
| File targetFile = newTempFile("shouldIgnoreAtomicFlagWhenRequestedWithNativeOnInsufficientProtocolVersion-target.bin", targetBytes); | ||
|
|
||
| // atomic flag should be ignored with native | ||
| // -> should fail because target exists and overwrite behaviour is not requested | ||
| Boolean exceptionThrown = false; | ||
| Set<RenameFlags> flags = EnumSet.of(RenameFlags.NATIVE, RenameFlags.ATOMIC); | ||
| int version = Math.min(SFTPEngine.MAX_SUPPORTED_VERSION, 4); // choose a supported version smaller than 5 | ||
| SFTPEngine sftp = sftpInit(version); | ||
| try { | ||
| sftp.rename(sourceFile.getPath(), targetFile.getPath(), flags); | ||
| } | ||
| catch (SFTPException e) { | ||
| exceptionThrown = true; | ||
| } | ||
|
|
||
| assertThat("The connection should use the requested protocol version", sftp.getOperativeProtocolVersion() == version); | ||
| assertThat("The source file should still exist", sourceFile.exists()); | ||
| assertThat("The contents of the target file should be equal to the contents previously written to it", | ||
| fileContentEquals(targetFile, targetBytes)); | ||
| assertThat("An appropriate exception should have been thrown", exceptionThrown); | ||
|
|
||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void shouldFailAtomicRenameWithoutOverwriteOnInsufficientProtocolVersion() throws IOException { | ||
| // create source file | ||
| final byte[] sourceBytes = generateBytes(32); | ||
| File sourceFile = newTempFile("shouldFailAtomicRenameWithoutOverwriteOnInsufficientProtocolVersion-source.bin", sourceBytes); | ||
|
|
||
| // create target file | ||
| File targetFile = new File(temp, "shouldFailAtomicRenameWithoutOverwriteOnInsufficientProtocolVersion-target.bin"); | ||
|
|
||
| // atomic rename without overwrite -> should fail | ||
| Boolean exceptionThrown = false; | ||
| Set<RenameFlags> flags = EnumSet.of(RenameFlags.ATOMIC); | ||
| int version = Math.min(SFTPEngine.MAX_SUPPORTED_VERSION, 4); // choose a supported version smaller than 5 | ||
| SFTPEngine sftp = sftpInit(version); | ||
| try { | ||
| sftp.rename(sourceFile.getPath(), targetFile.getPath(), flags); | ||
| } | ||
| catch (SFTPException e) { | ||
| exceptionThrown = true; | ||
| } | ||
|
|
||
| // check if rename failed as it should (for version < 5) | ||
| assertThat("The connection should use the requested protocol version", sftp.getOperativeProtocolVersion() == version); | ||
| assertThat("The source file should still exist", sourceFile.exists()); | ||
| assertThat("The target file should not exist", !targetFile.exists()); | ||
| assertThat("An appropriate exception should have been thrown", exceptionThrown); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldDoAtomicRenameOnSufficientProtocolVersion() throws IOException { | ||
| // This test will be relevant as soon as sshj supports SFTP protocol version >= 5 | ||
| if (SFTPEngine.MAX_SUPPORTED_VERSION >= 5) { | ||
| // create source file | ||
| final byte[] sourceBytes = generateBytes(32); | ||
| File sourceFile = newTempFile("shouldDoAtomicRenameOnSufficientProtocolVersion-source.bin", sourceBytes); | ||
|
|
||
| // create target file | ||
| File targetFile = new File(temp, "shouldDoAtomicRenameOnSufficientProtocolVersion-target.bin"); | ||
|
|
||
| // atomic rename without overwrite -> should work on version >= 5 | ||
| Set<RenameFlags> flags = EnumSet.of(RenameFlags.ATOMIC); | ||
| SFTPEngine sftp = sftpInit(); | ||
| sftp.rename(sourceFile.getPath(), targetFile.getPath(), flags); | ||
|
|
||
| // check if rename worked as it should (for version >= 5) | ||
| assertThat("The connection should use the requested protocol version", sftp.getOperativeProtocolVersion() >= 5); | ||
| assertThat("The source file should not exist anymore", !sourceFile.exists()); | ||
| assertThat("The target file should exist", targetFile.exists()); | ||
| } | ||
| else { | ||
| // Ignored - cannot test because client does not support protocol version >= 5 | ||
| } | ||
| } | ||
|
|
||
| private byte[] generateBytes(Integer size) { | ||
| byte[] randomBytes = new byte[size]; | ||
| Random rnd = new Random(); | ||
| rnd.nextBytes(randomBytes); | ||
| return randomBytes; | ||
| } | ||
|
|
||
| private File newTempFile(String name, byte[] content) throws IOException { | ||
| File tmpFile = new File(temp, name); | ||
| try (OutputStream fStream = new FileOutputStream(tmpFile)) { | ||
| IoUtils.copy(new ByteArrayInputStream(content), fStream); | ||
| } | ||
| return tmpFile; | ||
| } | ||
|
|
||
| private boolean fileContentEquals(File testFile, byte[] testBytes) throws IOException { | ||
| return ByteArrayUtils.equals( | ||
| IoUtils.toByteArray(new FileInputStream(testFile)), 0, | ||
| testBytes, 0, | ||
| testBytes.length); | ||
| } | ||
|
|
||
| private SFTPEngine sftpInit() throws IOException { | ||
| return sftpInit(SFTPEngine.MAX_SUPPORTED_VERSION); | ||
| } | ||
|
|
||
| private SFTPEngine sftpInit(int version) throws IOException { | ||
| SSHClient ssh = fixture.setupConnectedDefaultClient(); | ||
| ssh.authPassword("test", "test"); | ||
| SFTPEngine sftp = new SFTPEngine(ssh).init(version); | ||
| return sftp; | ||
| } | ||
| } |