Merge pull request #346 from lmagyar/pr-fix-new-file-upload-with-sshfs

Fix new file upload on SAF and VirtualFS with SSHFS

primitiveFTPd/src/org/primftpd/filesystem/SafFile.java

@@ -43,7 +43,7 @@ public abstract class SafFile<T> extends AbstractFile {
     private DocumentFile documentFile;
     private final DocumentFile parentDocumentFile;
 
-    private final boolean writable;
+    private boolean writable;
 
     public SafFile(
             ContentResolver contentResolver,
@@ -225,4 +225,28 @@ public InputStream createInputStream(long offset) throws IOException {
 
         return null;
     }
+
+    // This method is the equivalent of java.io.File.createNewFile(), it creates the file and updates the cached properties of it.
+    // This method is required by SSHFS, because it calls STAT and later FSTAT on created new files,
+    // STAT requires a created new file, FSTAT requires updated properties.
+    // This method is not required by normal clients who simply open, write and close the file.
+    boolean createNewFile() throws IOException {
+        logger.trace("[{}] createNewFile()", name);
+        try {
+            documentFile = parentDocumentFile.createFile(null, name);
+        } catch (Exception e) {
+            throw new IOException("Failed to create file", e);
+        }
+
+        if (documentFile != null) {
+            lastModified = documentFile.lastModified();
+            size = 0;
+            readable = documentFile.canRead();
+            exists = true;
+            writable = documentFile.canWrite();
+            return true;
+        }
+
+        return false;
+    }
 }

primitiveFTPd/src/org/primftpd/filesystem/SafSshFile.java

@@ -7,6 +7,7 @@
 import org.apache.sshd.common.file.SshFile;
 import org.primftpd.services.PftpdService;
 
+import java.io.IOException;
 import java.util.List;
 
 public class SafSshFile extends SafFile<SshFile> implements SshFile {
@@ -67,6 +68,15 @@ public String getOwner() {
         return session.getUsername();
     }
 
+    @Override
+    public boolean create() throws IOException {
+        logger.trace("[{}] create()", name);
+        // This call is required by SSHFS, because it calls STAT and later FSTAT on created new files,
+        // STAT requires a created new file, FSTAT requires updated properties.
+        // This call is not required by normal clients who simply open, write and close the file.
+        return createNewFile();
+    }
+
     @Override
     public SshFile getParentFile() {
         logger.trace("[{}] getParentFile()", name);

primitiveFTPd/src/org/primftpd/filesystem/VirtualSshFile.java

@@ -4,6 +4,7 @@
 import org.apache.sshd.common.file.SshFile;
 import org.primftpd.services.PftpdService;
 
+import java.io.IOException;
 import java.util.List;
 
 public class VirtualSshFile extends VirtualFile<SshFile> implements SshFile {
@@ -53,6 +54,22 @@ public String getOwner() {
         return session.getUsername();
     }
 
+    @Override
+    public boolean create() throws IOException {
+        logger.trace("[{}] create()", name);
+        // This call and the update of the cached properties is required by SSHFS, because it calls STAT and later FSTAT on created new files,
+        // STAT requires a created new file, FSTAT requires updated properties.
+        // This call is not required by normal clients who simply open, write and close the file.
+        if (delegate != null && ((SshFile) delegate).create()) {
+            lastModified = delegate.getLastModified();
+            size = 0;
+            readable = delegate.isReadable();
+            exists = true;
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public boolean isExecutable() {
         logger.trace("[{}] isExecutable()", name);