lib: Apply config changes sequentially (ref #5298) (#7188)

2021-01-15 15:43:34 +01:00
parent b2d82da20d
commit f63cdbfcfa
20 changed files with 1032 additions and 790 deletions
@@ -17,14 +17,12 @@ import (

 	"github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/syncthing/syncthing/lib/sync"
 )

 type configMuxBuilder struct {
 	*httprouter.Router
 	id  protocol.DeviceID
 	cfg config.Wrapper
-	mut sync.Mutex
 }

 func (c *configMuxBuilder) registerConfig(path string) {
@@ -59,14 +57,14 @@ func (c *configMuxBuilder) registerFolders(path string) {
 	})

 	c.HandlerFunc(http.MethodPut, path, func(w http.ResponseWriter, r *http.Request) {
-		c.mut.Lock()
-		defer c.mut.Unlock()
 		var folders []config.FolderConfiguration
 		if err := unmarshalTo(r.Body, &folders); err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
 		}
-		waiter, err := c.cfg.SetFolders(folders)
+		waiter, err := c.cfg.Modify(func(cfg *config.Configuration) {
+			cfg.SetFolders(folders)
+		})
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -75,19 +73,7 @@ func (c *configMuxBuilder) registerFolders(path string) {
 	})

 	c.HandlerFunc(http.MethodPost, path, func(w http.ResponseWriter, r *http.Request) {
-		c.mut.Lock()
-		defer c.mut.Unlock()
-		var folder config.FolderConfiguration
-		if err := unmarshalTo(r.Body, &folder); err != nil {
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-		waiter, err := c.cfg.SetFolder(folder)
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		c.finish(w, waiter)
+		c.adjustFolder(w, r, config.FolderConfiguration{})
 	})
 }

@@ -97,14 +83,14 @@ func (c *configMuxBuilder) registerDevices(path string) {
 	})

 	c.HandlerFunc(http.MethodPut, path, func(w http.ResponseWriter, r *http.Request) {
-		c.mut.Lock()
-		defer c.mut.Unlock()
 		var devices []config.DeviceConfiguration
 		if err := unmarshalTo(r.Body, &devices); err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
 		}
-		waiter, err := c.cfg.SetDevices(devices)
+		waiter, err := c.cfg.Modify(func(cfg *config.Configuration) {
+			cfg.SetDevices(devices)
+		})
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -113,14 +99,14 @@ func (c *configMuxBuilder) registerDevices(path string) {
 	})

 	c.HandlerFunc(http.MethodPost, path, func(w http.ResponseWriter, r *http.Request) {
-		c.mut.Lock()
-		defer c.mut.Unlock()
 		var device config.DeviceConfiguration
 		if err := unmarshalTo(r.Body, &device); err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
 		}
-		waiter, err := c.cfg.SetDevice(device)
+		waiter, err := c.cfg.Modify(func(cfg *config.Configuration) {
+			cfg.SetDevice(device)
+		})
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -153,8 +139,6 @@ func (c *configMuxBuilder) registerFolder(path string) {
 	})

 	c.Handle(http.MethodDelete, path, func(w http.ResponseWriter, _ *http.Request, p httprouter.Params) {
-		c.mut.Lock()
-		defer c.mut.Unlock()
 		waiter, err := c.cfg.RemoveFolder(p.ByName("id"))
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
@@ -196,8 +180,6 @@ func (c *configMuxBuilder) registerDevice(path string) {
 	})

 	c.Handle(http.MethodDelete, path, func(w http.ResponseWriter, _ *http.Request, p httprouter.Params) {
-		c.mut.Lock()
-		defer c.mut.Unlock()
 		id, err := protocol.DeviceIDFromString(p.ByName("id"))
 		waiter, err := c.cfg.RemoveDevice(id)
 		if err != nil {
@@ -251,22 +233,27 @@ func (c *configMuxBuilder) registerGUI(path string) {
 }

 func (c *configMuxBuilder) adjustConfig(w http.ResponseWriter, r *http.Request) {
-	c.mut.Lock()
-	defer c.mut.Unlock()
-	cfg, err := config.ReadJSON(r.Body, c.id)
+	to, err := config.ReadJSON(r.Body, c.id)
 	r.Body.Close()
 	if err != nil {
 		l.Warnln("Decoding posted config:", err)
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-	if cfg.GUI.Password, err = checkGUIPassword(c.cfg.GUI().Password, cfg.GUI.Password); err != nil {
-		l.Warnln("bcrypting password:", err)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	waiter, err := c.cfg.Replace(cfg)
-	if err != nil {
+	var errMsg string
+	var status int
+	waiter, err := c.cfg.Modify(func(cfg *config.Configuration) {
+		if to.GUI.Password, err = checkGUIPassword(cfg.GUI.Password, to.GUI.Password); err != nil {
+			l.Warnln("bcrypting password:", err)
+			errMsg = err.Error()
+			status = http.StatusInternalServerError
+			return
+		}
+		*cfg = to
+	})
+	if errMsg != "" {
+		http.Error(w, errMsg, status)
+	} else if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -274,13 +261,13 @@ func (c *configMuxBuilder) adjustConfig(w http.ResponseWriter, r *http.Request)
 }

 func (c *configMuxBuilder) adjustFolder(w http.ResponseWriter, r *http.Request, folder config.FolderConfiguration) {
-	c.mut.Lock()
-	defer c.mut.Unlock()
 	if err := unmarshalTo(r.Body, &folder); err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-	waiter, err := c.cfg.SetFolder(folder)
+	waiter, err := c.cfg.Modify(func(cfg *config.Configuration) {
+		cfg.SetFolder(folder)
+	})
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -289,13 +276,13 @@ func (c *configMuxBuilder) adjustFolder(w http.ResponseWriter, r *http.Request,
 }

 func (c *configMuxBuilder) adjustDevice(w http.ResponseWriter, r *http.Request, device config.DeviceConfiguration) {
-	c.mut.Lock()
-	defer c.mut.Unlock()
 	if err := unmarshalTo(r.Body, &device); err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-	waiter, err := c.cfg.SetDevice(device)
+	waiter, err := c.cfg.Modify(func(cfg *config.Configuration) {
+		cfg.SetDevice(device)
+	})
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -304,13 +291,13 @@ func (c *configMuxBuilder) adjustDevice(w http.ResponseWriter, r *http.Request,
 }

 func (c *configMuxBuilder) adjustOptions(w http.ResponseWriter, r *http.Request, opts config.OptionsConfiguration) {
-	c.mut.Lock()
-	defer c.mut.Unlock()
 	if err := unmarshalTo(r.Body, &opts); err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-	waiter, err := c.cfg.SetOptions(opts)
+	waiter, err := c.cfg.Modify(func(cfg *config.Configuration) {
+		cfg.Options = opts
+	})
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -319,21 +306,26 @@ func (c *configMuxBuilder) adjustOptions(w http.ResponseWriter, r *http.Request,
 }

 func (c *configMuxBuilder) adjustGUI(w http.ResponseWriter, r *http.Request, gui config.GUIConfiguration) {
-	c.mut.Lock()
-	defer c.mut.Unlock()
 	oldPassword := gui.Password
 	err := unmarshalTo(r.Body, &gui)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-	if gui.Password, err = checkGUIPassword(oldPassword, gui.Password); err != nil {
-		l.Warnln("bcrypting password:", err)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	waiter, err := c.cfg.SetGUI(gui)
-	if err != nil {
+	var errMsg string
+	var status int
+	waiter, err := c.cfg.Modify(func(cfg *config.Configuration) {
+		if gui.Password, err = checkGUIPassword(oldPassword, gui.Password); err != nil {
+			l.Warnln("bcrypting password:", err)
+			errMsg = err.Error()
+			status = http.StatusInternalServerError
+			return
+		}
+		cfg.GUI = gui
+	})
+	if errMsg != "" {
+		http.Error(w, errMsg, status)
+	} else if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -341,13 +333,13 @@ func (c *configMuxBuilder) adjustGUI(w http.ResponseWriter, r *http.Request, gui
 }

 func (c *configMuxBuilder) adjustLDAP(w http.ResponseWriter, r *http.Request, ldap config.LDAPConfiguration) {
-	c.mut.Lock()
-	defer c.mut.Unlock()
 	if err := unmarshalTo(r.Body, &ldap); err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-	waiter, err := c.cfg.SetLDAP(ldap)
+	waiter, err := c.cfg.Modify(func(cfg *config.Configuration) {
+		cfg.LDAP = ldap
+	})
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return