create groups on mkdir

other small improvements

Author: JojiiOfficial

.gitignore

@@ -16,3 +16,4 @@
 main
 .vscode
 testMount
+data

dmfs/data.go

@@ -39,7 +39,7 @@ func (data *dataStruct) loadUserAttributes() error {
 	if time.Now().Unix()-5 > data.lastUserAttrLoad {
 		fmt.Println("reload")
 		var err error
-		data.userAttributes, err = data.libdm.GetUserAttributeData()
+		data.userAttributes, err = data.libdm.GetUserAttributeData(1)
 		if err != nil {
 			printResponseError(err, "loading user attributes")
 			return err

dmfs/fsNamespace.go

@@ -32,10 +32,25 @@ var (
 // Create a new ns node from nsInfo
 func newNamespaceNode(nsInfo libdm.Namespaceinfo) *namespaceNode {
 	return &namespaceNode{
-		nsInfo: nsInfo,
+		nsInfo: libdm.Namespaceinfo{
+			Name:   nsInfo.Name,
+			Groups: formatGroups(nsInfo.Groups),
+		},
 	}
 }
 
+func formatGroups(groups []string) []string {
+	if groups == nil || len(groups) == 0 {
+		return []string{NoGroupFolder}
+	}
+
+	return append(groups, NoGroupFolder)
+}
+
+func (nsNode *namespaceNode) updateGroups(groups []string) {
+	nsNode.nsInfo.Groups = formatGroups(groups)
+}
+
 // On Namespace dir accessed
 func (nsNode *namespaceNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
 	// Reload groups if namespace was accessed
@@ -94,6 +109,7 @@ func (nsNode *namespaceNode) Lookup(ctx context.Context, name string, out *fuse.
 }
 
 // Delete group if vfile was removed
+// Note: deleting groups doesn't mean the files are deleted!
 func (nsNode *namespaceNode) Rmdir(ctx context.Context, name string) syscall.Errno {
 	if name == NoGroupFolder {
 		return 0
@@ -106,6 +122,9 @@ func (nsNode *namespaceNode) Rmdir(ctx context.Context, name string) syscall.Err
 		return syscall.ENOENT
 	}
 
+	// Remove group from list
+	nsNode.nsInfo.Groups = removeFromStringSlice(nsNode.nsInfo.Groups, name)
+
 	return 0
 }
 
@@ -128,14 +147,20 @@ func (nsNode *namespaceNode) Rename(ctx context.Context, name string, newParent
 
 // On group created
 func (nsNode *namespaceNode) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
+	// Create group
+	_, err := data.libdm.CreateAttribute(libdm.GroupAttribute, nsNode.nsInfo.Name, name)
+	if err != nil {
+		printResponseError(err, "creating group")
+		return nil, syscall.EIO
+	}
+
+	nsNode.nsInfo.Groups = append(nsNode.nsInfo.Groups, name)
 	node := nsNode.NewInode(ctx, &groupInode{
 		group:     name,
 		namespace: nsNode.nsInfo.Name,
 	}, fs.StableAttr{
 		Mode: syscall.S_IFDIR,
 	})
 
-	// TODO implement create group
-
 	return node, 0
 }

dmfs/fsRoot.go

@@ -105,7 +105,7 @@ func (root *rootNode) load(nsCB func(name string)) error {
 			root.nsNodes[nsName] = newNamespaceNode(namespace)
 		} else {
 			// Update groups if exists
-			v.nsInfo.Groups = namespace.Groups
+			v.updateGroups(namespace.Groups)
 		}
 
 		if nsCB != nil {
@@ -140,21 +140,27 @@ func (root *rootNode) Lookup(ctx context.Context, name string, out *fuse.EntryOu
 // Delete Namespace if virtual file was unlinked
 func (root *rootNode) Rmdir(ctx context.Context, name string) syscall.Errno {
 	// Throw error if not exists
-	if _, exists := root.nsNodes[data.trimmedNS(name)]; !exists {
+	nsNode, exists := root.nsNodes[data.trimmedNS(name)]
+	if !exists {
 		return syscall.ENOENT
 	}
 
-	namespace := data.fullNS(name)
+	// skip 2s delay if no groups are available
+	skipWait := make(chan bool, 1)
+	if len(nsNode.nsInfo.Groups) == 0 {
+		skipWait <- true
+	}
 
 	// wait 2 seconds to ensure, user didn't cancel
 	select {
 	case <-ctx.Done():
 		return syscall.ECANCELED
 	case <-time.After(2 * time.Second):
+	case <-skipWait:
 	}
 
 	defer func() {
-		delete(root.nsNodes, data.trimmedNS(namespace))
+		delete(root.nsNodes, data.trimmedNS(name))
 		child := root.GetChild(name)
 		if child != nil {
 			child.RmAllChildren()
@@ -164,7 +170,7 @@ func (root *rootNode) Rmdir(ctx context.Context, name string) syscall.Errno {
 	}()
 
 	// Do delete request
-	if _, err := data.libdm.DeleteNamespace(namespace); err != nil {
+	if _, err := data.libdm.DeleteNamespace(data.fullNS(name)); err != nil {
 		printResponseError(err, "rm namespace dir")
 		return syscall.EFAULT
 	}
@@ -196,6 +202,7 @@ func (root *rootNode) Rename(ctx context.Context, name string, newParent fs.Inod
 	return 0
 }
 
+// create namespace if ns folder was created
 func (root *rootNode) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
 	// Check if created namespace already exists
 	_, h := root.nsNodes[name]

dmfs/utils.go

@@ -43,3 +43,20 @@ func printError(message interface{}, err string) {
 func getError(message interface{}, err string) string {
 	return fmt.Sprintf("Error %s: %s\n", message, err)
 }
+
+func removeFromStringSlice(s []string, sub string) []string {
+	i := -1
+	for j := range s {
+		if s[j] == sub {
+			i = j
+			break
+		}
+	}
+
+	if i == -1 {
+		return s
+	}
+
+	s[len(s)-1], s[i] = s[i], s[len(s)-1]
+	return s[:len(s)-1]
+}

go.mod

@@ -3,7 +3,7 @@ module github.com/DataManager-Go/DMM---DataManagerMount
 go 1.14
 
 require (
-	github.com/DataManager-Go/libdatamanager v1.2.3
+	github.com/DataManager-Go/libdatamanager v1.2.4
 	github.com/DataManager-Go/libdatamanager/config v0.0.0-20200418200810-31f4c1161174
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
 	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect

go.sum

@@ -73,6 +73,7 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200406155108-e3b113bbe6a4 h1:c1Sgqkh8v6ZxafNGG64r8C8UisIW2TKMJN8P86tKjr0=
 golang.org/x/sys v0.0.0-20200406155108-e3b113bbe6a4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=