Revert "Merge pull request #18 from sosthene-nitrokey/chunk-api"

This reverts commit cda69dc, reversing
changes made to c2cae35.

Author: robin-nitrokey

src/api.rs

@@ -43,17 +43,12 @@ generate_enums! {
     ReadDirFilesFirst: 13
     ReadDirFilesNext: 14
     ReadFile: 15
-    ReadChunk: 65
     Metadata: 26
     // ReadCounter: 7
     RandomBytes: 16
     SerializeKey: 17
     Sign: 18
     WriteFile: 19
-    StartChunkedWrite: 66
-    WriteChunk: 67
-    FlushChunks: 68
-    AbortChunkedWrite: 69
     UnsafeInjectKey: 20
     UnsafeInjectSharedKey: 21
     UnwrapKey: 22
@@ -247,10 +242,6 @@ pub mod request {
         ReadFile:
           - location: Location
           - path: PathBuf
-        ReadChunk:
-          - location: Location
-          - pos: OpenSeekFrom
-          - path: PathBuf
 
         Metadata:
           - location: Location
@@ -292,24 +283,6 @@ pub mod request {
           - data: Message
           - user_attribute: Option<UserAttribute>
 
-        StartChunkedWrite:
-          - location: Location
-          - path: PathBuf
-          - data: Message
-          - user_attribute: Option<UserAttribute>
-
-        WriteChunk:
-          - location: Location
-          - pos: OpenSeekFrom
-          - path: PathBuf
-          - data: Message
-        FlushChunks:
-          - location: Location
-          - path: PathBuf
-        AbortChunkedWrite:
-          - location: Location
-          - path: PathBuf
-
         UnsafeInjectKey:
           - mechanism: Mechanism        // -> implies key type
           - raw_key: SerializedKey
@@ -461,9 +434,6 @@ pub mod reply {
 
         ReadFile:
           - data: Message
-        ReadChunk:
-          - data: Message
-          - len: usize
 
         Metadata:
           - metadata: Option<crate::types::Metadata>
@@ -488,11 +458,6 @@ pub mod reply {
             - signature: Signature
 
         WriteFile:
-        StartChunkedWrite:
-        WriteChunk:
-        FlushChunks:
-        AbortChunkedWrite:
-            - aborted: bool
 
         Verify:
             - valid: bool

src/client.rs

@@ -622,20 +622,6 @@ pub trait FilesystemClient: PollClient {
         self.request(request::ReadFile { location, path })
     }
 
-    // Read part of a file, up to 1KiB starting at `pos`
-    fn read_file_chunk(
-        &mut self,
-        location: Location,
-        path: PathBuf,
-        pos: OpenSeekFrom,
-    ) -> ClientResult<'_, reply::ReadChunk, Self> {
-        self.request(request::ReadChunk {
-            location,
-            path,
-            pos,
-        })
-    }
-
     /// Fetch the Metadata for a file or directory
     ///
     /// If the file doesn't exists, return None
@@ -674,64 +660,6 @@ pub trait FilesystemClient: PollClient {
             user_attribute,
         })
     }
-
-    /// Begin writing a file that can be larger than 1KiB
-    ///
-    /// More chunks can be written with [`write_file_chunk`](FilesystemClient::write_file_chunk).
-    /// Before the data becomes readable, it needs to be flushed with [`flush_chunks`](FilesystemClient::flush_chunks), or aborted with [`abort_chunked_write`](FilesystemClient::abort_chunked_write)
-    ///
-    /// Chunked writes are buffered in memory. Failing to abort or flush a chunked write will lead to a memory leak, that can be solved by a power cycle.
-    fn start_chunked_write(
-        &mut self,
-        location: Location,
-        path: PathBuf,
-        data: Message,
-        user_attribute: Option<UserAttribute>,
-    ) -> ClientResult<'_, reply::StartChunkedWrite, Self> {
-        self.request(request::StartChunkedWrite {
-            location,
-            path,
-            data,
-            user_attribute,
-        })
-    }
-
-    /// Write part of a file
-    ///
-    /// See [`start_chunked_write`](FilesystemClient::start_chunked_write).
-    fn write_file_chunk(
-        &mut self,
-        location: Location,
-        path: PathBuf,
-        data: Message,
-        pos: OpenSeekFrom,
-    ) -> ClientResult<'_, reply::WriteChunk, Self> {
-        self.request(request::WriteChunk {
-            location,
-            path,
-            data,
-            pos,
-        })
-    }
-
-    /// Flush a file opened with [`start_chunked_write`](FilesystemClient::start_chunked_write).
-    /// Only after this will the content of the file be readable
-    fn flush_chunks(
-        &mut self,
-        location: Location,
-        path: PathBuf,
-    ) -> ClientResult<'_, reply::FlushChunks, Self> {
-        self.request(request::FlushChunks { location, path })
-    }
-
-    /// Abort writes to a file opened with [`start_chunked_write`](FilesystemClient::start_chunked_write).
-    fn abort_chunked_write(
-        &mut self,
-        location: Location,
-        path: PathBuf,
-    ) -> ClientResult<'_, reply::AbortChunkedWrite, Self> {
-        self.request(request::AbortChunkedWrite { location, path })
-    }
 }
 
 /// All the other methods that are fit to expose.

src/lib.rs

@@ -36,7 +36,6 @@ pub mod serde_extensions;
 pub mod service;
 pub mod store;
 pub mod types;
-pub mod utils;
 
 #[cfg(feature = "virt")]
 #[cfg_attr(docsrs, doc(cfg(feature = "virt")))]

src/service.rs

@@ -433,14 +433,6 @@ impl<P: Platform> ServiceResources<P> {
                 }))
             }
 
-            Request::ReadChunk(request) => {
-                let (data,len) = filestore.read_chunk(&request.path,request.location,request.pos)?;
-                Ok(Reply::ReadChunk(reply::ReadChunk {
-                    data,
-                    len,
-                }))
-            }
-
             Request::Metadata(request) => {
                 Ok(Reply::Metadata(reply::Metadata{
                     metadata: filestore.metadata(&request.path, request.location)?
@@ -490,22 +482,6 @@ impl<P: Platform> ServiceResources<P> {
                 filestore.write(&request.path, request.location, &request.data)?;
                 Ok(Reply::WriteFile(reply::WriteFile {} ))
             }
-            Request::StartChunkedWrite(request) => {
-                filestore.start_chunked_write(&request.path, request.location, &request.data)?;
-                Ok(Reply::StartChunkedWrite(reply::StartChunkedWrite {} ))
-            }
-            Request::WriteChunk(request) => {
-                 filestore.write_chunk(&request.path, request.location, &request.data,request.pos)?;
-                Ok(Reply::WriteChunk(reply::WriteChunk {} ))
-            }
-            Request::FlushChunks(request) => {
-                filestore.flush_chunks(&request.path, request.location)?;
-                Ok(Reply::FlushChunks(reply::FlushChunks {} ))
-            }
-            Request::AbortChunkedWrite(request) => {
-                let aborted = filestore.abort_chunked_write(&request.path, request.location);
-                Ok(Reply::AbortChunkedWrite(reply::AbortChunkedWrite {aborted} ))
-            }
 
             Request::UnwrapKey(request) => {
                 match request.mechanism {