Merge pull request #709 from mattermost/PLT-11

PLT-11 adding config for logs to UI

api/admin.go

@@ -7,6 +7,7 @@ import (
 	"bufio"
 	"net/http"
 	"os"
+	"strings"
 
 	l4g "code.google.com/p/log4go"
 	"github.com/gorilla/mux"
@@ -20,6 +21,8 @@ func InitAdmin(r *mux.Router) {
 
 	sr := r.PathPrefix("/admin").Subrouter()
 	sr.Handle("/logs", ApiUserRequired(getLogs)).Methods("GET")
+	sr.Handle("/config", ApiUserRequired(getConfig)).Methods("GET")
+	sr.Handle("/save_config", ApiUserRequired(saveConfig)).Methods("POST")
 	sr.Handle("/client_props", ApiAppHandler(getClientProperties)).Methods("GET")
 }
 
@@ -33,7 +36,7 @@ func getLogs(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	if utils.Cfg.LogSettings.FileEnable {
 
-		file, err := os.Open(utils.Cfg.LogSettings.FileLocation)
+		file, err := os.Open(utils.GetLogFileLocation(utils.Cfg.LogSettings.FileLocation))
 		if err != nil {
 			c.Err = model.NewAppError("getLogs", "Error reading log file", err.Error())
 		}
@@ -54,3 +57,44 @@ func getLogs(c *Context, w http.ResponseWriter, r *http.Request) {
 func getClientProperties(c *Context, w http.ResponseWriter, r *http.Request) {
 	w.Write([]byte(model.MapToJson(utils.ClientProperties)))
 }
+
+func getConfig(c *Context, w http.ResponseWriter, r *http.Request) {
+	if !c.HasSystemAdminPermissions("getConfig") {
+		return
+	}
+
+	json := utils.Cfg.ToJson()
+	cfg := model.ConfigFromJson(strings.NewReader(json))
+	json = cfg.ToJson()
+
+	w.Write([]byte(json))
+}
+
+func saveConfig(c *Context, w http.ResponseWriter, r *http.Request) {
+	if !c.HasSystemAdminPermissions("getConfig") {
+		return
+	}
+
+	cfg := model.ConfigFromJson(r.Body)
+	if cfg == nil {
+		c.SetInvalidParam("saveConfig", "config")
+		return
+	}
+
+	if len(cfg.ServiceSettings.Port) == 0 {
+		c.SetInvalidParam("saveConfig", "config")
+		return
+	}
+
+	if cfg.TeamSettings.MaxUsersPerTeam == 0 {
+		c.SetInvalidParam("saveConfig", "config")
+		return
+	}
+
+	// TODO run some cleanup validators
+
+	utils.SaveConfig(utils.CfgFileName, cfg)
+	utils.LoadConfig(utils.CfgFileName)
+	json := utils.Cfg.ToJson()
+	w.Write([]byte(json))
+}

api/admin_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/store"
+	"github.com/mattermost/platform/utils"
 )
 
 func TestGetLogs(t *testing.T) {
@@ -20,6 +21,12 @@ func TestGetLogs(t *testing.T) {
 	user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User)
 	store.Must(Srv.Store.User().VerifyEmail(user.Id))
 
+	Client.LoginByEmail(team.Name, user.Email, "pwd")
+
+	if _, err := Client.GetLogs(); err == nil {
+		t.Fatal("Shouldn't have permissions")
+	}
+
 	c := &Context{}
 	c.RequestId = model.NewId()
 	c.IpAddress = "cmd_line"
@@ -37,8 +44,81 @@ func TestGetLogs(t *testing.T) {
 func TestGetClientProperties(t *testing.T) {
 	Setup()
 
-	if _, err := Client.GetClientProperties(); err != nil {
-
+	if result, err := Client.GetClientProperties(); err != nil {
 		t.Fatal(err)
+	} else {
+		props := result.Data.(map[string]string)
+
+		if len(props["Version"]) == 0 {
+			t.Fatal()
+		}
+	}
+}
+
+func TestGetConfig(t *testing.T) {
+	Setup()
+
+	team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN}
+	team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team)
+
+	user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"}
+	user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User)
+	store.Must(Srv.Store.User().VerifyEmail(user.Id))
+
+	Client.LoginByEmail(team.Name, user.Email, "pwd")
+
+	if _, err := Client.GetConfig(); err == nil {
+		t.Fatal("Shouldn't have permissions")
+	}
+
+	c := &Context{}
+	c.RequestId = model.NewId()
+	c.IpAddress = "cmd_line"
+	UpdateRoles(c, user, model.ROLE_SYSTEM_ADMIN)
+
+	Client.LoginByEmail(team.Name, user.Email, "pwd")
+
+	if result, err := Client.GetConfig(); err != nil {
+		t.Fatal(err)
+	} else {
+		cfg := result.Data.(*model.Config)
+
+		if len(cfg.ServiceSettings.SiteName) == 0 {
+			t.Fatal()
+		}
+	}
+}
+
+func TestSaveConfig(t *testing.T) {
+	Setup()
+
+	team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN}
+	team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team)
+
+	user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"}
+	user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User)
+	store.Must(Srv.Store.User().VerifyEmail(user.Id))
+
+	Client.LoginByEmail(team.Name, user.Email, "pwd")
+
+	if _, err := Client.SaveConfig(utils.Cfg); err == nil {
+		t.Fatal("Shouldn't have permissions")
+	}
+
+	c := &Context{}
+	c.RequestId = model.NewId()
+	c.IpAddress = "cmd_line"
+	UpdateRoles(c, user, model.ROLE_SYSTEM_ADMIN)
+
+	Client.LoginByEmail(team.Name, user.Email, "pwd")
+
+	if result, err := Client.SaveConfig(utils.Cfg); err != nil {
+		t.Fatal(err)
+	} else {
+		cfg := result.Data.(*model.Config)
+
+		if len(cfg.ServiceSettings.SiteName) == 0 {
+			t.Fatal()
+		}
 	}
 }