Bail out if entity already present on Create()

mudler · Mar 4, 2020 · 359e88b · 359e88b
1 parent 269372d
commit 359e88b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 0 deletions.
diff --git a/pkg/entities/group.go b/pkg/entities/group.go
@@ -107,6 +107,13 @@ func (u Group) Delete(s string) error {
 }
 
 func (u Group) Create(s string) error {
+	current, err := ParseGroup(s)
+	if err != nil {
+		return errors.Wrap(err, "Failed parsing passwd")
+	}
+	if _, ok := current[u.Name]; ok {
+		return errors.New("Entity already present")
+	}
 	permissions, err := permbits.Stat(s)
 	if err != nil {
 		return errors.Wrap(err, "Failed getting permissions")

diff --git a/pkg/entities/gshadow.go b/pkg/entities/gshadow.go
@@ -104,6 +104,13 @@ func (u GShadow) Delete(s string) error {
 }
 
 func (u GShadow) Create(s string) error {
+	current, err := ParseGShadow(s)
+	if err != nil {
+		return errors.Wrap(err, "Failed parsing passwd")
+	}
+	if _, ok := current[u.Name]; ok {
+		return errors.New("Entity already present")
+	}
 	permissions, err := permbits.Stat(s)
 	if err != nil {
 		return errors.Wrap(err, "Failed getting permissions")

diff --git a/pkg/entities/shadow.go b/pkg/entities/shadow.go
@@ -121,6 +121,13 @@ func (u Shadow) Delete(s string) error {
 
 // FIXME: Create can be shared across all of the supported Entities
 func (u Shadow) Create(s string) error {
+	current, err := ParseShadow(s)
+	if err != nil {
+		return errors.Wrap(err, "Failed parsing passwd")
+	}
+	if _, ok := current[u.Username]; ok {
+		return errors.New("Entity already present")
+	}
 	permissions, err := permbits.Stat(s)
 	if err != nil {
 		return errors.Wrap(err, "Failed getting permissions")

diff --git a/pkg/entities/user.go b/pkg/entities/user.go
@@ -68,6 +68,13 @@ func (u UserPasswd) Delete(s string) error {
 }
 
 func (u UserPasswd) Create(s string) error {
+	current, err := passwd.ParseFile(s)
+	if err != nil {
+		return errors.Wrap(err, "Failed parsing passwd")
+	}
+	if _, ok := current[u.Username]; ok {
+		return errors.New("Entity already present")
+	}
 	permissions, err := permbits.Stat(s)
 	if err != nil {
 		return errors.Wrap(err, "Failed getting permissions")