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

Jump to bottom

Setting timestamp on file results in 0 byte file #15496

Merged
merged 2 commits into from Dec 29, 2023
Merged

Setting timestamp on file results in 0 byte file #15496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a33e12
Failing test.
ylangisc Dec 28, 2023
6b635e3
Partially revert 1a1ff1c8.
ylangisc Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion smb/src/main/java/ch/cyberduck/core/smb/SMBTimestampFeature.java
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@ public void setTimestamp(final Path file, final TransferStatus status) throws Ba
Collections.singleton(AccessMask.FILE_WRITE_ATTRIBUTES),
Collections.singleton(FileAttributes.FILE_ATTRIBUTE_NORMAL),
Collections.singleton(SMB2ShareAccess.FILE_SHARE_READ),
SMB2CreateDisposition.FILE_OVERWRITE,
SMB2CreateDisposition.FILE_OPEN,
Collections.singleton(SMB2CreateOptions.FILE_NON_DIRECTORY_FILE))) {
final FileBasicInformation updatedBasicInformation = new FileBasicInformation(
status.getCreated() != null ? FileTime.ofEpochMillis(status.getCreated()) : FileBasicInformation.DONT_SET,
Expand Down
30 changes: 23 additions & 7 deletions smb/src/test/java/ch/cyberduck/core/smb/SMBTimestampFeatureTest.java
View file
Open in desktop
Expand Up @@ -16,18 +16,24 @@
*/

import ch.cyberduck.core.AlphanumericRandomStringService;
import ch.cyberduck.core.DisabledConnectionCallback;
import ch.cyberduck.core.DisabledLoginCallback;
import ch.cyberduck.core.Path;
import ch.cyberduck.core.PathAttributes;
import ch.cyberduck.core.exception.NotfoundException;
import ch.cyberduck.core.features.Delete;
import ch.cyberduck.core.features.Write;
import ch.cyberduck.core.io.StreamCopier;
import ch.cyberduck.core.shared.DefaultHomeFinderService;
import ch.cyberduck.core.transfer.TransferStatus;
import ch.cyberduck.test.TestcontainerTest;

import org.apache.commons.lang3.RandomUtils;
import org.junit.Test;
import org.junit.experimental.categories.Category;

import java.io.ByteArrayInputStream;
import java.io.OutputStream;
import java.util.Collections;
import java.util.EnumSet;

Expand All @@ -49,16 +55,26 @@ public void testTimestampFileNotfound() throws Exception {
public void testTimestampFile() throws Exception {
final TransferStatus status = new TransferStatus();
final Path home = new DefaultHomeFinderService(session).find();
final Path f = new SMBTouchFeature(session).touch(
new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
assertNotEquals(-1L, f.attributes().getModificationDate());
final Path test = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file));
final int length = 100;
final byte[] content = RandomUtils.nextBytes(length);
status.setLength(content.length);
status.setModified(System.currentTimeMillis());
final Write writer = new SMBWriteFeature(session);
status.setChecksum(writer.checksum(test, status).compute(new ByteArrayInputStream(content), status));
final OutputStream out = writer.write(test, status, new DisabledConnectionCallback());
assertNotNull(out);
new StreamCopier(status, status).transfer(new ByteArrayInputStream(content), out);
// make sure timestamps are different
long oldTime = new SMBAttributesFinderFeature(session).find(f).getModificationDate();
final PathAttributes attributes = new SMBAttributesFinderFeature(session).find(test);
assertNotEquals(-1L, attributes.getModificationDate());
long oldTime = attributes.getModificationDate();
status.setModified(oldTime + 2000);
new SMBTimestampFeature(session).setTimestamp(f, status);
PathAttributes newAttributes = new SMBAttributesFinderFeature(session).find(f);
new SMBTimestampFeature(session).setTimestamp(test, status);
PathAttributes newAttributes = new SMBAttributesFinderFeature(session).find(test);
assertEquals(status.getModified().longValue(), newAttributes.getModificationDate());
new SMBDeleteFeature(session).delete(Collections.singletonList(f), new DisabledLoginCallback(), new Delete.DisabledCallback());
assertEquals(content.length, newAttributes.getSize());
new SMBDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback());
}

@Test
Expand Down