fix: concurrent access to language mappings (resolve #83)

README.md

@@ -54,7 +54,7 @@ To use the hosted version set `api_url = https://wakapi.dev/api/heartbeat`. Howe
 
 ### Run with Docker
 ```bash
-docker run -d -p 3000:3000 -e "WAKAPI_PASSWORD_SALT=$(openssl rand -hex 16)" --name wakapi n1try/wakapi
+docker run -d -p 3000:3000 -e "WAKAPI_PASSWORD_SALT=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1)" --name wakapi n1try/wakapi
 ```
 
 By default, SQLite is used as a database. To run Wakapi in Docker with MySQL or Postgres, see [Dockerfile](https://github.com/muety/wakapi/blob/master/Dockerfile) and [config.default.yml](https://github.com/muety/wakapi/blob/master/config.default.yml) for further options.

config/config.go

@@ -179,6 +179,14 @@ func sqliteConnectionString(config *dbConfig) string {
 	return config.Name
 }
 
+func (c *appConfig) GetCustomLanguages() map[string]string {
+	return cloneStringMap(c.CustomLanguages)
+}
+
+func (c *appConfig) GetLanguageColors() map[string]string {
+	return cloneStringMap(c.LanguageColors)
+}
+
 func IsDev(env string) bool {
 	return env == "dev" || env == "development"
 }

config/utils.go

@@ -0,0 +1,9 @@
+package config
+
+func cloneStringMap(m map[string]string) map[string]string {
+	m2 := make(map[string]string)
+	for k, v := range m {
+		m2[k] = v
+	}
+	return m2
+}

routes/summary.go

@@ -59,7 +59,7 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 
 	vm := models.SummaryViewModel{
 		Summary:        summary,
-		LanguageColors: utils.FilterLanguageColors(h.config.App.LanguageColors, summary),
+		LanguageColors: utils.FilterLanguageColors(h.config.App.GetLanguageColors(), summary),
 		ApiKey:         user.ApiKey,
 	}
 

services/language_mapping.go

@@ -68,6 +68,7 @@ func (srv *LanguageMappingService) Delete(mapping *models.LanguageMapping) error
 	return err
 }
 
-func (srv LanguageMappingService) getServerMappings() map[string]string {
-	return srv.config.App.CustomLanguages
+func (srv *LanguageMappingService) getServerMappings() map[string]string {
+	// https://dave.cheney.net/2017/04/30/if-a-map-isnt-a-reference-variable-what-is-it
+	return srv.config.App.GetCustomLanguages()
 }

services/summary.go

@@ -68,7 +68,7 @@ func (srv *SummaryService) Aliased(from, to time.Time, user *models.User, f Summ
 
 func (srv *SummaryService) Retrieve(from, to time.Time, user *models.User) (*models.Summary, error) {
 	// Check cache
-	cacheKey := srv.getHash(from.String(), to.String(), user.ID, "--aliased")
+	cacheKey := srv.getHash(from.String(), to.String(), user.ID)
 	if cacheResult, ok := srv.cache.Get(cacheKey); ok {
 		return cacheResult.(*models.Summary), nil
 	}

version.txt

@@ -1 +1 @@
-1.18.0
+1.18.1