diff options
Diffstat (limited to 'api/admin.go')
| -rw-r--r-- | api/admin.go | 596 |
1 files changed, 77 insertions, 519 deletions
diff --git a/api/admin.go b/api/admin.go index 4e4d21b0b..3aa1dc67d 100644 --- a/api/admin.go +++ b/api/admin.go @@ -4,32 +4,17 @@ package api import ( - "bufio" - "io" - "io/ioutil" "net/http" - "os" "strconv" - "strings" - "time" - - "runtime/debug" l4g "github.com/alecthomas/log4go" "github.com/gorilla/mux" "github.com/mattermost/platform/app" - "github.com/mattermost/platform/einterfaces" "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" "github.com/mattermost/platform/utils" "github.com/mssola/user_agent" ) -const ( - DAY_MILLISECONDS = 24 * 60 * 60 * 1000 - MONTH_MILLISECONDS = 31 * DAY_MILLISECONDS -) - func InitAdmin() { l4g.Debug(utils.T("api.admin.init.debug")) @@ -61,68 +46,28 @@ func InitAdmin() { } func getLogs(c *Context, w http.ResponseWriter, r *http.Request) { - lines, err := GetLogs() + lines, err := app.GetLogs() if err != nil { c.Err = err return } - if einterfaces.GetClusterInterface() != nil { - clines, err := einterfaces.GetClusterInterface().GetLogs() - if err != nil { - c.Err = err - return - } - - lines = append(lines, clines...) - } - w.Write([]byte(model.ArrayToJson(lines))) } -func GetLogs() ([]string, *model.AppError) { - var lines []string - - if utils.Cfg.LogSettings.EnableFile { - file, err := os.Open(utils.GetLogFileLocation(utils.Cfg.LogSettings.FileLocation)) - if err != nil { - return nil, model.NewLocAppError("getLogs", "api.admin.file_read_error", nil, err.Error()) - } - - defer file.Close() - - scanner := bufio.NewScanner(file) - for scanner.Scan() { - lines = append(lines, scanner.Text()) - } - } else { - lines = append(lines, "") - } - - return lines, nil -} - func getClusterStatus(c *Context, w http.ResponseWriter, r *http.Request) { - infos := make([]*model.ClusterInfo, 0) - if einterfaces.GetClusterInterface() != nil { - infos = einterfaces.GetClusterInterface().GetClusterInfos() - } - + infos := app.GetClusterStatus() w.Write([]byte(model.ClusterInfosToJson(infos))) } func getAllAudits(c *Context, w http.ResponseWriter, r *http.Request) { - if result := <-app.Srv.Store.Audit().Get("", 200); result.Err != nil { - c.Err = result.Err + if audits, err := app.GetAudits("", 200); err != nil { + c.Err = err + return + } else if HandleEtag(audits.Etag(), "Get All Audits", w, r) { return } else { - audits := result.Data.(model.Audits) etag := audits.Etag() - - if HandleEtag(etag, "Get All Audits", w, r) { - return - } - if len(etag) > 0 { w.Header().Set(model.HEADER_ETAG_SERVER, etag) } @@ -133,38 +78,22 @@ func getAllAudits(c *Context, w http.ResponseWriter, r *http.Request) { } func getConfig(c *Context, w http.ResponseWriter, r *http.Request) { - json := utils.Cfg.ToJson() - cfg := model.ConfigFromJson(strings.NewReader(json)) - - cfg.Sanitize() - + cfg := app.GetConfig() w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") w.Write([]byte(cfg.ToJson())) } func reloadConfig(c *Context, w http.ResponseWriter, r *http.Request) { - debug.FreeOSMemory() - utils.LoadConfig(utils.CfgFileName) - - // start/restart email batching job if necessary - app.InitEmailBatching() - + app.ReloadConfig() w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") ReturnStatusOK(w) } func invalidateAllCaches(c *Context, w http.ResponseWriter, r *http.Request) { - debug.FreeOSMemory() - - app.InvalidateAllCaches() - - if einterfaces.GetClusterInterface() != nil { - err := einterfaces.GetClusterInterface().InvalidateAllCaches() - if err != nil { - c.Err = err - return - } - + err := app.InvalidateAllCaches() + if err != nil { + c.Err = err + return } w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") @@ -178,66 +107,18 @@ func saveConfig(c *Context, w http.ResponseWriter, r *http.Request) { return } - cfg.SetDefaults() - utils.Desanitize(cfg) - - if err := cfg.IsValid(); err != nil { - c.Err = err - return - } - - if err := utils.ValidateLdapFilter(cfg); err != nil { + err := app.SaveConfig(cfg) + if err != nil { c.Err = err return } - if *utils.Cfg.ClusterSettings.Enable { - c.Err = model.NewLocAppError("saveConfig", "ent.cluster.save_config.error", nil, "") - return - } - c.LogAudit("") - - //oldCfg := utils.Cfg - utils.SaveConfig(utils.CfgFileName, cfg) - utils.LoadConfig(utils.CfgFileName) - - if einterfaces.GetMetricsInterface() != nil { - if *utils.Cfg.MetricsSettings.Enable { - einterfaces.GetMetricsInterface().StartServer() - } else { - einterfaces.GetMetricsInterface().StopServer() - } - } - - // Future feature is to sync the configuration files - // if einterfaces.GetClusterInterface() != nil { - // err := einterfaces.GetClusterInterface().ConfigChanged(cfg, oldCfg, true) - // if err != nil { - // c.Err = err - // return - // } - // } - - // start/restart email batching job if necessary - app.InitEmailBatching() - - rdata := map[string]string{} - rdata["status"] = "OK" - w.Write([]byte(model.MapToJson(rdata))) + ReturnStatusOK(w) } func recycleDatabaseConnection(c *Context, w http.ResponseWriter, r *http.Request) { - oldStore := app.Srv.Store - - l4g.Warn(utils.T("api.admin.recycle_db_start.warn")) - app.Srv.Store = store.NewSqlStore() - - time.Sleep(20 * time.Second) - oldStore.Close() - - l4g.Warn(utils.T("api.admin.recycle_db_end.warn")) - + app.RecycleDatabaseConnection() w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") ReturnStatusOK(w) } @@ -249,32 +130,10 @@ func testEmail(c *Context, w http.ResponseWriter, r *http.Request) { return } - if len(cfg.EmailSettings.SMTPServer) == 0 { - c.Err = model.NewLocAppError("testEmail", "api.admin.test_email.missing_server", nil, utils.T("api.context.invalid_param.app_error", map[string]interface{}{"Name": "SMTPServer"})) - return - } - - // if the user hasn't changed their email settings, fill in the actual SMTP password so that - // the user can verify an existing SMTP connection - if cfg.EmailSettings.SMTPPassword == model.FAKE_SETTING { - if cfg.EmailSettings.SMTPServer == utils.Cfg.EmailSettings.SMTPServer && - cfg.EmailSettings.SMTPPort == utils.Cfg.EmailSettings.SMTPPort && - cfg.EmailSettings.SMTPUsername == utils.Cfg.EmailSettings.SMTPUsername { - cfg.EmailSettings.SMTPPassword = utils.Cfg.EmailSettings.SMTPPassword - } else { - c.Err = model.NewLocAppError("testEmail", "api.admin.test_email.reenter_password", nil, "") - return - } - } - - if result := <-app.Srv.Store.User().Get(c.Session.UserId); result.Err != nil { - c.Err = result.Err + err := app.TestEmail(c.Session.UserId, cfg) + if err != nil { + c.Err = err return - } else { - if err := utils.SendMailUsingConfig(result.Data.(*model.User).Email, c.T("api.admin.test_email.subject"), c.T("api.admin.test_email.body"), cfg); err != nil { - c.Err = err - return - } } m := make(map[string]string) @@ -283,26 +142,15 @@ func testEmail(c *Context, w http.ResponseWriter, r *http.Request) { } func getComplianceReports(c *Context, w http.ResponseWriter, r *http.Request) { - if !*utils.Cfg.ComplianceSettings.Enable || !utils.IsLicensed || !*utils.License.Features.Compliance { - c.Err = model.NewLocAppError("getComplianceReports", "ent.compliance.licence_disable.app_error", nil, "") - return - } - - if result := <-app.Srv.Store.Compliance().GetAll(); result.Err != nil { - c.Err = result.Err + crs, err := app.GetComplianceReports() + if err != nil { + c.Err = err return - } else { - crs := result.Data.(model.Compliances) - w.Write([]byte(crs.ToJson())) } + w.Write([]byte(crs.ToJson())) } func saveComplianceReport(c *Context, w http.ResponseWriter, r *http.Request) { - if !*utils.Cfg.ComplianceSettings.Enable || !utils.IsLicensed || !*utils.License.Features.Compliance || einterfaces.GetComplianceInterface() == nil { - c.Err = model.NewLocAppError("saveComplianceReport", "ent.compliance.licence_disable.app_error", nil, "") - return - } - job := model.ComplianceFromJson(r.Body) if job == nil { c.SetInvalidParam("saveComplianceReport", "compliance") @@ -310,25 +158,18 @@ func saveComplianceReport(c *Context, w http.ResponseWriter, r *http.Request) { } job.UserId = c.Session.UserId - job.Type = model.COMPLIANCE_TYPE_ADHOC - if result := <-app.Srv.Store.Compliance().Save(job); result.Err != nil { - c.Err = result.Err + rjob, err := app.SaveComplianceReport(job) + if err != nil { + c.Err = err return - } else { - job = result.Data.(*model.Compliance) - go einterfaces.GetComplianceInterface().RunComplianceJob(job) } - w.Write([]byte(job.ToJson())) + c.LogAudit("") + w.Write([]byte(rjob.ToJson())) } func downloadComplianceReport(c *Context, w http.ResponseWriter, r *http.Request) { - if !*utils.Cfg.ComplianceSettings.Enable || !utils.IsLicensed || !*utils.License.Features.Compliance || einterfaces.GetComplianceInterface() == nil { - c.Err = model.NewLocAppError("downloadComplianceReport", "ent.compliance.licence_disable.app_error", nil, "") - return - } - params := mux.Vars(r) id := params["id"] @@ -337,35 +178,36 @@ func downloadComplianceReport(c *Context, w http.ResponseWriter, r *http.Request return } - if result := <-app.Srv.Store.Compliance().Get(id); result.Err != nil { - c.Err = result.Err + job, err := app.GetComplianceReport(id) + if err != nil { + c.Err = err return - } else { - job := result.Data.(*model.Compliance) - c.LogAudit("downloaded " + job.Desc) + } - if f, err := ioutil.ReadFile(*utils.Cfg.ComplianceSettings.Directory + "compliance/" + job.JobName() + ".zip"); err != nil { - c.Err = model.NewLocAppError("readFile", "api.file.read_file.reading_local.app_error", nil, err.Error()) - return - } else { - w.Header().Set("Cache-Control", "max-age=2592000, public") - w.Header().Set("Content-Length", strconv.Itoa(len(f))) - w.Header().Del("Content-Type") // Content-Type will be set automatically by the http writer + reportBytes, err := app.GetComplianceFile(job) + if err != nil { + c.Err = err + return + } - // attach extra headers to trigger a download on IE, Edge, and Safari - ua := user_agent.New(r.UserAgent()) - bname, _ := ua.Browser() + c.LogAudit("downloaded " + job.Desc) - w.Header().Set("Content-Disposition", "attachment;filename=\""+job.JobName()+".zip\"") + w.Header().Set("Cache-Control", "max-age=2592000, public") + w.Header().Set("Content-Length", strconv.Itoa(len(reportBytes))) + w.Header().Del("Content-Type") // Content-Type will be set automatically by the http writer - if bname == "Edge" || bname == "Internet Explorer" || bname == "Safari" { - // trim off anything before the final / so we just get the file's name - w.Header().Set("Content-Type", "application/octet-stream") - } + // attach extra headers to trigger a download on IE, Edge, and Safari + ua := user_agent.New(r.UserAgent()) + bname, _ := ua.Browser() - w.Write(f) - } + w.Header().Set("Content-Disposition", "attachment;filename=\""+job.JobName()+".zip\"") + + if bname == "Edge" || bname == "Internet Explorer" || bname == "Safari" { + // trim off anything before the final / so we just get the file's name + w.Header().Set("Content-Type", "application/octet-stream") } + + w.Write(reportBytes) } func getAnalytics(c *Context, w http.ResponseWriter, r *http.Request) { @@ -373,237 +215,18 @@ func getAnalytics(c *Context, w http.ResponseWriter, r *http.Request) { teamId := params["id"] name := params["name"] - skipIntensiveQueries := false - var systemUserCount int64 - if r := <-app.Srv.Store.User().AnalyticsUniqueUserCount(""); r.Err != nil { - c.Err = r.Err + rows, err := app.GetAnalytics(name, teamId) + if err != nil { + c.Err = err return - } else { - systemUserCount = r.Data.(int64) - if systemUserCount > int64(*utils.Cfg.AnalyticsSettings.MaxUsersForStatistics) { - l4g.Debug("More than %v users on the system, intensive queries skipped", *utils.Cfg.AnalyticsSettings.MaxUsersForStatistics) - skipIntensiveQueries = true - } } - if name == "standard" { - var rows model.AnalyticsRows = make([]*model.AnalyticsRow, 10) - 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} - rows[5] = &model.AnalyticsRow{"total_websocket_connections", 0} - rows[6] = &model.AnalyticsRow{"total_master_db_connections", 0} - rows[7] = &model.AnalyticsRow{"total_read_db_connections", 0} - rows[8] = &model.AnalyticsRow{"daily_active_users", 0} - rows[9] = &model.AnalyticsRow{"monthly_active_users", 0} - - openChan := app.Srv.Store.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_OPEN) - privateChan := app.Srv.Store.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_PRIVATE) - teamChan := app.Srv.Store.Team().AnalyticsTeamCount() - - var userChan store.StoreChannel - if teamId != "" { - userChan = app.Srv.Store.User().AnalyticsUniqueUserCount(teamId) - } - - var postChan store.StoreChannel - if !skipIntensiveQueries { - postChan = app.Srv.Store.Post().AnalyticsPostCount(teamId, false, false) - } - - dailyActiveChan := app.Srv.Store.User().AnalyticsActiveCount(DAY_MILLISECONDS) - monthlyActiveChan := app.Srv.Store.User().AnalyticsActiveCount(MONTH_MILLISECONDS) - - if r := <-openChan; r.Err != nil { - c.Err = r.Err - return - } else { - rows[0].Value = float64(r.Data.(int64)) - } - - if r := <-privateChan; r.Err != nil { - c.Err = r.Err - return - } else { - rows[1].Value = float64(r.Data.(int64)) - } - - if postChan == nil { - rows[2].Value = -1 - } else { - if r := <-postChan; r.Err != nil { - c.Err = r.Err - return - } else { - rows[2].Value = float64(r.Data.(int64)) - } - } - - if userChan == nil { - rows[3].Value = float64(systemUserCount) - } else { - if r := <-userChan; r.Err != nil { - c.Err = r.Err - return - } else { - 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)) - } - - // If in HA mode then aggregrate all the stats - if einterfaces.GetClusterInterface() != nil && *utils.Cfg.ClusterSettings.Enable { - stats, err := einterfaces.GetClusterInterface().GetClusterStats() - if err != nil { - c.Err = err - return - } - - totalSockets := app.TotalWebsocketConnections() - totalMasterDb := app.Srv.Store.TotalMasterDbConnections() - totalReadDb := app.Srv.Store.TotalReadDbConnections() - - for _, stat := range stats { - totalSockets = totalSockets + stat.TotalWebsocketConnections - totalMasterDb = totalMasterDb + stat.TotalMasterDbConnections - totalReadDb = totalReadDb + stat.TotalReadDbConnections - } - - rows[5].Value = float64(totalSockets) - rows[6].Value = float64(totalMasterDb) - rows[7].Value = float64(totalReadDb) - - } else { - rows[5].Value = float64(app.TotalWebsocketConnections()) - rows[6].Value = float64(app.Srv.Store.TotalMasterDbConnections()) - rows[7].Value = float64(app.Srv.Store.TotalReadDbConnections()) - } - - if r := <-dailyActiveChan; r.Err != nil { - c.Err = r.Err - return - } else { - rows[8].Value = float64(r.Data.(int64)) - } - - if r := <-monthlyActiveChan; r.Err != nil { - c.Err = r.Err - return - } else { - rows[9].Value = float64(r.Data.(int64)) - } - - w.Write([]byte(rows.ToJson())) - } else if name == "post_counts_day" { - if skipIntensiveQueries { - rows := model.AnalyticsRows{&model.AnalyticsRow{"", -1}} - w.Write([]byte(rows.ToJson())) - return - } - - if r := <-app.Srv.Store.Post().AnalyticsPostCountsByDay(teamId); r.Err != nil { - c.Err = r.Err - return - } else { - w.Write([]byte(r.Data.(model.AnalyticsRows).ToJson())) - } - } else if name == "user_counts_with_posts_day" { - if skipIntensiveQueries { - rows := model.AnalyticsRows{&model.AnalyticsRow{"", -1}} - w.Write([]byte(rows.ToJson())) - return - } - - if r := <-app.Srv.Store.Post().AnalyticsUserCountsWithPostsByDay(teamId); r.Err != nil { - c.Err = r.Err - return - } else { - w.Write([]byte(r.Data.(model.AnalyticsRows).ToJson())) - } - } else if name == "extra_counts" { - 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} - - iHookChan := app.Srv.Store.Webhook().AnalyticsIncomingCount(teamId) - oHookChan := app.Srv.Store.Webhook().AnalyticsOutgoingCount(teamId) - commandChan := app.Srv.Store.Command().AnalyticsCommandCount(teamId) - sessionChan := app.Srv.Store.Session().AnalyticsSessionCount() - - var fileChan store.StoreChannel - var hashtagChan store.StoreChannel - if !skipIntensiveQueries { - fileChan = app.Srv.Store.Post().AnalyticsPostCount(teamId, true, false) - hashtagChan = app.Srv.Store.Post().AnalyticsPostCount(teamId, false, true) - } - - if fileChan == nil { - rows[0].Value = -1 - } else { - if r := <-fileChan; r.Err != nil { - c.Err = r.Err - return - } else { - rows[0].Value = float64(r.Data.(int64)) - } - } - - if hashtagChan == nil { - rows[1].Value = -1 - } else { - if r := <-hashtagChan; r.Err != nil { - c.Err = r.Err - return - } else { - rows[1].Value = float64(r.Data.(int64)) - } - } - - if r := <-iHookChan; r.Err != nil { - c.Err = r.Err - return - } else { - rows[2].Value = float64(r.Data.(int64)) - } - - if r := <-oHookChan; r.Err != nil { - c.Err = r.Err - return - } else { - 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 { + if rows == nil { c.SetInvalidParam("getAnalytics", "name") + return } + w.Write([]byte(rows.ToJson())) } func uploadBrandImage(c *Context, w http.ResponseWriter, r *http.Request) { @@ -639,40 +262,18 @@ func uploadBrandImage(c *Context, w http.ResponseWriter, r *http.Request) { return } - brandInterface := einterfaces.GetBrandInterface() - if brandInterface == nil { - c.Err = model.NewLocAppError("uploadBrandImage", "api.admin.upload_brand_image.not_available.app_error", nil, "") - c.Err.StatusCode = http.StatusNotImplemented - return - } - - if err := brandInterface.SaveBrandImage(imageArray[0]); err != nil { + if err := app.SaveBrandImage(imageArray[0]); err != nil { c.Err = err return } c.LogAudit("") - rdata := map[string]string{} - rdata["status"] = "OK" - w.Write([]byte(model.MapToJson(rdata))) + ReturnStatusOK(w) } func getBrandImage(c *Context, w http.ResponseWriter, r *http.Request) { - if len(utils.Cfg.FileSettings.DriverName) == 0 { - c.Err = model.NewLocAppError("getBrandImage", "api.admin.get_brand_image.storage.app_error", nil, "") - c.Err.StatusCode = http.StatusNotImplemented - return - } - - brandInterface := einterfaces.GetBrandInterface() - if brandInterface == nil { - c.Err = model.NewLocAppError("getBrandImage", "api.admin.get_brand_image.not_available.app_error", nil, "") - c.Err.StatusCode = http.StatusNotImplemented - return - } - - if img, err := brandInterface.GetBrandImage(); err != nil { + if img, err := app.GetBrandImage(); err != nil { w.Write(nil) } else { w.Header().Set("Content-Type", "image/png") @@ -716,7 +317,7 @@ func adminResetPassword(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err := ResetPassword(c, userId, newPassword); err != nil { + if err := app.UpdatePasswordByUserIdSendEmail(userId, newPassword, c.T("api.user.reset_password.method"), c.GetSiteURL()); err != nil { c.Err = err return } @@ -729,15 +330,7 @@ func adminResetPassword(c *Context, w http.ResponseWriter, r *http.Request) { } func ldapSyncNow(c *Context, w http.ResponseWriter, r *http.Request) { - go func() { - if utils.IsLicensed && *utils.License.Features.LDAP && *utils.Cfg.LdapSettings.Enable { - if ldapI := einterfaces.GetLdapInterface(); ldapI != nil { - ldapI.SyncNow() - } else { - l4g.Error("%v", model.NewLocAppError("ldapSyncNow", "ent.ldap.disabled.app_error", nil, "").Error()) - } - } - }() + app.SyncLdap() rdata := map[string]string{} rdata["status"] = "ok" @@ -745,33 +338,18 @@ func ldapSyncNow(c *Context, w http.ResponseWriter, r *http.Request) { } func ldapTest(c *Context, w http.ResponseWriter, r *http.Request) { - if ldapI := einterfaces.GetLdapInterface(); ldapI != nil && utils.IsLicensed && *utils.License.Features.LDAP && *utils.Cfg.LdapSettings.Enable { - if err := ldapI.RunTest(); err != nil { - c.Err = err - c.Err.StatusCode = 500 - } - } else { - c.Err = model.NewLocAppError("ldapTest", "ent.ldap.disabled.app_error", nil, "") - c.Err.StatusCode = http.StatusNotImplemented + if err := app.TestLdap(); err != nil { + c.Err = err + return } - if c.Err == nil { - rdata := map[string]string{} - rdata["status"] = "ok" - w.Write([]byte(model.MapToJson(rdata))) - } + rdata := map[string]string{} + rdata["status"] = "ok" + w.Write([]byte(model.MapToJson(rdata))) } func samlMetadata(c *Context, w http.ResponseWriter, r *http.Request) { - samlInterface := einterfaces.GetSamlInterface() - - if samlInterface == nil { - c.Err = model.NewLocAppError("loginWithSaml", "api.admin.saml.not_available.app_error", nil, "") - c.Err.StatusCode = http.StatusFound - return - } - - if result, err := samlInterface.GetMetadata(); err != nil { + if result, err := app.GetSamlMetadata(); err != nil { c.Err = model.NewLocAppError("loginWithSaml", "api.admin.saml.metadata.app_error", nil, "err="+err.Message) return } else { @@ -805,58 +383,38 @@ func addCertificate(c *Context, w http.ResponseWriter, r *http.Request) { fileData := fileArray[0] - file, err := fileData.Open() - defer file.Close() - if err != nil { - c.Err = model.NewLocAppError("addCertificate", "api.admin.add_certificate.open.app_error", nil, err.Error()) - return - } - - out, err := os.Create(utils.FindDir("config") + fileData.Filename) - if err != nil { - c.Err = model.NewLocAppError("addCertificate", "api.admin.add_certificate.saving.app_error", nil, err.Error()) + if err := app.AddSamlCertificate(fileData); err != nil { + c.Err = err return } - defer out.Close() - - io.Copy(out, file) ReturnStatusOK(w) } func removeCertificate(c *Context, w http.ResponseWriter, r *http.Request) { props := model.MapFromJson(r.Body) - filename := props["filename"] - if err := os.Remove(utils.FindConfigFile(filename)); err != nil { - c.Err = model.NewLocAppError("removeCertificate", "api.admin.remove_certificate.delete.app_error", - map[string]interface{}{"Filename": filename}, err.Error()) + if err := app.RemoveSamlCertificate(props["filename"]); err != nil { + c.Err = err return } + ReturnStatusOK(w) } func samlCertificateStatus(c *Context, w http.ResponseWriter, r *http.Request) { - status := make(map[string]interface{}) - - status["IdpCertificateFile"] = utils.FileExistsInConfigFolder(*utils.Cfg.SamlSettings.IdpCertificateFile) - status["PrivateKeyFile"] = utils.FileExistsInConfigFolder(*utils.Cfg.SamlSettings.PrivateKeyFile) - status["PublicCertificateFile"] = utils.FileExistsInConfigFolder(*utils.Cfg.SamlSettings.PublicCertificateFile) - + status := app.GetSamlCertificateStatus() w.Write([]byte(model.StringInterfaceToJson(status))) } func getRecentlyActiveUsers(c *Context, w http.ResponseWriter, r *http.Request) { - if result := <-app.Srv.Store.User().GetRecentlyActiveUsersForTeam(c.TeamId); result.Err != nil { - c.Err = result.Err + if profiles, err := app.GetRecentlyActiveUsersForTeam(c.TeamId); err != nil { + c.Err = err return } else { - profiles := result.Data.(map[string]*model.User) - for _, p := range profiles { sanitizeProfile(c, p) } w.Write([]byte(model.UserMapToJson(profiles))) } - } |