Improve posix compatability

component/attr_cache/attr_cache.go

@@ -299,21 +299,14 @@ func (ac *AttrCache) moveCachedItem(
 	}
 	// generate the destination name
 	dstPath := strings.Replace(srcItem.attr.Path, srcDir, dstDir, 1)
-	// create the destination attr
-	var dstAttr *internal.ObjAttr
-	if srcItem.attr.IsDir() {
-		dstAttr = internal.CreateObjAttrDir(dstPath)
-	} else {
-		dstAttr = internal.CreateObjAttr(dstPath, srcItem.attr.Size, srcItem.attr.Mtime)
-	}
+	dstAttr := cloneMovedAttr(srcItem.attr, dstPath)
 	// add the destination item to the cache
 	dstItem := ac.cache.insert(insertOptions{
 		attr:     dstAttr,
 		exists:   true,
 		cachedAt: srcItem.cachedAt,
 	})
 	// copy the inCloud flag
-	dstItem.attr.Mode = srcItem.attr.Mode
 	dstItem.markInCloud(srcItem.isInCloud())
 	// recurse over any children
 	for _, srcChildItm := range srcItem.children {
@@ -325,6 +318,21 @@ func (ac *AttrCache) moveCachedItem(
 	return dstItem
 }
 
+func cloneMovedAttr(srcAttr *internal.ObjAttr, dstPath string) *internal.ObjAttr {
+	dstAttr := *srcAttr
+	dstAttr.Path = dstPath
+	dstAttr.Name = path.Base(dstPath)
+
+	if srcAttr.Metadata != nil {
+		dstAttr.Metadata = make(map[string]*string, len(srcAttr.Metadata))
+		for key, value := range srcAttr.Metadata {
+			dstAttr.Metadata[key] = value
+		}
+	}
+
+	return &dstAttr
+}
+
 // record that cloud storage has records of this directory and all its ancestors existing
 func (ac *AttrCache) markAncestorsInCloud(dirPath string, time time.Time) {
 	if len(dirPath) != 0 {
@@ -428,6 +436,7 @@ func (ac *AttrCache) CreateDir(options internal.CreateDirOptions) error {
 	log.Trace("AttrCache::CreateDir : %s", options.Name)
 	err := ac.NextComponent().CreateDir(options)
 	if err == nil || err == syscall.EEXIST {
+		currentTime := time.Now()
 		ac.cacheLock.Lock()
 		defer ac.cacheLock.Unlock()
 		// does the directory already exist?
@@ -447,10 +456,13 @@ func (ac *AttrCache) CreateDir(options internal.CreateDirOptions) error {
 		newDirAttrCacheItem := ac.cache.insert(insertOptions{
 			attr:     newDirAttr,
 			exists:   true,
-			cachedAt: time.Now(),
+			cachedAt: currentTime,
 		})
+		if newDirAttrCacheItem != nil {
+			newDirAttrCacheItem.setMode(options.Mode)
+		}
 		// update flags for tracking directory existence
-		if ac.cacheDirs {
+		if ac.cacheDirs && newDirAttrCacheItem != nil {
 			newDirAttrCacheItem.markInCloud(false)
 		}
 	}
@@ -802,7 +814,9 @@ func (ac *AttrCache) CreateFile(options internal.CreateFileOptions) (*handlemap.
 			exists:   true,
 			cachedAt: currentTime,
 		})
-		newFileEntry.setMode(options.Mode)
+		if newFileEntry != nil {
+			newFileEntry.setMode(options.Mode)
+		}
 	}
 
 	return h, err

component/attr_cache/attr_cache_test.go

@@ -383,7 +383,7 @@ func (suite *attrCacheTestSuite) TestCreateDir() {
 		suite.SetupTest()
 		suite.Run(path, func() {
 			truncatedPath := internal.TruncateDirName(path)
-			options := internal.CreateDirOptions{Name: path}
+			options := internal.CreateDirOptions{Name: path, Mode: 0o750}
 
 			// Error
 			suite.mock.EXPECT().CreateDir(options).Return(errors.New("Failed"))
@@ -399,8 +399,11 @@ func (suite *attrCacheTestSuite) TestCreateDir() {
 			err = suite.attrCache.CreateDir(options)
 			suite.assert.NoError(err)
 
-			_, found := suite.attrCache.cache.get(truncatedPath)
+			item, found := suite.attrCache.cache.get(truncatedPath)
 			suite.assert.True(found)
+			suite.assert.Equal(os.ModeDir, item.attr.Mode&os.ModeType)
+			suite.assert.Equal(options.Mode, item.attr.Mode&os.ModePerm)
+			suite.assert.False(item.attr.IsModeDefault())
 
 			// Entry Already Exists
 			suite.mock.EXPECT().CreateDir(options).Return(nil)

component/attr_cache/cacheMap.go

@@ -251,12 +251,18 @@ func (value *attrCacheItem) markInCloud(inCloud bool) {
 
 func (value *attrCacheItem) setSize(size int64, changedAt time.Time) {
 	value.attr.Mtime = changedAt
+	value.attr.Ctime = changedAt
 	value.attr.Size = size
 	value.cachedAt = changedAt
 }
 
 func (value *attrCacheItem) setMode(mode os.FileMode) {
-	value.attr.Mode = mode
+	currentType := value.attr.Mode & os.ModeType
+	if currentType == 0 {
+		currentType = mode & os.ModeType
+	}
+	modeBits := mode & (os.ModePerm | os.ModeSetuid | os.ModeSetgid | os.ModeSticky)
+	value.attr.Mode = currentType | modeBits
 	value.attr.Flags.Clear(internal.PropFlagModeDefault)
 	value.attr.Ctime = time.Now()
 	value.cachedAt = time.Now()