diff options
Diffstat (limited to 'api')
-rw-r--r-- | api/admin.go | 31 | ||||
-rw-r--r-- | api/admin_test.go | 50 | ||||
-rw-r--r-- | api/api.go | 2 | ||||
-rw-r--r-- | api/context.go | 34 | ||||
-rw-r--r-- | api/server.go | 8 |
5 files changed, 120 insertions, 5 deletions
diff --git a/api/admin.go b/api/admin.go index d04991353..feb70aae3 100644 --- a/api/admin.go +++ b/api/admin.go @@ -184,16 +184,18 @@ func getAnalytics(c *Context, w http.ResponseWriter, r *http.Request) { name := params["name"] if name == "standard" { - var rows model.AnalyticsRows = make([]*model.AnalyticsRow, 4) + var rows model.AnalyticsRows = make([]*model.AnalyticsRow, 5) rows[0] = &model.AnalyticsRow{"channel_open_count", 0} rows[1] = &model.AnalyticsRow{"channel_private_count", 0} rows[2] = &model.AnalyticsRow{"post_count", 0} rows[3] = &model.AnalyticsRow{"unique_user_count", 0} + rows[4] = &model.AnalyticsRow{"team_count", 0} openChan := Srv.Store.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_OPEN) privateChan := Srv.Store.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_PRIVATE) postChan := Srv.Store.Post().AnalyticsPostCount(teamId, false, false) userChan := Srv.Store.User().AnalyticsUniqueUserCount(teamId) + teamChan := Srv.Store.Team().AnalyticsTeamCount() if r := <-openChan; r.Err != nil { c.Err = r.Err @@ -223,6 +225,13 @@ func getAnalytics(c *Context, w http.ResponseWriter, r *http.Request) { rows[3].Value = float64(r.Data.(int64)) } + if r := <-teamChan; r.Err != nil { + c.Err = r.Err + return + } else { + rows[4].Value = float64(r.Data.(int64)) + } + w.Write([]byte(rows.ToJson())) } else if name == "post_counts_day" { if r := <-Srv.Store.Post().AnalyticsPostCountsByDay(teamId); r.Err != nil { @@ -239,16 +248,20 @@ func getAnalytics(c *Context, w http.ResponseWriter, r *http.Request) { w.Write([]byte(r.Data.(model.AnalyticsRows).ToJson())) } } else if name == "extra_counts" { - var rows model.AnalyticsRows = make([]*model.AnalyticsRow, 4) + var rows model.AnalyticsRows = make([]*model.AnalyticsRow, 6) rows[0] = &model.AnalyticsRow{"file_post_count", 0} rows[1] = &model.AnalyticsRow{"hashtag_post_count", 0} rows[2] = &model.AnalyticsRow{"incoming_webhook_count", 0} rows[3] = &model.AnalyticsRow{"outgoing_webhook_count", 0} + rows[4] = &model.AnalyticsRow{"command_count", 0} + rows[5] = &model.AnalyticsRow{"session_count", 0} fileChan := Srv.Store.Post().AnalyticsPostCount(teamId, true, false) hashtagChan := Srv.Store.Post().AnalyticsPostCount(teamId, false, true) iHookChan := Srv.Store.Webhook().AnalyticsIncomingCount(teamId) oHookChan := Srv.Store.Webhook().AnalyticsOutgoingCount(teamId) + commandChan := Srv.Store.Command().AnalyticsCommandCount(teamId) + sessionChan := Srv.Store.Session().AnalyticsSessionCount(teamId) if r := <-fileChan; r.Err != nil { c.Err = r.Err @@ -278,6 +291,20 @@ func getAnalytics(c *Context, w http.ResponseWriter, r *http.Request) { rows[3].Value = float64(r.Data.(int64)) } + if r := <-commandChan; r.Err != nil { + c.Err = r.Err + return + } else { + rows[4].Value = float64(r.Data.(int64)) + } + + if r := <-sessionChan; r.Err != nil { + c.Err = r.Err + return + } else { + rows[5].Value = float64(r.Data.(int64)) + } + w.Write([]byte(rows.ToJson())) } else { c.SetInvalidParam("getAnalytics", "name") diff --git a/api/admin_test.go b/api/admin_test.go index 8a9c82b44..bdea0bc5b 100644 --- a/api/admin_test.go +++ b/api/admin_test.go @@ -254,6 +254,16 @@ func TestGetTeamAnalyticsStandard(t *testing.T) { t.Log(rows.ToJson()) t.Fatal() } + + if rows[4].Name != "team_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[4].Value == 0 { + t.Log(rows.ToJson()) + t.Fatal() + } } if result, err := Client.GetSystemAnalytics("standard"); err != nil { @@ -300,6 +310,16 @@ func TestGetTeamAnalyticsStandard(t *testing.T) { t.Log(rows.ToJson()) t.Fatal() } + + if rows[4].Name != "team_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[4].Value == 0 { + t.Log(rows.ToJson()) + t.Fatal() + } } } @@ -469,6 +489,26 @@ func TestGetTeamAnalyticsExtra(t *testing.T) { t.Log(rows.ToJson()) t.Fatal() } + + if rows[4].Name != "command_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[4].Value != 0 { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[5].Name != "session_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[5].Value == 0 { + t.Log(rows.ToJson()) + t.Fatal() + } } if result, err := Client.GetSystemAnalytics("extra_counts"); err != nil { @@ -500,5 +540,15 @@ func TestGetTeamAnalyticsExtra(t *testing.T) { t.Log(rows.ToJson()) t.Fatal() } + + if rows[4].Name != "command_count" { + t.Log(rows.ToJson()) + t.Fatal() + } + + if rows[5].Name != "session_count" { + t.Log(rows.ToJson()) + t.Fatal() + } } } diff --git a/api/api.go b/api/api.go index d202172d0..4fecd3dd4 100644 --- a/api/api.go +++ b/api/api.go @@ -36,7 +36,7 @@ func (me *ServerTemplatePage) Render() string { T := utils.GetUserTranslations(me.Locale) me.Props["Footer"] = T("api.templates.email_footer") me.Html["EmailInfo"] = template.HTML(T("api.templates.email_info", - map[string]interface{}{"FeedbackEmail": me.ClientCfg["FeedbackEmail"], "SiteName": me.ClientCfg["SiteName"]})) + map[string]interface{}{"SupportEmail": me.ClientCfg["SupportEmail"], "SiteName": me.ClientCfg["SiteName"]})) if err := ServerTemplates.ExecuteTemplate(&text, me.TemplateName, me); err != nil { l4g.Error(utils.T("api.api.render.error"), me.TemplateName, err) diff --git a/api/context.go b/api/context.go index 9e05c5d87..edcdcbfef 100644 --- a/api/context.go +++ b/api/context.go @@ -21,6 +21,15 @@ import ( var sessionCache *utils.Cache = utils.NewLru(model.SESSION_CACHE_SIZE) +var allowedMethods []string = []string{ + "POST", + "GET", + "OPTIONS", + "PUT", + "PATCH", + "DELETE", +} + type Context struct { Session model.Session RequestId string @@ -234,6 +243,31 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } } +func (cw *CorsWrapper) ServeHTTP(w http.ResponseWriter, r *http.Request) { + if len(*utils.Cfg.ServiceSettings.AllowCorsFrom) > 0 { + origin := r.Header.Get("Origin") + if *utils.Cfg.ServiceSettings.AllowCorsFrom == "*" || strings.Contains(*utils.Cfg.ServiceSettings.AllowCorsFrom, origin) { + w.Header().Set("Access-Control-Allow-Origin", origin) + + if r.Method == "OPTIONS" { + w.Header().Set( + "Access-Control-Allow-Methods", + strings.Join(allowedMethods, ", ")) + + w.Header().Set( + "Access-Control-Allow-Headers", + r.Header.Get("Access-Control-Request-Headers")) + } + } + } + + if r.Method == "OPTIONS" { + return + } + + cw.router.ServeHTTP(w, r) +} + func GetProtocol(r *http.Request) string { if r.Header.Get(model.HEADER_FORWARDED_PROTO) == "https" { return "https" diff --git a/api/server.go b/api/server.go index 070ed7a70..b84066cbe 100644 --- a/api/server.go +++ b/api/server.go @@ -21,6 +21,10 @@ type Server struct { Router *mux.Router } +type CorsWrapper struct { + router *mux.Router +} + var Srv *Server func NewServer() { @@ -38,7 +42,7 @@ func StartServer() { l4g.Info(utils.T("api.server.start_server.starting.info")) l4g.Info(utils.T("api.server.start_server.listening.info"), utils.Cfg.ServiceSettings.ListenAddress) - var handler http.Handler = Srv.Router + var handler http.Handler = &CorsWrapper{Srv.Router} if utils.Cfg.RateLimitSettings.EnableRateLimiter { l4g.Info(utils.T("api.server.start_server.rate.info")) @@ -65,7 +69,7 @@ func StartServer() { throttled.DefaultDeniedHandler.ServeHTTP(w, r) }) - handler = th.Throttle(Srv.Router) + handler = th.Throttle(&CorsWrapper{Srv.Router}) } go func() { |