diff options
Diffstat (limited to 'api4')
-rw-r--r-- | api4/api.go | 12 | ||||
-rw-r--r-- | api4/cluster.go | 29 | ||||
-rw-r--r-- | api4/cluster_test.go | 22 |
3 files changed, 57 insertions, 6 deletions
diff --git a/api4/api.go b/api4/api.go index fb0ca2758..d5a44731f 100644 --- a/api4/api.go +++ b/api4/api.go @@ -59,13 +59,11 @@ type Routes struct { OutgoingHooks *mux.Router // 'api/v4/hooks/outgoing' OutgoingHook *mux.Router // 'api/v4/hooks/outgoing/{hook_id:[A-Za-z0-9]+}' - OAuth *mux.Router // 'api/v4/oauth' - - SAML *mux.Router // 'api/v4/saml' - - Admin *mux.Router // 'api/v4/admin' - + Admin *mux.Router // 'api/v4/admin' + OAuth *mux.Router // 'api/v4/oauth' + SAML *mux.Router // 'api/v4/saml' Compliance *mux.Router // 'api/v4/compliance' + Cluster *mux.Router // 'api/v4/cluster' System *mux.Router // 'api/v4/system' @@ -137,6 +135,7 @@ func InitApi(full bool) { BaseRoutes.OAuth = BaseRoutes.ApiRoot.PathPrefix("/oauth").Subrouter() BaseRoutes.Admin = BaseRoutes.ApiRoot.PathPrefix("/admin").Subrouter() BaseRoutes.Compliance = BaseRoutes.ApiRoot.PathPrefix("/compliance").Subrouter() + BaseRoutes.Cluster = BaseRoutes.ApiRoot.PathPrefix("/cluster").Subrouter() BaseRoutes.System = BaseRoutes.ApiRoot.PathPrefix("/system").Subrouter() BaseRoutes.Preferences = BaseRoutes.User.PathPrefix("/preferences").Subrouter() BaseRoutes.License = BaseRoutes.ApiRoot.PathPrefix("/license").Subrouter() @@ -157,6 +156,7 @@ func InitApi(full bool) { InitPreference() InitSaml() InitCompliance() + InitCluster() app.Srv.Router.Handle("/api/v4/{anything:.*}", http.HandlerFunc(Handle404)) diff --git a/api4/cluster.go b/api4/cluster.go new file mode 100644 index 000000000..dbf198590 --- /dev/null +++ b/api4/cluster.go @@ -0,0 +1,29 @@ +// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package api4 + +import ( + "net/http" + + l4g "github.com/alecthomas/log4go" + "github.com/mattermost/platform/app" + "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" +) + +func InitCluster() { + l4g.Debug(utils.T("api.cluster.init.debug")) + + BaseRoutes.Cluster.Handle("/status", ApiSessionRequired(getClusterStatus)).Methods("GET") +} + +func getClusterStatus(c *Context, w http.ResponseWriter, r *http.Request) { + if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { + c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM) + return + } + + infos := app.GetClusterStatus() + w.Write([]byte(model.ClusterInfosToJson(infos))) +} diff --git a/api4/cluster_test.go b/api4/cluster_test.go new file mode 100644 index 000000000..6d44ca209 --- /dev/null +++ b/api4/cluster_test.go @@ -0,0 +1,22 @@ +// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package api4 + +import ( + "testing" +) + +func TestGetClusterStatus(t *testing.T) { + th := Setup().InitBasic().InitSystemAdmin() + + _, resp := th.Client.GetClusterStatus() + CheckForbiddenStatus(t, resp) + + infos, resp := th.SystemAdminClient.GetClusterStatus() + CheckNoError(t, resp) + + if infos == nil { + t.Fatal("should not be nil") + } +} |