X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=file.go;h=b77cbb692de37f02df499c7af5254e34b2bf8de4;hb=5a6b8152cf4c9fcd71b875ff5dce1ec0fad9c9d4;hp=b48d0751ae3bad521ea36dd39ec2327a6ec5168c;hpb=92afde4e875a96e1ab865e29b9f0d11b08d7db1c;p=nsscash%2Fnsscash.git

diff --git a/file.go b/file.go
index b48d075..b77cbb6 100644
--- a/file.go
+++ b/file.go
@@ -31,10 +31,15 @@ import (
 )
 
 func handleFiles(cfg *Config, state *State) error {
+	// Split into fetch and deploy phase to prevent updates of only some
+	// files which might lead to inconsistent state; obviously this won't
+	// work during the deploy phase, but it helps if the web server fails
+	// to deliver some files
+
 	for i, f := range cfg.Files {
 		err := fetchFile(&cfg.Files[i], state)
 		if err != nil {
-			return errors.Wrapf(err, "%q (%s)", f.Url, f.Type)
+			return errors.Wrapf(err, "%q (%v)", f.Url, f.Type)
 		}
 	}
 
@@ -46,7 +51,7 @@ func handleFiles(cfg *Config, state *State) error {
 
 		err := deployFile(&cfg.Files[i])
 		if err != nil {
-			return errors.Wrapf(err, "%q (%s)", f.Url, f.Type)
+			return errors.Wrapf(err, "%q (%v)", f.Url, f.Type)
 		}
 	}
 
@@ -92,6 +97,22 @@ func fetchFile(file *File, state *State) error {
 		}
 		file.body = x.Bytes()
 
+	} else if file.Type == FileTypeGroup {
+		grs, err := ParseGroups(bytes.NewReader(body))
+		if err != nil {
+			return err
+		}
+		if len(grs) == 0 {
+			return fmt.Errorf("refusing to use empty group file")
+		}
+
+		var x bytes.Buffer
+		err = SerializeGroups(&x, grs)
+		if err != nil {
+			return err
+		}
+		file.body = x.Bytes()
+
 	} else {
 		return fmt.Errorf("unsupported file type %v", file.Type)
 	}
@@ -119,7 +140,8 @@ func deployFile(file *File) error {
 	defer os.Remove(f.Name())
 	defer f.Close()
 
-	// Apply permissions/user/group from the target file
+	// Apply permissions/user/group from the target file, use Stat instead
+	// of Lstat as only the target's permissions are relevant
 	stat, err := os.Stat(file.Path)
 	if err != nil {
 		// We do not create the path if it doesn't exist, because we