Merge branch 'ro'

Author: radumarias

examples/mount.rs

@@ -39,6 +39,7 @@ async fn main() -> Result<()> {
         false,
         false,
         false,
+        false,
     );
     let handle = mount_point.mount().await?;
     let mut buffer = String::new();

java-bridge/src/lib.rs

@@ -185,6 +185,7 @@ pub extern "system" fn Java_RustLibrary_mount(
         false,
         false,
         false,
+        false,
     );
 
     let handle = match RT.block_on(async {

src/lib.rs

@@ -43,7 +43,6 @@
 //!     args.next(); // skip program name
 //!     let mount_path = args.next().expect("mount_path expected");
 //!     let data_path = args.next().expect("data_path expected");
-//!
 //!     struct PasswordProviderImpl {}
 //!     impl PasswordProvider for PasswordProviderImpl {
 //!         fn get_password(&self) -> Option<SecretString> {
@@ -60,6 +59,7 @@
 //!         false,
 //!         false,
 //!         false,
+//!         false,
 //!     );
 //!     let handle = mount_point.mount().await?;
 //!     let mut buffer = String::new();

src/mount.rs

@@ -36,6 +36,7 @@ pub trait MountPoint {
         allow_other: bool,
         direct_io: bool,
         suid_support: bool,
+        read_only: bool,
     ) -> Self
     where
         Self: Sized;
@@ -74,6 +75,7 @@ pub(crate) trait MountHandleInner: Future<Output = io::Result<()>> {
 /// **`allow_other`** allow other users to access the file system  
 /// **`direct_io`** use direct I/O (bypass page cache for open files)
 /// **`suid_support`** if it should allow setting `SUID` and `SGID` when files are created. On `false` it will unset those flags when creating files
+/// **`read_only`** Set fuse filesystem read-only mount option, default is disabled.
 ///
 #[must_use]
 #[allow(clippy::fn_params_excessive_bools)]
@@ -86,6 +88,7 @@ pub fn create_mount_point(
     allow_other: bool,
     direct_io: bool,
     suid_support: bool,
+    read_only: bool,
 ) -> impl MountPoint {
     MountPointImpl::new(
         mountpoint.to_path_buf(),
@@ -96,6 +99,7 @@ pub fn create_mount_point(
         allow_other,
         direct_io,
         suid_support,
+        read_only,
     )
 }
 

src/mount/dummy.rs

@@ -22,6 +22,7 @@ pub struct MountPointImpl {
     allow_other: bool,
     direct_io: bool,
     suid_support: bool,
+    read_only: bool,
 }
 
 #[async_trait]
@@ -35,6 +36,7 @@ impl MountPoint for MountPointImpl {
         allow_other: bool,
         direct_io: bool,
         suid_support: bool,
+        read_only: bool,
     ) -> Self {
         Self {
             mountpoint,
@@ -45,6 +47,7 @@ impl MountPoint for MountPointImpl {
             allow_other,
             direct_io,
             suid_support,
+            read_only,
         }
     }
 

src/mount/linux.rs

@@ -1386,6 +1386,7 @@ pub struct MountPointImpl {
     allow_other: bool,
     direct_io: bool,
     suid_support: bool,
+    read_only: bool,
 }
 
 #[async_trait]
@@ -1399,6 +1400,7 @@ impl MountPoint for MountPointImpl {
         allow_other: bool,
         direct_io: bool,
         suid_support: bool,
+        read_only: bool,
     ) -> Self {
         Self {
             mountpoint,
@@ -1409,6 +1411,7 @@ impl MountPoint for MountPointImpl {
             allow_other,
             direct_io,
             suid_support,
+            read_only,
         }
     }
 
@@ -1422,6 +1425,7 @@ impl MountPoint for MountPointImpl {
             self.allow_other,
             self.direct_io,
             self.suid_support,
+            self.read_only,
         )
         .await?;
         Ok(mount::MountHandle {
@@ -1459,6 +1463,7 @@ async fn mount_fuse(
     allow_other: bool,
     direct_io: bool,
     suid_support: bool,
+    read_only: bool,
 ) -> FsResult<MountHandle> {
     // create mount point if it doesn't exist
     if !mountpoint.exists() {
@@ -1471,7 +1476,7 @@ async fn mount_fuse(
         }
     }
     let mount_options = mount_options
-        .read_only(false)
+        .read_only(read_only)
         .allow_root(allow_root)
         .allow_other(allow_other)
         .clone();

src/run.rs

@@ -188,6 +188,15 @@ fn get_cli_args() -> ArgMatches {
                         .requires("data-dir")
                         .help("If it should allow setting SUID and SGID when files are created. Default is false and it will unset those flags when creating files"),
                 )
+                .arg(
+                    Arg::new("read-only")
+                        .long("read-only")
+                        .short('e')
+                        .action(ArgAction::SetTrue)
+                        .requires("mount-point")
+                        .requires("data-dir")
+                        .help("Set fuse filesystem read-only mount option, default is disabled.")
+                )
         ).subcommand(
         Command::new("passwd")
             .about("Change password for the master key used to encrypt the data")
@@ -355,6 +364,7 @@ async fn run_mount(cipher: Cipher, matches: &ArgMatches) -> Result<()> {
         matches.get_flag("allow-other"),
         matches.get_flag("direct-io"),
         matches.get_flag("suid"),
+        matches.get_flag("read-only"),
     );
     let mount_handle = mount_point.mount().await.map_err(|err| {
         error!(err = %err);