Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid setting SFTP rename flags below version 5 #754

Merged
merged 2 commits into from
Dec 22, 2021
Merged

Avoid setting SFTP rename flags below version 5 #754

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3cd056
Avoid setting SFTP rename flags below version 5 (#751)
exceptionfactory Dec 21, 2021
509bc0d
Merge branch 'master' into issue-751
hierynomus Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/main/java/net/schmizz/sshj/sftp/SFTPEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,17 @@ public void rename(String oldPath, String newPath, Set<RenameFlags> flags)
if (operativeVersion < 1)
throw new SFTPException("RENAME is not supported in SFTPv" + operativeVersion);

long renameFlagMask = 0L;
for (RenameFlags flag : flags) {
renameFlagMask = renameFlagMask | flag.longValue();
final Request request = newRequest(PacketType.RENAME).putString(oldPath, sub.getRemoteCharset()).putString(newPath, sub.getRemoteCharset());
// SFTP Version 5 introduced rename flags according to Section 6.5 of the specification
if (operativeVersion >= 5) {
long renameFlagMask = 0L;
for (RenameFlags flag : flags) {
renameFlagMask = renameFlagMask | flag.longValue();
}
request.putUInt32(renameFlagMask);
}

doRequest(
newRequest(PacketType.RENAME).putString(oldPath, sub.getRemoteCharset()).putString(newPath, sub.getRemoteCharset()).putUInt32(renameFlagMask)
).ensureStatusPacketIsOK();
doRequest(request).ensureStatusPacketIsOK();
}

public String canonicalize(String path)
Expand Down