Fix tests for windows, fix umask parsing

Author: jfantinhardesty

cmd/mount.go

@@ -416,9 +416,9 @@ var mountCmd = &cobra.Command{
 					options.NonEmpty = true
 					config.Set("nonempty", "true")
 				} else if hasEq && key == "umask" {
-					umask, err := strconv.ParseUint(val, 10, 32)
+					umask, err := parseUmaskOption(val)
 					if err != nil {
-						return fmt.Errorf("failed to parse umask [%s]", err.Error())
+						return err
 					}
 					config.Set("lfuse.umask", fmt.Sprint(umask))
 				} else if hasEq && key == "uid" {
@@ -678,6 +678,17 @@ func ignoreFuseOptions(opt string) bool {
 	return false
 }
 
+func parseUmaskOption(raw string) (uint32, error) {
+	umask, err := strconv.ParseUint(raw, 8, 32)
+	if err != nil {
+		return 0, fmt.Errorf("failed to parse umask [%s]", err.Error())
+	}
+	if umask > 0o777 {
+		return 0, fmt.Errorf("failed to parse umask [value out of range: %s]", raw)
+	}
+	return uint32(umask), nil
+}
+
 func runPipeline(pipeline *internal.Pipeline, ctx context.Context) error {
 	pid := fmt.Sprintf("%v", os.Getpid())
 	common.TransferPipe += "_" + pid

component/libfuse/fuse2_options.go

@@ -69,7 +69,7 @@ func createFuseOptions(
 	options += ",atomic_o_trunc"
 
 	if umask != 0 {
-		options += fmt.Sprintf(",umask=%04d", umask)
+		options += fmt.Sprintf(",umask=%04o", umask)
 	}
 
 	// direct_io option is used to bypass the kernel cache. It disables the use of

component/libfuse/fuse3_options.go

@@ -64,7 +64,7 @@ func createFuseOptions(
 	}
 
 	if umask != 0 {
-		options += fmt.Sprintf(",umask=%04d", umask)
+		options += fmt.Sprintf(",umask=%04o", umask)
 	}
 
 	// direct_io option is used to bypass the kernel cache. It disables the use of

component/libfuse/libfuse2_handler_test_wrapper.go

@@ -243,6 +243,12 @@ func testMkDirErrorPermission(suite *libfuseTestSuite) {
 	path := "/" + name
 	mode := fs.FileMode(0775)
 	options := internal.CreateDirOptions{Name: name, Mode: mode}
+
+	if runtime.GOOS == "windows" {
+		option := internal.GetAttrOptions{Name: name}
+		suite.mock.EXPECT().GetAttr(option).Return(nil, syscall.ENOENT)
+	}
+
 	suite.mock.EXPECT().CreateDir(options).Return(os.ErrPermission)
 
 	err := cfuseFS.Mkdir(path, 0775)
@@ -255,6 +261,12 @@ func testMkDirErrorExist(suite *libfuseTestSuite) {
 	path := "/" + name
 	mode := fs.FileMode(0775)
 	options := internal.CreateDirOptions{Name: name, Mode: mode}
+
+	if runtime.GOOS == "windows" {
+		option := internal.GetAttrOptions{Name: name}
+		suite.mock.EXPECT().GetAttr(option).Return(nil, syscall.ENOENT)
+	}
+
 	suite.mock.EXPECT().CreateDir(options).Return(os.ErrExist)
 
 	err := cfuseFS.Mkdir(path, 0775)
@@ -490,7 +502,7 @@ func testReadFromComponent(suite *libfuseTestSuite) {
 			suite.assert.Equal(handle.ID, opt.Handle.ID)
 			suite.assert.Equal("file", opt.Handle.Path)
 			suite.assert.Equal(int64(7), opt.Offset)
-			suite.assert.Equal(4, len(opt.Data))
+			suite.assert.Len(opt.Data, 4)
 			copy(opt.Data, []byte("ping"))
 			return 4, nil
 		})
@@ -511,7 +523,7 @@ func testReadAccessDenied(suite *libfuseTestSuite) {
 		DoAndReturn(func(opt *internal.ReadInBufferOptions) (int, error) {
 			suite.assert.Equal(handle.ID, opt.Handle.ID)
 			suite.assert.Equal(int64(3), opt.Offset)
-			suite.assert.Equal(4, len(opt.Data))
+			suite.assert.Len(opt.Data, 4)
 			return 0, os.ErrPermission
 		})
 	read := cfuseFS.Read("/file", buf, 3, uint64(fh))
@@ -530,7 +542,7 @@ func testReadError(suite *libfuseTestSuite) {
 		DoAndReturn(func(opt *internal.ReadInBufferOptions) (int, error) {
 			suite.assert.Equal(handle.ID, opt.Handle.ID)
 			suite.assert.Equal(int64(5), opt.Offset)
-			suite.assert.Equal(4, len(opt.Data))
+			suite.assert.Len(opt.Data, 4)
 			return 0, errors.New("boom")
 		})
 	read := cfuseFS.Read("/file", buf, 5, uint64(fh))
@@ -776,7 +788,7 @@ func testCreateFuseOptionsFlags(suite *libfuseTestSuite) {
 	if !strings.Contains(options, "ro") {
 		suite.T().Fatal("expected ro in options")
 	}
-	expectedUmask := fmt.Sprintf("umask=%04d", umask)
+	expectedUmask := fmt.Sprintf("umask=%04o", umask)
 	if !strings.Contains(options, expectedUmask) {
 		suite.T().Fatal("expected umask in options")
 	}
@@ -791,6 +803,9 @@ func testCreateFuseOptionsDirectIO(suite *libfuseTestSuite) {
 	fuseFS.directIO = true
 
 	options := createFuseOptions(host, false, false, false, false, 128, 0)
+	if !strings.Contains(options, "direct_io") {
+		suite.T().Fatal("expected direct_io in direct-io options")
+	}
 	if strings.Contains(options, "kernel_cache") {
 		suite.T().Fatal("did not expect kernel_cache in direct-io options")
 	}

component/libfuse/libfuse_handler_test.go

@@ -188,13 +188,13 @@ func (suite *libfuseTestSuite) TestConfigDefaultPermission() {
 func (suite *libfuseTestSuite) TestConfigRootAndThreads() {
 	defer suite.cleanupTest()
 	suite.cleanupTest()
-	config := "allow-root: true\nnonempty: true\nlibfuse:\n  max-fuse-threads: 256\n  umask: 22\n  uid: 1001\n  gid: 1002\n"
+	config := "allow-root: true\nnonempty: true\nlibfuse:\n  max-fuse-threads: 256\n  umask: 022\n  uid: 1001\n  gid: 1002\n"
 	suite.setupTestHelper(config)
 
 	suite.assert.True(suite.libfuse.allowRoot)
 	suite.assert.True(suite.libfuse.nonEmptyMount)
 	suite.assert.Equal(uint32(256), suite.libfuse.maxFuseThreads)
-	suite.assert.Equal(uint32(22), suite.libfuse.umask)
+	suite.assert.Equal(uint32(0o22), suite.libfuse.umask)
 	suite.assert.Equal(uint32(1001), suite.libfuse.ownerUID)
 	suite.assert.Equal(uint32(1002), suite.libfuse.ownerGID)
 }

setup/advancedConfig.yaml

@@ -78,6 +78,7 @@ libfuse:
   disable-writeback-cache: true|false <disallow libfuse to buffer write requests if you must strictly open files in O_WRONLY or O_APPEND mode. alternatively, you can set ignore-open-flags.>
   ignore-open-flags: true|false <ignore the append and write only flag since O_APPEND and O_WRONLY is not supported with writeback caching. alternatively, you can disable-writeback-cache. Default value is true>
   max-fuse-threads: <number of threads allowed at libfuse layer for highly parallel operations, Default is 128>
+  umask: <FUSE mount permission mask in octal. Ex. 022 -> files 0644 and directories 0755.>
   direct-io: true|false <enable to bypass the kernel cache. It also disables cloudfuse data and metadata caching.>
   network-share: true|false <runs as a network share. may improve performance when latency to cloud is high. only supported on Windows. Known issue - only one Cloudfuse network share can be mounted at a time>
   display-capacity-mb: <number of MB to display as the mounted storage capacity. Default - 1PB (1073741824 MB)>

setup/baseConfig.yaml

@@ -71,6 +71,7 @@ libfuse:
   disable-writeback-cache: true|false <disallow libfuse to buffer write requests if you must strictly open files in O_WRONLY or O_APPEND mode. alternatively, you can set ignore-open-flags.>
   ignore-open-flags: true|false <ignore the append and write only flag since O_APPEND and O_WRONLY is not supported with writeback caching. alternatively, you can disable-writeback-cache. Default value is true>
   max-fuse-threads: <number of threads allowed at libfuse layer for highly parallel operations, Default is 128>
+  umask: <FUSE mount permission mask in octal. Ex. 022 -> files 0644 and directories 0755.>
   direct-io: true|false <enable to bypass the kernel cache>
   network-share: true|false <runs as a network share. may improve performance when latency to cloud is high. only supported on Windows. Known issue - only one Cloudfuse network share can be mounted at a time>
   display-capacity-mb: <number of MB to display as the mounted storage capacity. Default - 1PB (1073741824 MB)>