diff options
author | Chris <ccbrown112@gmail.com> | 2017-09-22 12:54:27 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-09-22 13:54:27 -0400 |
commit | dcf9e96a0b16530549168a7891ed8242663b5f28 (patch) | |
tree | 344255f0abbe1bd207e2f2ab864d245e240f4eeb /api4 | |
parent | e0d5703f721aafef1b55747cd09629860e86bfb4 (diff) | |
download | chat-dcf9e96a0b16530549168a7891ed8242663b5f28.tar.gz chat-dcf9e96a0b16530549168a7891ed8242663b5f28.tar.bz2 chat-dcf9e96a0b16530549168a7891ed8242663b5f28.zip |
remove global refs from api/api4 (#7496)
Diffstat (limited to 'api4')
-rw-r--r-- | api4/api.go | 233 | ||||
-rw-r--r-- | api4/apitestlib.go | 2 | ||||
-rw-r--r-- | api4/brand.go | 6 | ||||
-rw-r--r-- | api4/channel.go | 70 | ||||
-rw-r--r-- | api4/cluster.go | 4 | ||||
-rw-r--r-- | api4/command.go | 20 | ||||
-rw-r--r-- | api4/compliance.go | 10 | ||||
-rw-r--r-- | api4/context.go | 46 | ||||
-rw-r--r-- | api4/elasticsearch.go | 6 | ||||
-rw-r--r-- | api4/emoji.go | 12 | ||||
-rw-r--r-- | api4/file.go | 16 | ||||
-rw-r--r-- | api4/job.go | 12 | ||||
-rw-r--r-- | api4/ldap.go | 6 | ||||
-rw-r--r-- | api4/oauth.go | 40 | ||||
-rw-r--r-- | api4/openGraph.go | 4 | ||||
-rw-r--r-- | api4/plugin.go | 10 | ||||
-rw-r--r-- | api4/post.go | 42 | ||||
-rw-r--r-- | api4/preference.go | 12 | ||||
-rw-r--r-- | api4/reaction.go | 8 | ||||
-rw-r--r-- | api4/saml.go | 18 | ||||
-rw-r--r-- | api4/status.go | 8 | ||||
-rw-r--r-- | api4/system.go | 34 | ||||
-rw-r--r-- | api4/team.go | 60 | ||||
-rw-r--r-- | api4/user.go | 98 | ||||
-rw-r--r-- | api4/webhook.go | 30 | ||||
-rw-r--r-- | api4/webrtc.go | 4 | ||||
-rw-r--r-- | api4/websocket.go | 4 |
27 files changed, 415 insertions, 400 deletions
diff --git a/api4/api.go b/api4/api.go index 16c816528..9df051456 100644 --- a/api4/api.go +++ b/api4/api.go @@ -102,7 +102,10 @@ type Routes struct { Webrtc *mux.Router // 'api/v4/webrtc' } -var BaseRoutes *Routes +type API struct { + App *app.App + BaseRoutes *Routes +} func NewRouter() *mux.Router { ret := mux.NewRouter() @@ -110,108 +113,112 @@ func NewRouter() *mux.Router { return ret } -func InitApi(root *mux.Router, full bool) { - BaseRoutes = &Routes{} - BaseRoutes.Root = root - BaseRoutes.ApiRoot = root.PathPrefix(model.API_URL_SUFFIX).Subrouter() - - BaseRoutes.Users = BaseRoutes.ApiRoot.PathPrefix("/users").Subrouter() - BaseRoutes.User = BaseRoutes.ApiRoot.PathPrefix("/users/{user_id:[A-Za-z0-9]+}").Subrouter() - BaseRoutes.UserByUsername = BaseRoutes.Users.PathPrefix("/username/{username:[A-Za-z0-9\\_\\-\\.]+}").Subrouter() - BaseRoutes.UserByEmail = BaseRoutes.Users.PathPrefix("/email/{email}").Subrouter() - - BaseRoutes.Teams = BaseRoutes.ApiRoot.PathPrefix("/teams").Subrouter() - BaseRoutes.TeamsForUser = BaseRoutes.User.PathPrefix("/teams").Subrouter() - BaseRoutes.Team = BaseRoutes.Teams.PathPrefix("/{team_id:[A-Za-z0-9]+}").Subrouter() - BaseRoutes.TeamForUser = BaseRoutes.TeamsForUser.PathPrefix("/{team_id:[A-Za-z0-9]+}").Subrouter() - BaseRoutes.TeamByName = BaseRoutes.Teams.PathPrefix("/name/{team_name:[A-Za-z0-9_-]+}").Subrouter() - BaseRoutes.TeamMembers = BaseRoutes.Team.PathPrefix("/members").Subrouter() - BaseRoutes.TeamMember = BaseRoutes.TeamMembers.PathPrefix("/{user_id:[A-Za-z0-9]+}").Subrouter() - BaseRoutes.TeamMembersForUser = BaseRoutes.User.PathPrefix("/teams/members").Subrouter() - - BaseRoutes.Channels = BaseRoutes.ApiRoot.PathPrefix("/channels").Subrouter() - BaseRoutes.Channel = BaseRoutes.Channels.PathPrefix("/{channel_id:[A-Za-z0-9]+}").Subrouter() - BaseRoutes.ChannelForUser = BaseRoutes.User.PathPrefix("/channels/{channel_id:[A-Za-z0-9]+}").Subrouter() - BaseRoutes.ChannelByName = BaseRoutes.Team.PathPrefix("/channels/name/{channel_name:[A-Za-z0-9_-]+}").Subrouter() - BaseRoutes.ChannelByNameForTeamName = BaseRoutes.TeamByName.PathPrefix("/channels/name/{channel_name:[A-Za-z0-9_-]+}").Subrouter() - BaseRoutes.ChannelsForTeam = BaseRoutes.Team.PathPrefix("/channels").Subrouter() - BaseRoutes.ChannelMembers = BaseRoutes.Channel.PathPrefix("/members").Subrouter() - BaseRoutes.ChannelMember = BaseRoutes.ChannelMembers.PathPrefix("/{user_id:[A-Za-z0-9]+}").Subrouter() - BaseRoutes.ChannelMembersForUser = BaseRoutes.User.PathPrefix("/teams/{team_id:[A-Za-z0-9]+}/channels/members").Subrouter() - - BaseRoutes.Posts = BaseRoutes.ApiRoot.PathPrefix("/posts").Subrouter() - BaseRoutes.Post = BaseRoutes.Posts.PathPrefix("/{post_id:[A-Za-z0-9]+}").Subrouter() - BaseRoutes.PostsForChannel = BaseRoutes.Channel.PathPrefix("/posts").Subrouter() - BaseRoutes.PostsForUser = BaseRoutes.User.PathPrefix("/posts").Subrouter() - BaseRoutes.PostForUser = BaseRoutes.PostsForUser.PathPrefix("/{post_id:[A-Za-z0-9]+}").Subrouter() - - BaseRoutes.Files = BaseRoutes.ApiRoot.PathPrefix("/files").Subrouter() - BaseRoutes.File = BaseRoutes.Files.PathPrefix("/{file_id:[A-Za-z0-9]+}").Subrouter() - BaseRoutes.PublicFile = BaseRoutes.Root.PathPrefix("/files/{file_id:[A-Za-z0-9]+}/public").Subrouter() - - BaseRoutes.Plugins = BaseRoutes.ApiRoot.PathPrefix("/plugins").Subrouter() - BaseRoutes.Plugin = BaseRoutes.Plugins.PathPrefix("/{plugin_id:[A-Za-z0-9\\_\\-\\.]+}").Subrouter() - - BaseRoutes.Commands = BaseRoutes.ApiRoot.PathPrefix("/commands").Subrouter() - BaseRoutes.Command = BaseRoutes.Commands.PathPrefix("/{command_id:[A-Za-z0-9]+}").Subrouter() - - BaseRoutes.Hooks = BaseRoutes.ApiRoot.PathPrefix("/hooks").Subrouter() - BaseRoutes.IncomingHooks = BaseRoutes.Hooks.PathPrefix("/incoming").Subrouter() - BaseRoutes.IncomingHook = BaseRoutes.IncomingHooks.PathPrefix("/{hook_id:[A-Za-z0-9]+}").Subrouter() - BaseRoutes.OutgoingHooks = BaseRoutes.Hooks.PathPrefix("/outgoing").Subrouter() - BaseRoutes.OutgoingHook = BaseRoutes.OutgoingHooks.PathPrefix("/{hook_id:[A-Za-z0-9]+}").Subrouter() - - BaseRoutes.SAML = BaseRoutes.ApiRoot.PathPrefix("/saml").Subrouter() - - BaseRoutes.OAuth = BaseRoutes.ApiRoot.PathPrefix("/oauth").Subrouter() - BaseRoutes.OAuthApps = BaseRoutes.OAuth.PathPrefix("/apps").Subrouter() - BaseRoutes.OAuthApp = BaseRoutes.OAuthApps.PathPrefix("/{app_id:[A-Za-z0-9]+}").Subrouter() - - BaseRoutes.Compliance = BaseRoutes.ApiRoot.PathPrefix("/compliance").Subrouter() - BaseRoutes.Cluster = BaseRoutes.ApiRoot.PathPrefix("/cluster").Subrouter() - BaseRoutes.LDAP = BaseRoutes.ApiRoot.PathPrefix("/ldap").Subrouter() - BaseRoutes.Brand = BaseRoutes.ApiRoot.PathPrefix("/brand").Subrouter() - BaseRoutes.System = BaseRoutes.ApiRoot.PathPrefix("/system").Subrouter() - BaseRoutes.Preferences = BaseRoutes.User.PathPrefix("/preferences").Subrouter() - BaseRoutes.License = BaseRoutes.ApiRoot.PathPrefix("/license").Subrouter() - BaseRoutes.Public = BaseRoutes.ApiRoot.PathPrefix("/public").Subrouter() - BaseRoutes.Reactions = BaseRoutes.ApiRoot.PathPrefix("/reactions").Subrouter() - BaseRoutes.Jobs = BaseRoutes.ApiRoot.PathPrefix("/jobs").Subrouter() - BaseRoutes.Elasticsearch = BaseRoutes.ApiRoot.PathPrefix("/elasticsearch").Subrouter() - - BaseRoutes.Emojis = BaseRoutes.ApiRoot.PathPrefix("/emoji").Subrouter() - BaseRoutes.Emoji = BaseRoutes.Emojis.PathPrefix("/{emoji_id:[A-Za-z0-9]+}").Subrouter() - - BaseRoutes.ReactionByNameForPostForUser = BaseRoutes.PostForUser.PathPrefix("/reactions/{emoji_name:[A-Za-z0-9\\_\\-\\+]+}").Subrouter() - - BaseRoutes.Webrtc = BaseRoutes.ApiRoot.PathPrefix("/webrtc").Subrouter() - - BaseRoutes.OpenGraph = BaseRoutes.ApiRoot.PathPrefix("/opengraph").Subrouter() - - InitUser() - InitTeam() - InitChannel() - InitPost() - InitFile() - InitSystem() - InitWebhook() - InitPreference() - InitSaml() - InitCompliance() - InitCluster() - InitLdap() - InitElasticsearch() - InitBrand() - InitJob() - InitCommand() - InitStatus() - InitWebSocket() - InitEmoji() - InitOAuth() - InitReaction() - InitWebrtc() - InitOpenGraph() - InitPlugin() +func Init(a *app.App, root *mux.Router, full bool) *API { + api := &API{ + App: a, + BaseRoutes: &Routes{}, + } + + api.BaseRoutes.Root = root + api.BaseRoutes.ApiRoot = root.PathPrefix(model.API_URL_SUFFIX).Subrouter() + + api.BaseRoutes.Users = api.BaseRoutes.ApiRoot.PathPrefix("/users").Subrouter() + api.BaseRoutes.User = api.BaseRoutes.ApiRoot.PathPrefix("/users/{user_id:[A-Za-z0-9]+}").Subrouter() + api.BaseRoutes.UserByUsername = api.BaseRoutes.Users.PathPrefix("/username/{username:[A-Za-z0-9\\_\\-\\.]+}").Subrouter() + api.BaseRoutes.UserByEmail = api.BaseRoutes.Users.PathPrefix("/email/{email}").Subrouter() + + api.BaseRoutes.Teams = api.BaseRoutes.ApiRoot.PathPrefix("/teams").Subrouter() + api.BaseRoutes.TeamsForUser = api.BaseRoutes.User.PathPrefix("/teams").Subrouter() + api.BaseRoutes.Team = api.BaseRoutes.Teams.PathPrefix("/{team_id:[A-Za-z0-9]+}").Subrouter() + api.BaseRoutes.TeamForUser = api.BaseRoutes.TeamsForUser.PathPrefix("/{team_id:[A-Za-z0-9]+}").Subrouter() + api.BaseRoutes.TeamByName = api.BaseRoutes.Teams.PathPrefix("/name/{team_name:[A-Za-z0-9_-]+}").Subrouter() + api.BaseRoutes.TeamMembers = api.BaseRoutes.Team.PathPrefix("/members").Subrouter() + api.BaseRoutes.TeamMember = api.BaseRoutes.TeamMembers.PathPrefix("/{user_id:[A-Za-z0-9]+}").Subrouter() + api.BaseRoutes.TeamMembersForUser = api.BaseRoutes.User.PathPrefix("/teams/members").Subrouter() + + api.BaseRoutes.Channels = api.BaseRoutes.ApiRoot.PathPrefix("/channels").Subrouter() + api.BaseRoutes.Channel = api.BaseRoutes.Channels.PathPrefix("/{channel_id:[A-Za-z0-9]+}").Subrouter() + api.BaseRoutes.ChannelForUser = api.BaseRoutes.User.PathPrefix("/channels/{channel_id:[A-Za-z0-9]+}").Subrouter() + api.BaseRoutes.ChannelByName = api.BaseRoutes.Team.PathPrefix("/channels/name/{channel_name:[A-Za-z0-9_-]+}").Subrouter() + api.BaseRoutes.ChannelByNameForTeamName = api.BaseRoutes.TeamByName.PathPrefix("/channels/name/{channel_name:[A-Za-z0-9_-]+}").Subrouter() + api.BaseRoutes.ChannelsForTeam = api.BaseRoutes.Team.PathPrefix("/channels").Subrouter() + api.BaseRoutes.ChannelMembers = api.BaseRoutes.Channel.PathPrefix("/members").Subrouter() + api.BaseRoutes.ChannelMember = api.BaseRoutes.ChannelMembers.PathPrefix("/{user_id:[A-Za-z0-9]+}").Subrouter() + api.BaseRoutes.ChannelMembersForUser = api.BaseRoutes.User.PathPrefix("/teams/{team_id:[A-Za-z0-9]+}/channels/members").Subrouter() + + api.BaseRoutes.Posts = api.BaseRoutes.ApiRoot.PathPrefix("/posts").Subrouter() + api.BaseRoutes.Post = api.BaseRoutes.Posts.PathPrefix("/{post_id:[A-Za-z0-9]+}").Subrouter() + api.BaseRoutes.PostsForChannel = api.BaseRoutes.Channel.PathPrefix("/posts").Subrouter() + api.BaseRoutes.PostsForUser = api.BaseRoutes.User.PathPrefix("/posts").Subrouter() + api.BaseRoutes.PostForUser = api.BaseRoutes.PostsForUser.PathPrefix("/{post_id:[A-Za-z0-9]+}").Subrouter() + + api.BaseRoutes.Files = api.BaseRoutes.ApiRoot.PathPrefix("/files").Subrouter() + api.BaseRoutes.File = api.BaseRoutes.Files.PathPrefix("/{file_id:[A-Za-z0-9]+}").Subrouter() + api.BaseRoutes.PublicFile = api.BaseRoutes.Root.PathPrefix("/files/{file_id:[A-Za-z0-9]+}/public").Subrouter() + + api.BaseRoutes.Plugins = api.BaseRoutes.ApiRoot.PathPrefix("/plugins").Subrouter() + api.BaseRoutes.Plugin = api.BaseRoutes.Plugins.PathPrefix("/{plugin_id:[A-Za-z0-9\\_\\-\\.]+}").Subrouter() + + api.BaseRoutes.Commands = api.BaseRoutes.ApiRoot.PathPrefix("/commands").Subrouter() + api.BaseRoutes.Command = api.BaseRoutes.Commands.PathPrefix("/{command_id:[A-Za-z0-9]+}").Subrouter() + + api.BaseRoutes.Hooks = api.BaseRoutes.ApiRoot.PathPrefix("/hooks").Subrouter() + api.BaseRoutes.IncomingHooks = api.BaseRoutes.Hooks.PathPrefix("/incoming").Subrouter() + api.BaseRoutes.IncomingHook = api.BaseRoutes.IncomingHooks.PathPrefix("/{hook_id:[A-Za-z0-9]+}").Subrouter() + api.BaseRoutes.OutgoingHooks = api.BaseRoutes.Hooks.PathPrefix("/outgoing").Subrouter() + api.BaseRoutes.OutgoingHook = api.BaseRoutes.OutgoingHooks.PathPrefix("/{hook_id:[A-Za-z0-9]+}").Subrouter() + + api.BaseRoutes.SAML = api.BaseRoutes.ApiRoot.PathPrefix("/saml").Subrouter() + + api.BaseRoutes.OAuth = api.BaseRoutes.ApiRoot.PathPrefix("/oauth").Subrouter() + api.BaseRoutes.OAuthApps = api.BaseRoutes.OAuth.PathPrefix("/apps").Subrouter() + api.BaseRoutes.OAuthApp = api.BaseRoutes.OAuthApps.PathPrefix("/{app_id:[A-Za-z0-9]+}").Subrouter() + + api.BaseRoutes.Compliance = api.BaseRoutes.ApiRoot.PathPrefix("/compliance").Subrouter() + api.BaseRoutes.Cluster = api.BaseRoutes.ApiRoot.PathPrefix("/cluster").Subrouter() + api.BaseRoutes.LDAP = api.BaseRoutes.ApiRoot.PathPrefix("/ldap").Subrouter() + api.BaseRoutes.Brand = api.BaseRoutes.ApiRoot.PathPrefix("/brand").Subrouter() + api.BaseRoutes.System = api.BaseRoutes.ApiRoot.PathPrefix("/system").Subrouter() + api.BaseRoutes.Preferences = api.BaseRoutes.User.PathPrefix("/preferences").Subrouter() + api.BaseRoutes.License = api.BaseRoutes.ApiRoot.PathPrefix("/license").Subrouter() + api.BaseRoutes.Public = api.BaseRoutes.ApiRoot.PathPrefix("/public").Subrouter() + api.BaseRoutes.Reactions = api.BaseRoutes.ApiRoot.PathPrefix("/reactions").Subrouter() + api.BaseRoutes.Jobs = api.BaseRoutes.ApiRoot.PathPrefix("/jobs").Subrouter() + api.BaseRoutes.Elasticsearch = api.BaseRoutes.ApiRoot.PathPrefix("/elasticsearch").Subrouter() + + api.BaseRoutes.Emojis = api.BaseRoutes.ApiRoot.PathPrefix("/emoji").Subrouter() + api.BaseRoutes.Emoji = api.BaseRoutes.Emojis.PathPrefix("/{emoji_id:[A-Za-z0-9]+}").Subrouter() + + api.BaseRoutes.ReactionByNameForPostForUser = api.BaseRoutes.PostForUser.PathPrefix("/reactions/{emoji_name:[A-Za-z0-9\\_\\-\\+]+}").Subrouter() + + api.BaseRoutes.Webrtc = api.BaseRoutes.ApiRoot.PathPrefix("/webrtc").Subrouter() + + api.BaseRoutes.OpenGraph = api.BaseRoutes.ApiRoot.PathPrefix("/opengraph").Subrouter() + + api.InitUser() + api.InitTeam() + api.InitChannel() + api.InitPost() + api.InitFile() + api.InitSystem() + api.InitWebhook() + api.InitPreference() + api.InitSaml() + api.InitCompliance() + api.InitCluster() + api.InitLdap() + api.InitElasticsearch() + api.InitBrand() + api.InitJob() + api.InitCommand() + api.InitStatus() + api.InitWebSocket() + api.InitEmoji() + api.InitOAuth() + api.InitReaction() + api.InitWebrtc() + api.InitOpenGraph() + api.InitPlugin() root.Handle("/api/v4/{anything:.*}", http.HandlerFunc(Handle404)) @@ -221,26 +228,8 @@ func InitApi(root *mux.Router, full bool) { app.InitEmailBatching() } -} - -func HandleEtag(etag string, routeName string, w http.ResponseWriter, r *http.Request) bool { - metrics := app.Global().Metrics - if et := r.Header.Get(model.HEADER_ETAG_CLIENT); len(etag) > 0 { - if et == etag { - w.Header().Set(model.HEADER_ETAG_SERVER, etag) - w.WriteHeader(http.StatusNotModified) - if metrics != nil { - metrics.IncrementEtagHitCounter(routeName) - } - return true - } - } - - if metrics != nil { - metrics.IncrementEtagMissCounter(routeName) - } - return false + return api } func Handle404(w http.ResponseWriter, r *http.Request) { diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 9538eb99c..7b5230014 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -63,7 +63,7 @@ func setupTestHelper(enterprise bool) *TestHelper { th.App.Srv.Router = NewRouter() wsapi.InitRouter() th.App.StartServer() - InitApi(th.App.Srv.Router, true) + Init(th.App, th.App.Srv.Router, true) wsapi.InitApi() utils.EnableDebugLogForTest() th.App.Srv.Store.MarkSystemRanUnitTests() diff --git a/api4/brand.go b/api4/brand.go index ef4ea25b5..23bfc557d 100644 --- a/api4/brand.go +++ b/api4/brand.go @@ -12,11 +12,11 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitBrand() { +func (api *API) InitBrand() { l4g.Debug(utils.T("api.brand.init.debug")) - BaseRoutes.Brand.Handle("/image", ApiHandlerTrustRequester(getBrandImage)).Methods("GET") - BaseRoutes.Brand.Handle("/image", ApiSessionRequired(uploadBrandImage)).Methods("POST") + api.BaseRoutes.Brand.Handle("/image", api.ApiHandlerTrustRequester(getBrandImage)).Methods("GET") + api.BaseRoutes.Brand.Handle("/image", api.ApiSessionRequired(uploadBrandImage)).Methods("POST") } func getBrandImage(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/channel.go b/api4/channel.go index 8f3f46b8c..9eaa6ec8a 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -12,41 +12,41 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitChannel() { +func (api *API) InitChannel() { l4g.Debug(utils.T("api.channel.init.debug")) - BaseRoutes.Channels.Handle("", ApiSessionRequired(createChannel)).Methods("POST") - BaseRoutes.Channels.Handle("/direct", ApiSessionRequired(createDirectChannel)).Methods("POST") - BaseRoutes.Channels.Handle("/group", ApiSessionRequired(createGroupChannel)).Methods("POST") - BaseRoutes.Channels.Handle("/members/{user_id:[A-Za-z0-9]+}/view", ApiSessionRequired(viewChannel)).Methods("POST") - - BaseRoutes.ChannelsForTeam.Handle("", ApiSessionRequired(getPublicChannelsForTeam)).Methods("GET") - BaseRoutes.ChannelsForTeam.Handle("/deleted", ApiSessionRequired(getDeletedChannelsForTeam)).Methods("GET") - BaseRoutes.ChannelsForTeam.Handle("/ids", ApiSessionRequired(getPublicChannelsByIdsForTeam)).Methods("POST") - BaseRoutes.ChannelsForTeam.Handle("/search", ApiSessionRequired(searchChannelsForTeam)).Methods("POST") - BaseRoutes.User.Handle("/teams/{team_id:[A-Za-z0-9]+}/channels", ApiSessionRequired(getChannelsForTeamForUser)).Methods("GET") - - BaseRoutes.Channel.Handle("", ApiSessionRequired(getChannel)).Methods("GET") - BaseRoutes.Channel.Handle("", ApiSessionRequired(updateChannel)).Methods("PUT") - BaseRoutes.Channel.Handle("/patch", ApiSessionRequired(patchChannel)).Methods("PUT") - BaseRoutes.Channel.Handle("/restore", ApiSessionRequired(restoreChannel)).Methods("POST") - BaseRoutes.Channel.Handle("", ApiSessionRequired(deleteChannel)).Methods("DELETE") - BaseRoutes.Channel.Handle("/stats", ApiSessionRequired(getChannelStats)).Methods("GET") - BaseRoutes.Channel.Handle("/pinned", ApiSessionRequired(getPinnedPosts)).Methods("GET") - - BaseRoutes.ChannelForUser.Handle("/unread", ApiSessionRequired(getChannelUnread)).Methods("GET") - - BaseRoutes.ChannelByName.Handle("", ApiSessionRequired(getChannelByName)).Methods("GET") - BaseRoutes.ChannelByNameForTeamName.Handle("", ApiSessionRequired(getChannelByNameForTeamName)).Methods("GET") - - BaseRoutes.ChannelMembers.Handle("", ApiSessionRequired(getChannelMembers)).Methods("GET") - BaseRoutes.ChannelMembers.Handle("/ids", ApiSessionRequired(getChannelMembersByIds)).Methods("POST") - BaseRoutes.ChannelMembers.Handle("", ApiSessionRequired(addChannelMember)).Methods("POST") - BaseRoutes.ChannelMembersForUser.Handle("", ApiSessionRequired(getChannelMembersForUser)).Methods("GET") - BaseRoutes.ChannelMember.Handle("", ApiSessionRequired(getChannelMember)).Methods("GET") - BaseRoutes.ChannelMember.Handle("", ApiSessionRequired(removeChannelMember)).Methods("DELETE") - BaseRoutes.ChannelMember.Handle("/roles", ApiSessionRequired(updateChannelMemberRoles)).Methods("PUT") - BaseRoutes.ChannelMember.Handle("/notify_props", ApiSessionRequired(updateChannelMemberNotifyProps)).Methods("PUT") + api.BaseRoutes.Channels.Handle("", api.ApiSessionRequired(createChannel)).Methods("POST") + api.BaseRoutes.Channels.Handle("/direct", api.ApiSessionRequired(createDirectChannel)).Methods("POST") + api.BaseRoutes.Channels.Handle("/group", api.ApiSessionRequired(createGroupChannel)).Methods("POST") + api.BaseRoutes.Channels.Handle("/members/{user_id:[A-Za-z0-9]+}/view", api.ApiSessionRequired(viewChannel)).Methods("POST") + + api.BaseRoutes.ChannelsForTeam.Handle("", api.ApiSessionRequired(getPublicChannelsForTeam)).Methods("GET") + api.BaseRoutes.ChannelsForTeam.Handle("/deleted", api.ApiSessionRequired(getDeletedChannelsForTeam)).Methods("GET") + api.BaseRoutes.ChannelsForTeam.Handle("/ids", api.ApiSessionRequired(getPublicChannelsByIdsForTeam)).Methods("POST") + api.BaseRoutes.ChannelsForTeam.Handle("/search", api.ApiSessionRequired(searchChannelsForTeam)).Methods("POST") + api.BaseRoutes.User.Handle("/teams/{team_id:[A-Za-z0-9]+}/channels", api.ApiSessionRequired(getChannelsForTeamForUser)).Methods("GET") + + api.BaseRoutes.Channel.Handle("", api.ApiSessionRequired(getChannel)).Methods("GET") + api.BaseRoutes.Channel.Handle("", api.ApiSessionRequired(updateChannel)).Methods("PUT") + api.BaseRoutes.Channel.Handle("/patch", api.ApiSessionRequired(patchChannel)).Methods("PUT") + api.BaseRoutes.Channel.Handle("/restore", api.ApiSessionRequired(restoreChannel)).Methods("POST") + api.BaseRoutes.Channel.Handle("", api.ApiSessionRequired(deleteChannel)).Methods("DELETE") + api.BaseRoutes.Channel.Handle("/stats", api.ApiSessionRequired(getChannelStats)).Methods("GET") + api.BaseRoutes.Channel.Handle("/pinned", api.ApiSessionRequired(getPinnedPosts)).Methods("GET") + + api.BaseRoutes.ChannelForUser.Handle("/unread", api.ApiSessionRequired(getChannelUnread)).Methods("GET") + + api.BaseRoutes.ChannelByName.Handle("", api.ApiSessionRequired(getChannelByName)).Methods("GET") + api.BaseRoutes.ChannelByNameForTeamName.Handle("", api.ApiSessionRequired(getChannelByNameForTeamName)).Methods("GET") + + api.BaseRoutes.ChannelMembers.Handle("", api.ApiSessionRequired(getChannelMembers)).Methods("GET") + api.BaseRoutes.ChannelMembers.Handle("/ids", api.ApiSessionRequired(getChannelMembersByIds)).Methods("POST") + api.BaseRoutes.ChannelMembers.Handle("", api.ApiSessionRequired(addChannelMember)).Methods("POST") + api.BaseRoutes.ChannelMembersForUser.Handle("", api.ApiSessionRequired(getChannelMembersForUser)).Methods("GET") + api.BaseRoutes.ChannelMember.Handle("", api.ApiSessionRequired(getChannelMember)).Methods("GET") + api.BaseRoutes.ChannelMember.Handle("", api.ApiSessionRequired(removeChannelMember)).Methods("DELETE") + api.BaseRoutes.ChannelMember.Handle("/roles", api.ApiSessionRequired(updateChannelMemberRoles)).Methods("PUT") + api.BaseRoutes.ChannelMember.Handle("/notify_props", api.ApiSessionRequired(updateChannelMemberNotifyProps)).Methods("PUT") } func createChannel(c *Context, w http.ResponseWriter, r *http.Request) { @@ -387,7 +387,7 @@ func getPinnedPosts(c *Context, w http.ResponseWriter, r *http.Request) { if posts, err := c.App.GetPinnedPosts(c.Params.ChannelId); err != nil { c.Err = err return - } else if HandleEtag(posts.Etag(), "Get Pinned Posts", w, r) { + } else if c.HandleEtag(posts.Etag(), "Get Pinned Posts", w, r) { return } else { w.Header().Set(model.HEADER_ETAG_SERVER, posts.Etag()) @@ -486,7 +486,7 @@ func getChannelsForTeamForUser(c *Context, w http.ResponseWriter, r *http.Reques if channels, err := c.App.GetChannelsForUser(c.Params.TeamId, c.Params.UserId); err != nil { c.Err = err return - } else if HandleEtag(channels.Etag(), "Get Channels", w, r) { + } else if c.HandleEtag(channels.Etag(), "Get Channels", w, r) { return } else { w.Header().Set(model.HEADER_ETAG_SERVER, channels.Etag()) diff --git a/api4/cluster.go b/api4/cluster.go index c802d2a7e..f79ef28a8 100644 --- a/api4/cluster.go +++ b/api4/cluster.go @@ -12,10 +12,10 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitCluster() { +func (api *API) InitCluster() { l4g.Debug(utils.T("api.cluster.init.debug")) - BaseRoutes.Cluster.Handle("/status", ApiSessionRequired(getClusterStatus)).Methods("GET") + api.BaseRoutes.Cluster.Handle("/status", api.ApiSessionRequired(getClusterStatus)).Methods("GET") } func getClusterStatus(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/command.go b/api4/command.go index ba15b0ff3..64426193d 100644 --- a/api4/command.go +++ b/api4/command.go @@ -15,21 +15,21 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitCommand() { +func (api *API) InitCommand() { l4g.Debug(utils.T("api.command.init.debug")) - BaseRoutes.Commands.Handle("", ApiSessionRequired(createCommand)).Methods("POST") - BaseRoutes.Commands.Handle("", ApiSessionRequired(listCommands)).Methods("GET") - BaseRoutes.Commands.Handle("/execute", ApiSessionRequired(executeCommand)).Methods("POST") + api.BaseRoutes.Commands.Handle("", api.ApiSessionRequired(createCommand)).Methods("POST") + api.BaseRoutes.Commands.Handle("", api.ApiSessionRequired(listCommands)).Methods("GET") + api.BaseRoutes.Commands.Handle("/execute", api.ApiSessionRequired(executeCommand)).Methods("POST") - BaseRoutes.Command.Handle("", ApiSessionRequired(updateCommand)).Methods("PUT") - BaseRoutes.Command.Handle("", ApiSessionRequired(deleteCommand)).Methods("DELETE") + api.BaseRoutes.Command.Handle("", api.ApiSessionRequired(updateCommand)).Methods("PUT") + api.BaseRoutes.Command.Handle("", api.ApiSessionRequired(deleteCommand)).Methods("DELETE") - BaseRoutes.Team.Handle("/commands/autocomplete", ApiSessionRequired(listAutocompleteCommands)).Methods("GET") - BaseRoutes.Command.Handle("/regen_token", ApiSessionRequired(regenCommandToken)).Methods("PUT") + api.BaseRoutes.Team.Handle("/commands/autocomplete", api.ApiSessionRequired(listAutocompleteCommands)).Methods("GET") + api.BaseRoutes.Command.Handle("/regen_token", api.ApiSessionRequired(regenCommandToken)).Methods("PUT") - BaseRoutes.Teams.Handle("/command_test", ApiHandler(testCommand)).Methods("POST") - BaseRoutes.Teams.Handle("/command_test", ApiHandler(testCommand)).Methods("GET") + api.BaseRoutes.Teams.Handle("/command_test", api.ApiHandler(testCommand)).Methods("POST") + api.BaseRoutes.Teams.Handle("/command_test", api.ApiHandler(testCommand)).Methods("GET") } func createCommand(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/compliance.go b/api4/compliance.go index fe93834e3..7d0708efe 100644 --- a/api4/compliance.go +++ b/api4/compliance.go @@ -14,13 +14,13 @@ import ( "github.com/mssola/user_agent" ) -func InitCompliance() { +func (api *API) InitCompliance() { l4g.Debug(utils.T("api.compliance.init.debug")) - BaseRoutes.Compliance.Handle("/reports", ApiSessionRequired(createComplianceReport)).Methods("POST") - BaseRoutes.Compliance.Handle("/reports", ApiSessionRequired(getComplianceReports)).Methods("GET") - BaseRoutes.Compliance.Handle("/reports/{report_id:[A-Za-z0-9]+}", ApiSessionRequired(getComplianceReport)).Methods("GET") - BaseRoutes.Compliance.Handle("/reports/{report_id:[A-Za-z0-9]+}/download", ApiSessionRequiredTrustRequester(downloadComplianceReport)).Methods("GET") + api.BaseRoutes.Compliance.Handle("/reports", api.ApiSessionRequired(createComplianceReport)).Methods("POST") + api.BaseRoutes.Compliance.Handle("/reports", api.ApiSessionRequired(getComplianceReports)).Methods("GET") + api.BaseRoutes.Compliance.Handle("/reports/{report_id:[A-Za-z0-9]+}", api.ApiSessionRequired(getComplianceReport)).Methods("GET") + api.BaseRoutes.Compliance.Handle("/reports/{report_id:[A-Za-z0-9]+}/download", api.ApiSessionRequiredTrustRequester(downloadComplianceReport)).Methods("GET") } func createComplianceReport(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/context.go b/api4/context.go index cd32bc7b1..c526f38bb 100644 --- a/api4/context.go +++ b/api4/context.go @@ -30,8 +30,9 @@ type Context struct { siteURLHeader string } -func ApiHandler(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { +func (api *API) ApiHandler(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { return &handler{ + app: api.App, handleFunc: h, requireSession: false, trustRequester: false, @@ -39,8 +40,9 @@ func ApiHandler(h func(*Context, http.ResponseWriter, *http.Request)) http.Handl } } -func ApiSessionRequired(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { +func (api *API) ApiSessionRequired(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { return &handler{ + app: api.App, handleFunc: h, requireSession: true, trustRequester: false, @@ -48,8 +50,9 @@ func ApiSessionRequired(h func(*Context, http.ResponseWriter, *http.Request)) ht } } -func ApiSessionRequiredMfa(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { +func (api *API) ApiSessionRequiredMfa(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { return &handler{ + app: api.App, handleFunc: h, requireSession: true, trustRequester: false, @@ -57,8 +60,9 @@ func ApiSessionRequiredMfa(h func(*Context, http.ResponseWriter, *http.Request)) } } -func ApiHandlerTrustRequester(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { +func (api *API) ApiHandlerTrustRequester(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { return &handler{ + app: api.App, handleFunc: h, requireSession: false, trustRequester: true, @@ -66,8 +70,9 @@ func ApiHandlerTrustRequester(h func(*Context, http.ResponseWriter, *http.Reques } } -func ApiSessionRequiredTrustRequester(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { +func (api *API) ApiSessionRequiredTrustRequester(h func(*Context, http.ResponseWriter, *http.Request)) http.Handler { return &handler{ + app: api.App, handleFunc: h, requireSession: true, trustRequester: true, @@ -76,6 +81,7 @@ func ApiSessionRequiredTrustRequester(h func(*Context, http.ResponseWriter, *htt } type handler struct { + app *app.App handleFunc func(*Context, http.ResponseWriter, *http.Request) requireSession bool trustRequester bool @@ -87,7 +93,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { l4g.Debug("%v - %v", r.Method, r.URL.Path) c := &Context{} - c.App = app.Global() + c.App = h.app c.T, _ = utils.GetTranslationsAndLocale(w, r) c.RequestId = model.NewId() c.IpAddress = utils.GetIpAddress(r) @@ -139,7 +145,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if len(token) != 0 { - session, err := app.Global().GetSession(token) + session, err := c.App.GetSession(token) if err != nil { l4g.Error(utils.T("api.context.invalid_session.error"), err.Error()) @@ -200,7 +206,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (c *Context) LogAudit(extraInfo string) { audit := &model.Audit{UserId: c.Session.UserId, IpAddress: c.IpAddress, Action: c.Path, ExtraInfo: extraInfo, SessionId: c.Session.Id} - if r := <-app.Global().Srv.Store.Audit().Save(audit); r.Err != nil { + if r := <-c.App.Srv.Store.Audit().Save(audit); r.Err != nil { c.LogError(r.Err) } } @@ -212,7 +218,7 @@ func (c *Context) LogAuditWithUserId(userId, extraInfo string) { } audit := &model.Audit{UserId: userId, IpAddress: c.IpAddress, Action: c.Path, ExtraInfo: extraInfo, SessionId: c.Session.Id} - if r := <-app.Global().Srv.Store.Audit().Save(audit); r.Err != nil { + if r := <-c.App.Srv.Store.Audit().Save(audit); r.Err != nil { c.LogError(r.Err) } } @@ -260,7 +266,7 @@ func (c *Context) MfaRequired() { return } - if user, err := app.Global().GetUser(c.Session.UserId); err != nil { + if user, err := c.App.GetUser(c.Session.UserId); err != nil { c.Err = model.NewAppError("", "api.context.session_expired.app_error", nil, "MfaRequired", http.StatusUnauthorized) return } else { @@ -303,6 +309,26 @@ func (c *Context) SetInvalidUrlParam(parameter string) { c.Err = NewInvalidUrlParamError(parameter) } +func (c *Context) HandleEtag(etag string, routeName string, w http.ResponseWriter, r *http.Request) bool { + metrics := c.App.Metrics + if et := r.Header.Get(model.HEADER_ETAG_CLIENT); len(etag) > 0 { + if et == etag { + w.Header().Set(model.HEADER_ETAG_SERVER, etag) + w.WriteHeader(http.StatusNotModified) + if metrics != nil { + metrics.IncrementEtagHitCounter(routeName) + } + return true + } + } + + if metrics != nil { + metrics.IncrementEtagMissCounter(routeName) + } + + return false +} + func NewInvalidParamError(parameter string) *model.AppError { err := model.NewAppError("Context", "api.context.invalid_body_param.app_error", map[string]interface{}{"Name": parameter}, "", http.StatusBadRequest) return err diff --git a/api4/elasticsearch.go b/api4/elasticsearch.go index cfa8292b6..2a378f54e 100644 --- a/api4/elasticsearch.go +++ b/api4/elasticsearch.go @@ -12,11 +12,11 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitElasticsearch() { +func (api *API) InitElasticsearch() { l4g.Debug(utils.T("api.elasticsearch.init.debug")) - BaseRoutes.Elasticsearch.Handle("/test", ApiSessionRequired(testElasticsearch)).Methods("POST") - BaseRoutes.Elasticsearch.Handle("/purge_indexes", ApiSessionRequired(purgeElasticsearchIndexes)).Methods("POST") + api.BaseRoutes.Elasticsearch.Handle("/test", api.ApiSessionRequired(testElasticsearch)).Methods("POST") + api.BaseRoutes.Elasticsearch.Handle("/purge_indexes", api.ApiSessionRequired(purgeElasticsearchIndexes)).Methods("POST") } func testElasticsearch(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/emoji.go b/api4/emoji.go index 80c73c9e6..d014250d6 100644 --- a/api4/emoji.go +++ b/api4/emoji.go @@ -15,14 +15,14 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitEmoji() { +func (api *API) InitEmoji() { l4g.Debug(utils.T("api.emoji.init.debug")) - BaseRoutes.Emojis.Handle("", ApiSessionRequired(createEmoji)).Methods("POST") - BaseRoutes.Emojis.Handle("", ApiSessionRequired(getEmojiList)).Methods("GET") - BaseRoutes.Emoji.Handle("", ApiSessionRequired(deleteEmoji)).Methods("DELETE") - BaseRoutes.Emoji.Handle("", ApiSessionRequired(getEmoji)).Methods("GET") - BaseRoutes.Emoji.Handle("/image", ApiSessionRequiredTrustRequester(getEmojiImage)).Methods("GET") + api.BaseRoutes.Emojis.Handle("", api.ApiSessionRequired(createEmoji)).Methods("POST") + api.BaseRoutes.Emojis.Handle("", api.ApiSessionRequired(getEmojiList)).Methods("GET") + api.BaseRoutes.Emoji.Handle("", api.ApiSessionRequired(deleteEmoji)).Methods("DELETE") + api.BaseRoutes.Emoji.Handle("", api.ApiSessionRequired(getEmoji)).Methods("GET") + api.BaseRoutes.Emoji.Handle("/image", api.ApiSessionRequiredTrustRequester(getEmojiImage)).Methods("GET") } func createEmoji(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/file.go b/api4/file.go index 107a41122..2c0b85ce7 100644 --- a/api4/file.go +++ b/api4/file.go @@ -43,17 +43,17 @@ var MEDIA_CONTENT_TYPES = [...]string{ "audio/wav", } -func InitFile() { +func (api *API) InitFile() { l4g.Debug(utils.T("api.file.init.debug")) - BaseRoutes.Files.Handle("", ApiSessionRequired(uploadFile)).Methods("POST") - BaseRoutes.File.Handle("", ApiSessionRequiredTrustRequester(getFile)).Methods("GET") - BaseRoutes.File.Handle("/thumbnail", ApiSessionRequiredTrustRequester(getFileThumbnail)).Methods("GET") - BaseRoutes.File.Handle("/link", ApiSessionRequired(getFileLink)).Methods("GET") - BaseRoutes.File.Handle("/preview", ApiSessionRequiredTrustRequester(getFilePreview)).Methods("GET") - BaseRoutes.File.Handle("/info", ApiSessionRequired(getFileInfo)).Methods("GET") + api.BaseRoutes.Files.Handle("", api.ApiSessionRequired(uploadFile)).Methods("POST") + api.BaseRoutes.File.Handle("", api.ApiSessionRequiredTrustRequester(getFile)).Methods("GET") + api.BaseRoutes.File.Handle("/thumbnail", api.ApiSessionRequiredTrustRequester(getFileThumbnail)).Methods("GET") + api.BaseRoutes.File.Handle("/link", api.ApiSessionRequired(getFileLink)).Methods("GET") + api.BaseRoutes.File.Handle("/preview", api.ApiSessionRequiredTrustRequester(getFilePreview)).Methods("GET") + api.BaseRoutes.File.Handle("/info", api.ApiSessionRequired(getFileInfo)).Methods("GET") - BaseRoutes.PublicFile.Handle("", ApiHandler(getPublicFile)).Methods("GET") + api.BaseRoutes.PublicFile.Handle("", api.ApiHandler(getPublicFile)).Methods("GET") } diff --git a/api4/job.go b/api4/job.go index 42cbdd3f7..57c604361 100644 --- a/api4/job.go +++ b/api4/job.go @@ -11,14 +11,14 @@ import ( "github.com/mattermost/mattermost-server/model" ) -func InitJob() { +func (api *API) InitJob() { l4g.Info("Initializing job API routes") - BaseRoutes.Jobs.Handle("", ApiSessionRequired(getJobs)).Methods("GET") - BaseRoutes.Jobs.Handle("", ApiSessionRequired(createJob)).Methods("POST") - BaseRoutes.Jobs.Handle("/{job_id:[A-Za-z0-9]+}", ApiSessionRequired(getJob)).Methods("GET") - BaseRoutes.Jobs.Handle("/{job_id:[A-Za-z0-9]+}/cancel", ApiSessionRequired(cancelJob)).Methods("POST") - BaseRoutes.Jobs.Handle("/type/{job_type:[A-Za-z0-9_-]+}", ApiSessionRequired(getJobsByType)).Methods("GET") + api.BaseRoutes.Jobs.Handle("", api.ApiSessionRequired(getJobs)).Methods("GET") + api.BaseRoutes.Jobs.Handle("", api.ApiSessionRequired(createJob)).Methods("POST") + api.BaseRoutes.Jobs.Handle("/{job_id:[A-Za-z0-9]+}", api.ApiSessionRequired(getJob)).Methods("GET") + api.BaseRoutes.Jobs.Handle("/{job_id:[A-Za-z0-9]+}/cancel", api.ApiSessionRequired(cancelJob)).Methods("POST") + api.BaseRoutes.Jobs.Handle("/type/{job_type:[A-Za-z0-9_-]+}", api.ApiSessionRequired(getJobsByType)).Methods("GET") } func getJob(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/ldap.go b/api4/ldap.go index 6ed581783..3c5eb5ede 100644 --- a/api4/ldap.go +++ b/api4/ldap.go @@ -12,11 +12,11 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitLdap() { +func (api *API) InitLdap() { l4g.Debug(utils.T("api.ldap.init.debug")) - BaseRoutes.LDAP.Handle("/sync", ApiSessionRequired(syncLdap)).Methods("POST") - BaseRoutes.LDAP.Handle("/test", ApiSessionRequired(testLdap)).Methods("POST") + api.BaseRoutes.LDAP.Handle("/sync", api.ApiSessionRequired(syncLdap)).Methods("POST") + api.BaseRoutes.LDAP.Handle("/test", api.ApiSessionRequired(testLdap)).Methods("POST") } func syncLdap(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/oauth.go b/api4/oauth.go index 10972fe07..c60f240f6 100644 --- a/api4/oauth.go +++ b/api4/oauth.go @@ -14,35 +14,35 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitOAuth() { +func (api *API) InitOAuth() { l4g.Debug(utils.T("api.oauth.init.debug")) - BaseRoutes.OAuthApps.Handle("", ApiSessionRequired(createOAuthApp)).Methods("POST") - BaseRoutes.OAuthApp.Handle("", ApiSessionRequired(updateOAuthApp)).Methods("PUT") - BaseRoutes.OAuthApps.Handle("", ApiSessionRequired(getOAuthApps)).Methods("GET") - BaseRoutes.OAuthApp.Handle("", ApiSessionRequired(getOAuthApp)).Methods("GET") - BaseRoutes.OAuthApp.Handle("/info", ApiSessionRequired(getOAuthAppInfo)).Methods("GET") - BaseRoutes.OAuthApp.Handle("", ApiSessionRequired(deleteOAuthApp)).Methods("DELETE") - BaseRoutes.OAuthApp.Handle("/regen_secret", ApiSessionRequired(regenerateOAuthAppSecret)).Methods("POST") + api.BaseRoutes.OAuthApps.Handle("", api.ApiSessionRequired(createOAuthApp)).Methods("POST") + api.BaseRoutes.OAuthApp.Handle("", api.ApiSessionRequired(updateOAuthApp)).Methods("PUT") + api.BaseRoutes.OAuthApps.Handle("", api.ApiSessionRequired(getOAuthApps)).Methods("GET") + api.BaseRoutes.OAuthApp.Handle("", api.ApiSessionRequired(getOAuthApp)).Methods("GET") + api.BaseRoutes.OAuthApp.Handle("/info", api.ApiSessionRequired(getOAuthAppInfo)).Methods("GET") + api.BaseRoutes.OAuthApp.Handle("", api.ApiSessionRequired(deleteOAuthApp)).Methods("DELETE") + api.BaseRoutes.OAuthApp.Handle("/regen_secret", api.ApiSessionRequired(regenerateOAuthAppSecret)).Methods("POST") - BaseRoutes.User.Handle("/oauth/apps/authorized", ApiSessionRequired(getAuthorizedOAuthApps)).Methods("GET") + api.BaseRoutes.User.Handle("/oauth/apps/authorized", api.ApiSessionRequired(getAuthorizedOAuthApps)).Methods("GET") // API version independent OAuth 2.0 as a service provider endpoints - BaseRoutes.Root.Handle("/oauth/authorize", ApiHandlerTrustRequester(authorizeOAuthPage)).Methods("GET") - BaseRoutes.Root.Handle("/oauth/authorize", ApiSessionRequired(authorizeOAuthApp)).Methods("POST") - BaseRoutes.Root.Handle("/oauth/deauthorize", ApiSessionRequired(deauthorizeOAuthApp)).Methods("POST") - BaseRoutes.Root.Handle("/oauth/access_token", ApiHandlerTrustRequester(getAccessToken)).Methods("POST") + api.BaseRoutes.Root.Handle("/oauth/authorize", api.ApiHandlerTrustRequester(authorizeOAuthPage)).Methods("GET") + api.BaseRoutes.Root.Handle("/oauth/authorize", api.ApiSessionRequired(authorizeOAuthApp)).Methods("POST") + api.BaseRoutes.Root.Handle("/oauth/deauthorize", api.ApiSessionRequired(deauthorizeOAuthApp)).Methods("POST") + api.BaseRoutes.Root.Handle("/oauth/access_token", api.ApiHandlerTrustRequester(getAccessToken)).Methods("POST") // API version independent OAuth as a client endpoints - BaseRoutes.Root.Handle("/oauth/{service:[A-Za-z0-9]+}/complete", ApiHandler(completeOAuth)).Methods("GET") - BaseRoutes.Root.Handle("/oauth/{service:[A-Za-z0-9]+}/login", ApiHandler(loginWithOAuth)).Methods("GET") - BaseRoutes.Root.Handle("/oauth/{service:[A-Za-z0-9]+}/mobile_login", ApiHandler(mobileLoginWithOAuth)).Methods("GET") - BaseRoutes.Root.Handle("/oauth/{service:[A-Za-z0-9]+}/signup", ApiHandler(signupWithOAuth)).Methods("GET") + api.BaseRoutes.Root.Handle("/oauth/{service:[A-Za-z0-9]+}/complete", api.ApiHandler(completeOAuth)).Methods("GET") + api.BaseRoutes.Root.Handle("/oauth/{service:[A-Za-z0-9]+}/login", api.ApiHandler(loginWithOAuth)).Methods("GET") + api.BaseRoutes.Root.Handle("/oauth/{service:[A-Za-z0-9]+}/mobile_login", api.ApiHandler(mobileLoginWithOAuth)).Methods("GET") + api.BaseRoutes.Root.Handle("/oauth/{service:[A-Za-z0-9]+}/signup", api.ApiHandler(signupWithOAuth)).Methods("GET") // Old endpoints for backwards compatibility, needed to not break SSO for any old setups - BaseRoutes.Root.Handle("/api/v3/oauth/{service:[A-Za-z0-9]+}/complete", ApiHandler(completeOAuth)).Methods("GET") - BaseRoutes.Root.Handle("/signup/{service:[A-Za-z0-9]+}/complete", ApiHandler(completeOAuth)).Methods("GET") - BaseRoutes.Root.Handle("/login/{service:[A-Za-z0-9]+}/complete", ApiHandler(completeOAuth)).Methods("GET") + api.BaseRoutes.Root.Handle("/api/v3/oauth/{service:[A-Za-z0-9]+}/complete", api.ApiHandler(completeOAuth)).Methods("GET") + api.BaseRoutes.Root.Handle("/signup/{service:[A-Za-z0-9]+}/complete", api.ApiHandler(completeOAuth)).Methods("GET") + api.BaseRoutes.Root.Handle("/login/{service:[A-Za-z0-9]+}/complete", api.ApiHandler(completeOAuth)).Methods("GET") } func createOAuthApp(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/openGraph.go b/api4/openGraph.go index 690631ab0..e03ecd219 100644 --- a/api4/openGraph.go +++ b/api4/openGraph.go @@ -16,10 +16,10 @@ const OPEN_GRAPH_METADATA_CACHE_SIZE = 10000 var openGraphDataCache = utils.NewLru(OPEN_GRAPH_METADATA_CACHE_SIZE) -func InitOpenGraph() { +func (api *API) InitOpenGraph() { l4g.Debug(utils.T("api.opengraph.init.debug")) - BaseRoutes.OpenGraph.Handle("", ApiSessionRequired(getOpenGraphMetadata)).Methods("POST") + api.BaseRoutes.OpenGraph.Handle("", api.ApiSessionRequired(getOpenGraphMetadata)).Methods("POST") } func getOpenGraphMetadata(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/plugin.go b/api4/plugin.go index ac1620335..08dea6301 100644 --- a/api4/plugin.go +++ b/api4/plugin.go @@ -18,14 +18,14 @@ const ( MAXIMUM_PLUGIN_FILE_SIZE = 50 * 1024 * 1024 ) -func InitPlugin() { +func (api *API) InitPlugin() { l4g.Debug("EXPERIMENTAL: Initializing plugin api") - BaseRoutes.Plugins.Handle("", ApiSessionRequired(uploadPlugin)).Methods("POST") - BaseRoutes.Plugins.Handle("", ApiSessionRequired(getPlugins)).Methods("GET") - BaseRoutes.Plugin.Handle("", ApiSessionRequired(removePlugin)).Methods("DELETE") + api.BaseRoutes.Plugins.Handle("", api.ApiSessionRequired(uploadPlugin)).Methods("POST") + api.BaseRoutes.Plugins.Handle("", api.ApiSessionRequired(getPlugins)).Methods("GET") + api.BaseRoutes.Plugin.Handle("", api.ApiSessionRequired(removePlugin)).Methods("DELETE") - BaseRoutes.Plugins.Handle("/webapp", ApiHandler(getWebappPlugins)).Methods("GET") + api.BaseRoutes.Plugins.Handle("/webapp", api.ApiHandler(getWebappPlugins)).Methods("GET") } diff --git a/api4/post.go b/api4/post.go index 1b60d0b4a..297c70a87 100644 --- a/api4/post.go +++ b/api4/post.go @@ -13,23 +13,23 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitPost() { +func (api *API) InitPost() { l4g.Debug(utils.T("api.post.init.debug")) - BaseRoutes.Posts.Handle("", ApiSessionRequired(createPost)).Methods("POST") - BaseRoutes.Post.Handle("", ApiSessionRequired(getPost)).Methods("GET") - BaseRoutes.Post.Handle("", ApiSessionRequired(deletePost)).Methods("DELETE") - BaseRoutes.Post.Handle("/thread", ApiSessionRequired(getPostThread)).Methods("GET") - BaseRoutes.Post.Handle("/files/info", ApiSessionRequired(getFileInfosForPost)).Methods("GET") - BaseRoutes.PostsForChannel.Handle("", ApiSessionRequired(getPostsForChannel)).Methods("GET") - BaseRoutes.PostsForUser.Handle("/flagged", ApiSessionRequired(getFlaggedPostsForUser)).Methods("GET") - - BaseRoutes.Team.Handle("/posts/search", ApiSessionRequired(searchPosts)).Methods("POST") - BaseRoutes.Post.Handle("", ApiSessionRequired(updatePost)).Methods("PUT") - BaseRoutes.Post.Handle("/patch", ApiSessionRequired(patchPost)).Methods("PUT") - BaseRoutes.Post.Handle("/actions/{action_id:[A-Za-z0-9]+}", ApiSessionRequired(doPostAction)).Methods("POST") - BaseRoutes.Post.Handle("/pin", ApiSessionRequired(pinPost)).Methods("POST") - BaseRoutes.Post.Handle("/unpin", ApiSessionRequired(unpinPost)).Methods("POST") + api.BaseRoutes.Posts.Handle("", api.ApiSessionRequired(createPost)).Methods("POST") + api.BaseRoutes.Post.Handle("", api.ApiSessionRequired(getPost)).Methods("GET") + api.BaseRoutes.Post.Handle("", api.ApiSessionRequired(deletePost)).Methods("DELETE") + api.BaseRoutes.Post.Handle("/thread", api.ApiSessionRequired(getPostThread)).Methods("GET") + api.BaseRoutes.Post.Handle("/files/info", api.ApiSessionRequired(getFileInfosForPost)).Methods("GET") + api.BaseRoutes.PostsForChannel.Handle("", api.ApiSessionRequired(getPostsForChannel)).Methods("GET") + api.BaseRoutes.PostsForUser.Handle("/flagged", api.ApiSessionRequired(getFlaggedPostsForUser)).Methods("GET") + + api.BaseRoutes.Team.Handle("/posts/search", api.ApiSessionRequired(searchPosts)).Methods("POST") + api.BaseRoutes.Post.Handle("", api.ApiSessionRequired(updatePost)).Methods("PUT") + api.BaseRoutes.Post.Handle("/patch", api.ApiSessionRequired(patchPost)).Methods("PUT") + api.BaseRoutes.Post.Handle("/actions/{action_id:[A-Za-z0-9]+}", api.ApiSessionRequired(doPostAction)).Methods("POST") + api.BaseRoutes.Post.Handle("/pin", api.ApiSessionRequired(pinPost)).Methods("POST") + api.BaseRoutes.Post.Handle("/unpin", api.ApiSessionRequired(unpinPost)).Methods("POST") } func createPost(c *Context, w http.ResponseWriter, r *http.Request) { @@ -107,7 +107,7 @@ func getPostsForChannel(c *Context, w http.ResponseWriter, r *http.Request) { } else if len(afterPost) > 0 { etag = c.App.GetPostsEtag(c.Params.ChannelId) - if HandleEtag(etag, "Get Posts After", w, r) { + if c.HandleEtag(etag, "Get Posts After", w, r) { return } @@ -115,7 +115,7 @@ func getPostsForChannel(c *Context, w http.ResponseWriter, r *http.Request) { } else if len(beforePost) > 0 { etag = c.App.GetPostsEtag(c.Params.ChannelId) - if HandleEtag(etag, "Get Posts Before", w, r) { + if c.HandleEtag(etag, "Get Posts Before", w, r) { return } @@ -123,7 +123,7 @@ func getPostsForChannel(c *Context, w http.ResponseWriter, r *http.Request) { } else { etag = c.App.GetPostsEtag(c.Params.ChannelId) - if HandleEtag(etag, "Get Posts", w, r) { + if c.HandleEtag(etag, "Get Posts", w, r) { return } @@ -205,7 +205,7 @@ func getPost(c *Context, w http.ResponseWriter, r *http.Request) { } } - if HandleEtag(post.Etag(), "Get Post", w, r) { + if c.HandleEtag(post.Etag(), "Get Post", w, r) { return } else { w.Header().Set(model.HEADER_ETAG_SERVER, post.Etag()) @@ -271,7 +271,7 @@ func getPostThread(c *Context, w http.ResponseWriter, r *http.Request) { } } - if HandleEtag(list.Etag(), "Get Post Thread", w, r) { + if c.HandleEtag(list.Etag(), "Get Post Thread", w, r) { return } else { w.Header().Set(model.HEADER_ETAG_SERVER, list.Etag()) @@ -421,7 +421,7 @@ func getFileInfosForPost(c *Context, w http.ResponseWriter, r *http.Request) { if infos, err := c.App.GetFileInfosForPost(c.Params.PostId, false); err != nil { c.Err = err return - } else if HandleEtag(model.GetEtagForFileInfos(infos), "Get File Infos For Post", w, r) { + } else if c.HandleEtag(model.GetEtagForFileInfos(infos), "Get File Infos For Post", w, r) { return } else { w.Header().Set("Cache-Control", "max-age=2592000, public") diff --git a/api4/preference.go b/api4/preference.go index 41c200bd0..5ed83939a 100644 --- a/api4/preference.go +++ b/api4/preference.go @@ -12,14 +12,14 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitPreference() { +func (api *API) InitPreference() { l4g.Debug(utils.T("api.preference.init.debug")) - BaseRoutes.Preferences.Handle("", ApiSessionRequired(getPreferences)).Methods("GET") - BaseRoutes.Preferences.Handle("", ApiSessionRequired(updatePreferences)).Methods("PUT") - BaseRoutes.Preferences.Handle("/delete", ApiSessionRequired(deletePreferences)).Methods("POST") - BaseRoutes.Preferences.Handle("/{category:[A-Za-z0-9_]+}", ApiSessionRequired(getPreferencesByCategory)).Methods("GET") - BaseRoutes.Preferences.Handle("/{category:[A-Za-z0-9_]+}/name/{preference_name:[A-Za-z0-9_]+}", ApiSessionRequired(getPreferenceByCategoryAndName)).Methods("GET") + api.BaseRoutes.Preferences.Handle("", api.ApiSessionRequired(getPreferences)).Methods("GET") + api.BaseRoutes.Preferences.Handle("", api.ApiSessionRequired(updatePreferences)).Methods("PUT") + api.BaseRoutes.Preferences.Handle("/delete", api.ApiSessionRequired(deletePreferences)).Methods("POST") + api.BaseRoutes.Preferences.Handle("/{category:[A-Za-z0-9_]+}", api.ApiSessionRequired(getPreferencesByCategory)).Methods("GET") + api.BaseRoutes.Preferences.Handle("/{category:[A-Za-z0-9_]+}/name/{preference_name:[A-Za-z0-9_]+}", api.ApiSessionRequired(getPreferenceByCategoryAndName)).Methods("GET") } func getPreferences(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/reaction.go b/api4/reaction.go index aca6fc3ec..edfb1619e 100644 --- a/api4/reaction.go +++ b/api4/reaction.go @@ -12,12 +12,12 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitReaction() { +func (api *API) InitReaction() { l4g.Debug(utils.T("api.reaction.init.debug")) - BaseRoutes.Reactions.Handle("", ApiSessionRequired(saveReaction)).Methods("POST") - BaseRoutes.Post.Handle("/reactions", ApiSessionRequired(getReactions)).Methods("GET") - BaseRoutes.ReactionByNameForPostForUser.Handle("", ApiSessionRequired(deleteReaction)).Methods("DELETE") + api.BaseRoutes.Reactions.Handle("", api.ApiSessionRequired(saveReaction)).Methods("POST") + api.BaseRoutes.Post.Handle("/reactions", api.ApiSessionRequired(getReactions)).Methods("GET") + api.BaseRoutes.ReactionByNameForPostForUser.Handle("", api.ApiSessionRequired(deleteReaction)).Methods("DELETE") } func saveReaction(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/saml.go b/api4/saml.go index 0fae1965b..733e8eaaa 100644 --- a/api4/saml.go +++ b/api4/saml.go @@ -13,20 +13,20 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitSaml() { +func (api *API) InitSaml() { l4g.Debug(utils.T("api.saml.init.debug")) - BaseRoutes.SAML.Handle("/metadata", ApiHandler(getSamlMetadata)).Methods("GET") + api.BaseRoutes.SAML.Handle("/metadata", api.ApiHandler(getSamlMetadata)).Methods("GET") - BaseRoutes.SAML.Handle("/certificate/public", ApiSessionRequired(addSamlPublicCertificate)).Methods("POST") - BaseRoutes.SAML.Handle("/certificate/private", ApiSessionRequired(addSamlPrivateCertificate)).Methods("POST") - BaseRoutes.SAML.Handle("/certificate/idp", ApiSessionRequired(addSamlIdpCertificate)).Methods("POST") + api.BaseRoutes.SAML.Handle("/certificate/public", api.ApiSessionRequired(addSamlPublicCertificate)).Methods("POST") + api.BaseRoutes.SAML.Handle("/certificate/private", api.ApiSessionRequired(addSamlPrivateCertificate)).Methods("POST") + api.BaseRoutes.SAML.Handle("/certificate/idp", api.ApiSessionRequired(addSamlIdpCertificate)).Methods("POST") - BaseRoutes.SAML.Handle("/certificate/public", ApiSessionRequired(removeSamlPublicCertificate)).Methods("DELETE") - BaseRoutes.SAML.Handle("/certificate/private", ApiSessionRequired(removeSamlPrivateCertificate)).Methods("DELETE") - BaseRoutes.SAML.Handle("/certificate/idp", ApiSessionRequired(removeSamlIdpCertificate)).Methods("DELETE") + api.BaseRoutes.SAML.Handle("/certificate/public", api.ApiSessionRequired(removeSamlPublicCertificate)).Methods("DELETE") + api.BaseRoutes.SAML.Handle("/certificate/private", api.ApiSessionRequired(removeSamlPrivateCertificate)).Methods("DELETE") + api.BaseRoutes.SAML.Handle("/certificate/idp", api.ApiSessionRequired(removeSamlIdpCertificate)).Methods("DELETE") - BaseRoutes.SAML.Handle("/certificate/status", ApiSessionRequired(getSamlCertificateStatus)).Methods("GET") + api.BaseRoutes.SAML.Handle("/certificate/status", api.ApiSessionRequired(getSamlCertificateStatus)).Methods("GET") } func getSamlMetadata(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/status.go b/api4/status.go index a17707127..3aaa6f621 100644 --- a/api4/status.go +++ b/api4/status.go @@ -13,12 +13,12 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitStatus() { +func (api *API) InitStatus() { l4g.Debug(utils.T("api.status.init.debug")) - BaseRoutes.User.Handle("/status", ApiSessionRequired(getUserStatus)).Methods("GET") - BaseRoutes.Users.Handle("/status/ids", ApiSessionRequired(getUserStatusesByIds)).Methods("POST") - BaseRoutes.User.Handle("/status", ApiSessionRequired(updateUserStatus)).Methods("PUT") + api.BaseRoutes.User.Handle("/status", api.ApiSessionRequired(getUserStatus)).Methods("GET") + api.BaseRoutes.Users.Handle("/status/ids", api.ApiSessionRequired(getUserStatusesByIds)).Methods("POST") + api.BaseRoutes.User.Handle("/status", api.ApiSessionRequired(updateUserStatus)).Methods("PUT") } func getUserStatus(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/system.go b/api4/system.go index 766ea09ee..b8c927630 100644 --- a/api4/system.go +++ b/api4/system.go @@ -16,29 +16,29 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitSystem() { +func (api *API) InitSystem() { l4g.Debug(utils.T("api.system.init.debug")) - BaseRoutes.System.Handle("/ping", ApiHandler(getSystemPing)).Methods("GET") + api.BaseRoutes.System.Handle("/ping", api.ApiHandler(getSystemPing)).Methods("GET") - BaseRoutes.ApiRoot.Handle("/config", ApiSessionRequired(getConfig)).Methods("GET") - BaseRoutes.ApiRoot.Handle("/config", ApiSessionRequired(updateConfig)).Methods("PUT") - BaseRoutes.ApiRoot.Handle("/config/reload", ApiSessionRequired(configReload)).Methods("POST") - BaseRoutes.ApiRoot.Handle("/config/client", ApiHandler(getClientConfig)).Methods("GET") + api.BaseRoutes.ApiRoot.Handle("/config", api.ApiSessionRequired(getConfig)).Methods("GET") + api.BaseRoutes.ApiRoot.Handle("/config", api.ApiSessionRequired(updateConfig)).Methods("PUT") + api.BaseRoutes.ApiRoot.Handle("/config/reload", api.ApiSessionRequired(configReload)).Methods("POST") + api.BaseRoutes.ApiRoot.Handle("/config/client", api.ApiHandler(getClientConfig)).Methods("GET") - BaseRoutes.ApiRoot.Handle("/license", ApiSessionRequired(addLicense)).Methods("POST") - BaseRoutes.ApiRoot.Handle("/license", ApiSessionRequired(removeLicense)).Methods("DELETE") - BaseRoutes.ApiRoot.Handle("/license/client", ApiHandler(getClientLicense)).Methods("GET") + api.BaseRoutes.ApiRoot.Handle("/license", api.ApiSessionRequired(addLicense)).Methods("POST") + api.BaseRoutes.ApiRoot.Handle("/license", api.ApiSessionRequired(removeLicense)).Methods("DELETE") + api.BaseRoutes.ApiRoot.Handle("/license/client", api.ApiHandler(getClientLicense)).Methods("GET") - BaseRoutes.ApiRoot.Handle("/audits", ApiSessionRequired(getAudits)).Methods("GET") - BaseRoutes.ApiRoot.Handle("/email/test", ApiSessionRequired(testEmail)).Methods("POST") - BaseRoutes.ApiRoot.Handle("/database/recycle", ApiSessionRequired(databaseRecycle)).Methods("POST") - BaseRoutes.ApiRoot.Handle("/caches/invalidate", ApiSessionRequired(invalidateCaches)).Methods("POST") + api.BaseRoutes.ApiRoot.Handle("/audits", api.ApiSessionRequired(getAudits)).Methods("GET") + api.BaseRoutes.ApiRoot.Handle("/email/test", api.ApiSessionRequired(testEmail)).Methods("POST") + api.BaseRoutes.ApiRoot.Handle("/database/recycle", api.ApiSessionRequired(databaseRecycle)).Methods("POST") + api.BaseRoutes.ApiRoot.Handle("/caches/invalidate", api.ApiSessionRequired(invalidateCaches)).Methods("POST") - BaseRoutes.ApiRoot.Handle("/logs", ApiSessionRequired(getLogs)).Methods("GET") - BaseRoutes.ApiRoot.Handle("/logs", ApiSessionRequired(postLog)).Methods("POST") + api.BaseRoutes.ApiRoot.Handle("/logs", api.ApiSessionRequired(getLogs)).Methods("GET") + api.BaseRoutes.ApiRoot.Handle("/logs", api.ApiSessionRequired(postLog)).Methods("POST") - BaseRoutes.ApiRoot.Handle("/analytics/old", ApiSessionRequired(getAnalytics)).Methods("GET") + api.BaseRoutes.ApiRoot.Handle("/analytics/old", api.ApiSessionRequired(getAnalytics)).Methods("GET") } func getSystemPing(c *Context, w http.ResponseWriter, r *http.Request) { @@ -262,7 +262,7 @@ func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) { } etag := utils.GetClientLicenseEtag(true) - if HandleEtag(etag, "Get Client License", w, r) { + if c.HandleEtag(etag, "Get Client License", w, r) { return } diff --git a/api4/team.go b/api4/team.go index d15db6bd4..a94da2bef 100644 --- a/api4/team.go +++ b/api4/team.go @@ -19,38 +19,38 @@ const ( MAX_ADD_MEMBERS_BATCH = 20 ) -func InitTeam() { +func (api *API) InitTeam() { l4g.Debug(utils.T("api.team.init.debug")) - BaseRoutes.Teams.Handle("", ApiSessionRequired(createTeam)).Methods("POST") - BaseRoutes.Teams.Handle("", ApiSessionRequired(getAllTeams)).Methods("GET") - BaseRoutes.Teams.Handle("/search", ApiSessionRequired(searchTeams)).Methods("POST") - BaseRoutes.TeamsForUser.Handle("", ApiSessionRequired(getTeamsForUser)).Methods("GET") - BaseRoutes.TeamsForUser.Handle("/unread", ApiSessionRequired(getTeamsUnreadForUser)).Methods("GET") - - BaseRoutes.Team.Handle("", ApiSessionRequired(getTeam)).Methods("GET") - BaseRoutes.Team.Handle("", ApiSessionRequired(updateTeam)).Methods("PUT") - BaseRoutes.Team.Handle("", ApiSessionRequired(deleteTeam)).Methods("DELETE") - BaseRoutes.Team.Handle("/patch", ApiSessionRequired(patchTeam)).Methods("PUT") - BaseRoutes.Team.Handle("/stats", ApiSessionRequired(getTeamStats)).Methods("GET") - BaseRoutes.TeamMembers.Handle("", ApiSessionRequired(getTeamMembers)).Methods("GET") - BaseRoutes.TeamMembers.Handle("/ids", ApiSessionRequired(getTeamMembersByIds)).Methods("POST") - BaseRoutes.TeamMembersForUser.Handle("", ApiSessionRequired(getTeamMembersForUser)).Methods("GET") - BaseRoutes.TeamMembers.Handle("", ApiSessionRequired(addTeamMember)).Methods("POST") - BaseRoutes.Teams.Handle("/members/invite", ApiSessionRequired(addUserToTeamFromInvite)).Methods("POST") - BaseRoutes.TeamMembers.Handle("/batch", ApiSessionRequired(addTeamMembers)).Methods("POST") - BaseRoutes.TeamMember.Handle("", ApiSessionRequired(removeTeamMember)).Methods("DELETE") - - BaseRoutes.TeamForUser.Handle("/unread", ApiSessionRequired(getTeamUnread)).Methods("GET") - - BaseRoutes.TeamByName.Handle("", ApiSessionRequired(getTeamByName)).Methods("GET") - BaseRoutes.TeamMember.Handle("", ApiSessionRequired(getTeamMember)).Methods("GET") - BaseRoutes.TeamByName.Handle("/exists", ApiSessionRequired(teamExists)).Methods("GET") - BaseRoutes.TeamMember.Handle("/roles", ApiSessionRequired(updateTeamMemberRoles)).Methods("PUT") - - BaseRoutes.Team.Handle("/import", ApiSessionRequired(importTeam)).Methods("POST") - BaseRoutes.Team.Handle("/invite/email", ApiSessionRequired(inviteUsersToTeam)).Methods("POST") - BaseRoutes.Teams.Handle("/invite/{invite_id:[A-Za-z0-9]+}", ApiHandler(getInviteInfo)).Methods("GET") + api.BaseRoutes.Teams.Handle("", api.ApiSessionRequired(createTeam)).Methods("POST") + api.BaseRoutes.Teams.Handle("", api.ApiSessionRequired(getAllTeams)).Methods("GET") + api.BaseRoutes.Teams.Handle("/search", api.ApiSessionRequired(searchTeams)).Methods("POST") + api.BaseRoutes.TeamsForUser.Handle("", api.ApiSessionRequired(getTeamsForUser)).Methods("GET") + api.BaseRoutes.TeamsForUser.Handle("/unread", api.ApiSessionRequired(getTeamsUnreadForUser)).Methods("GET") + + api.BaseRoutes.Team.Handle("", api.ApiSessionRequired(getTeam)).Methods("GET") + api.BaseRoutes.Team.Handle("", api.ApiSessionRequired(updateTeam)).Methods("PUT") + api.BaseRoutes.Team.Handle("", api.ApiSessionRequired(deleteTeam)).Methods("DELETE") + api.BaseRoutes.Team.Handle("/patch", api.ApiSessionRequired(patchTeam)).Methods("PUT") + api.BaseRoutes.Team.Handle("/stats", api.ApiSessionRequired(getTeamStats)).Methods("GET") + api.BaseRoutes.TeamMembers.Handle("", api.ApiSessionRequired(getTeamMembers)).Methods("GET") + api.BaseRoutes.TeamMembers.Handle("/ids", api.ApiSessionRequired(getTeamMembersByIds)).Methods("POST") + api.BaseRoutes.TeamMembersForUser.Handle("", api.ApiSessionRequired(getTeamMembersForUser)).Methods("GET") + api.BaseRoutes.TeamMembers.Handle("", api.ApiSessionRequired(addTeamMember)).Methods("POST") + api.BaseRoutes.Teams.Handle("/members/invite", api.ApiSessionRequired(addUserToTeamFromInvite)).Methods("POST") + api.BaseRoutes.TeamMembers.Handle("/batch", api.ApiSessionRequired(addTeamMembers)).Methods("POST") + api.BaseRoutes.TeamMember.Handle("", api.ApiSessionRequired(removeTeamMember)).Methods("DELETE") + + api.BaseRoutes.TeamForUser.Handle("/unread", api.ApiSessionRequired(getTeamUnread)).Methods("GET") + + api.BaseRoutes.TeamByName.Handle("", api.ApiSessionRequired(getTeamByName)).Methods("GET") + api.BaseRoutes.TeamMember.Handle("", api.ApiSessionRequired(getTeamMember)).Methods("GET") + api.BaseRoutes.TeamByName.Handle("/exists", api.ApiSessionRequired(teamExists)).Methods("GET") + api.BaseRoutes.TeamMember.Handle("/roles", api.ApiSessionRequired(updateTeamMemberRoles)).Methods("PUT") + + api.BaseRoutes.Team.Handle("/import", api.ApiSessionRequired(importTeam)).Methods("POST") + api.BaseRoutes.Team.Handle("/invite/email", api.ApiSessionRequired(inviteUsersToTeam)).Methods("POST") + api.BaseRoutes.Teams.Handle("/invite/{invite_id:[A-Za-z0-9]+}", api.ApiHandler(getInviteInfo)).Methods("GET") } func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/user.go b/api4/user.go index e62091320..ea5c0f738 100644 --- a/api4/user.go +++ b/api4/user.go @@ -16,50 +16,50 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitUser() { +func (api *API) InitUser() { l4g.Debug(utils.T("api.user.init.debug")) - BaseRoutes.Users.Handle("", ApiHandler(createUser)).Methods("POST") - BaseRoutes.Users.Handle("", ApiSessionRequired(getUsers)).Methods("GET") - BaseRoutes.Users.Handle("/ids", ApiSessionRequired(getUsersByIds)).Methods("POST") - BaseRoutes.Users.Handle("/usernames", ApiSessionRequired(getUsersByNames)).Methods("POST") - BaseRoutes.Users.Handle("/search", ApiSessionRequired(searchUsers)).Methods("POST") - BaseRoutes.Users.Handle("/autocomplete", ApiSessionRequired(autocompleteUsers)).Methods("GET") - - BaseRoutes.User.Handle("", ApiSessionRequired(getUser)).Methods("GET") - BaseRoutes.User.Handle("/image", ApiSessionRequiredTrustRequester(getProfileImage)).Methods("GET") - BaseRoutes.User.Handle("/image", ApiSessionRequired(setProfileImage)).Methods("POST") - BaseRoutes.User.Handle("", ApiSessionRequired(updateUser)).Methods("PUT") - BaseRoutes.User.Handle("/patch", ApiSessionRequired(patchUser)).Methods("PUT") - BaseRoutes.User.Handle("", ApiSessionRequired(deleteUser)).Methods("DELETE") - BaseRoutes.User.Handle("/roles", ApiSessionRequired(updateUserRoles)).Methods("PUT") - BaseRoutes.User.Handle("/active", ApiSessionRequired(updateUserActive)).Methods("PUT") - BaseRoutes.User.Handle("/password", ApiSessionRequired(updatePassword)).Methods("PUT") - BaseRoutes.Users.Handle("/password/reset", ApiHandler(resetPassword)).Methods("POST") - BaseRoutes.Users.Handle("/password/reset/send", ApiHandler(sendPasswordReset)).Methods("POST") - BaseRoutes.Users.Handle("/email/verify", ApiHandler(verifyUserEmail)).Methods("POST") - BaseRoutes.Users.Handle("/email/verify/send", ApiHandler(sendVerificationEmail)).Methods("POST") - - BaseRoutes.Users.Handle("/mfa", ApiHandler(checkUserMfa)).Methods("POST") - BaseRoutes.User.Handle("/mfa", ApiSessionRequiredMfa(updateUserMfa)).Methods("PUT") - BaseRoutes.User.Handle("/mfa/generate", ApiSessionRequiredMfa(generateMfaSecret)).Methods("POST") - - BaseRoutes.Users.Handle("/login", ApiHandler(login)).Methods("POST") - BaseRoutes.Users.Handle("/login/switch", ApiHandler(switchAccountType)).Methods("POST") - BaseRoutes.Users.Handle("/logout", ApiHandler(logout)).Methods("POST") - - BaseRoutes.UserByUsername.Handle("", ApiSessionRequired(getUserByUsername)).Methods("GET") - BaseRoutes.UserByEmail.Handle("", ApiSessionRequired(getUserByEmail)).Methods("GET") - - BaseRoutes.User.Handle("/sessions", ApiSessionRequired(getSessions)).Methods("GET") - BaseRoutes.User.Handle("/sessions/revoke", ApiSessionRequired(revokeSession)).Methods("POST") - BaseRoutes.Users.Handle("/sessions/device", ApiSessionRequired(attachDeviceId)).Methods("PUT") - BaseRoutes.User.Handle("/audits", ApiSessionRequired(getUserAudits)).Methods("GET") - - BaseRoutes.User.Handle("/tokens", ApiSessionRequired(createUserAccessToken)).Methods("POST") - BaseRoutes.User.Handle("/tokens", ApiSessionRequired(getUserAccessTokens)).Methods("GET") - BaseRoutes.Users.Handle("/tokens/{token_id:[A-Za-z0-9]+}", ApiSessionRequired(getUserAccessToken)).Methods("GET") - BaseRoutes.Users.Handle("/tokens/revoke", ApiSessionRequired(revokeUserAccessToken)).Methods("POST") + api.BaseRoutes.Users.Handle("", api.ApiHandler(createUser)).Methods("POST") + api.BaseRoutes.Users.Handle("", api.ApiSessionRequired(getUsers)).Methods("GET") + api.BaseRoutes.Users.Handle("/ids", api.ApiSessionRequired(getUsersByIds)).Methods("POST") + api.BaseRoutes.Users.Handle("/usernames", api.ApiSessionRequired(getUsersByNames)).Methods("POST") + api.BaseRoutes.Users.Handle("/search", api.ApiSessionRequired(searchUsers)).Methods("POST") + api.BaseRoutes.Users.Handle("/autocomplete", api.ApiSessionRequired(autocompleteUsers)).Methods("GET") + + api.BaseRoutes.User.Handle("", api.ApiSessionRequired(getUser)).Methods("GET") + api.BaseRoutes.User.Handle("/image", api.ApiSessionRequiredTrustRequester(getProfileImage)).Methods("GET") + api.BaseRoutes.User.Handle("/image", api.ApiSessionRequired(setProfileImage)).Methods("POST") + api.BaseRoutes.User.Handle("", api.ApiSessionRequired(updateUser)).Methods("PUT") + api.BaseRoutes.User.Handle("/patch", api.ApiSessionRequired(patchUser)).Methods("PUT") + api.BaseRoutes.User.Handle("", api.ApiSessionRequired(deleteUser)).Methods("DELETE") + api.BaseRoutes.User.Handle("/roles", api.ApiSessionRequired(updateUserRoles)).Methods("PUT") + api.BaseRoutes.User.Handle("/active", api.ApiSessionRequired(updateUserActive)).Methods("PUT") + api.BaseRoutes.User.Handle("/password", api.ApiSessionRequired(updatePassword)).Methods("PUT") + api.BaseRoutes.Users.Handle("/password/reset", api.ApiHandler(resetPassword)).Methods("POST") + api.BaseRoutes.Users.Handle("/password/reset/send", api.ApiHandler(sendPasswordReset)).Methods("POST") + api.BaseRoutes.Users.Handle("/email/verify", api.ApiHandler(verifyUserEmail)).Methods("POST") + api.BaseRoutes.Users.Handle("/email/verify/send", api.ApiHandler(sendVerificationEmail)).Methods("POST") + + api.BaseRoutes.Users.Handle("/mfa", api.ApiHandler(checkUserMfa)).Methods("POST") + api.BaseRoutes.User.Handle("/mfa", api.ApiSessionRequiredMfa(updateUserMfa)).Methods("PUT") + api.BaseRoutes.User.Handle("/mfa/generate", api.ApiSessionRequiredMfa(generateMfaSecret)).Methods("POST") + + api.BaseRoutes.Users.Handle("/login", api.ApiHandler(login)).Methods("POST") + api.BaseRoutes.Users.Handle("/login/switch", api.ApiHandler(switchAccountType)).Methods("POST") + api.BaseRoutes.Users.Handle("/logout", api.ApiHandler(logout)).Methods("POST") + + api.BaseRoutes.UserByUsername.Handle("", api.ApiSessionRequired(getUserByUsername)).Methods("GET") + api.BaseRoutes.UserByEmail.Handle("", api.ApiSessionRequired(getUserByEmail)).Methods("GET") + + api.BaseRoutes.User.Handle("/sessions", api.ApiSessionRequired(getSessions)).Methods("GET") + api.BaseRoutes.User.Handle("/sessions/revoke", api.ApiSessionRequired(revokeSession)).Methods("POST") + api.BaseRoutes.Users.Handle("/sessions/device", api.ApiSessionRequired(attachDeviceId)).Methods("PUT") + api.BaseRoutes.User.Handle("/audits", api.ApiSessionRequired(getUserAudits)).Methods("GET") + + api.BaseRoutes.User.Handle("/tokens", api.ApiSessionRequired(createUserAccessToken)).Methods("POST") + api.BaseRoutes.User.Handle("/tokens", api.ApiSessionRequired(getUserAccessTokens)).Methods("GET") + api.BaseRoutes.Users.Handle("/tokens/{token_id:[A-Za-z0-9]+}", api.ApiSessionRequired(getUserAccessToken)).Methods("GET") + api.BaseRoutes.Users.Handle("/tokens/revoke", api.ApiSessionRequired(revokeUserAccessToken)).Methods("POST") } func createUser(c *Context, w http.ResponseWriter, r *http.Request) { @@ -113,7 +113,7 @@ func getUser(c *Context, w http.ResponseWriter, r *http.Request) { etag := user.Etag(utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) - if HandleEtag(etag, "Get User", w, r) { + if c.HandleEtag(etag, "Get User", w, r) { return } else { if c.Session.UserId == user.Id { @@ -145,7 +145,7 @@ func getUserByUsername(c *Context, w http.ResponseWriter, r *http.Request) { etag := user.Etag(utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) - if HandleEtag(etag, "Get User", w, r) { + if c.HandleEtag(etag, "Get User", w, r) { return } else { app.SanitizeProfile(user, c.IsSystemAdmin()) @@ -173,7 +173,7 @@ func getUserByEmail(c *Context, w http.ResponseWriter, r *http.Request) { etag := user.Etag(utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) - if HandleEtag(etag, "Get User", w, r) { + if c.HandleEtag(etag, "Get User", w, r) { return } else { app.SanitizeProfile(user, c.IsSystemAdmin()) @@ -199,7 +199,7 @@ func getProfileImage(c *Context, w http.ResponseWriter, r *http.Request) { user := users[0] etag := strconv.FormatInt(user.LastPictureUpdate, 10) - if HandleEtag(etag, "Get Profile Image", w, r) { + if c.HandleEtag(etag, "Get Profile Image", w, r) { return } @@ -322,7 +322,7 @@ func getUsers(c *Context, w http.ResponseWriter, r *http.Request) { } etag = c.App.GetUsersNotInTeamEtag(inTeamId) - if HandleEtag(etag, "Get Users Not in Team", w, r) { + if c.HandleEtag(etag, "Get Users Not in Team", w, r) { return } @@ -339,7 +339,7 @@ func getUsers(c *Context, w http.ResponseWriter, r *http.Request) { profiles, err = c.App.GetNewUsersForTeamPage(inTeamId, c.Params.Page, c.Params.PerPage, c.IsSystemAdmin()) } else { etag = c.App.GetUsersInTeamEtag(inTeamId) - if HandleEtag(etag, "Get Users in Team", w, r) { + if c.HandleEtag(etag, "Get Users in Team", w, r) { return } @@ -356,7 +356,7 @@ func getUsers(c *Context, w http.ResponseWriter, r *http.Request) { // No permission check required etag = c.App.GetUsersEtag() - if HandleEtag(etag, "Get Users", w, r) { + if c.HandleEtag(etag, "Get Users", w, r) { return } profiles, err = c.App.GetUsersPage(c.Params.Page, c.Params.PerPage, c.IsSystemAdmin()) diff --git a/api4/webhook.go b/api4/webhook.go index c86fa3253..39d0cbff4 100644 --- a/api4/webhook.go +++ b/api4/webhook.go @@ -15,27 +15,27 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitWebhook() { +func (api *API) InitWebhook() { l4g.Debug(utils.T("api.webhook.init.debug")) - BaseRoutes.IncomingHooks.Handle("", ApiSessionRequired(createIncomingHook)).Methods("POST") - BaseRoutes.IncomingHooks.Handle("", ApiSessionRequired(getIncomingHooks)).Methods("GET") - BaseRoutes.IncomingHook.Handle("", ApiSessionRequired(getIncomingHook)).Methods("GET") - BaseRoutes.IncomingHook.Handle("", ApiSessionRequired(updateIncomingHook)).Methods("PUT") - BaseRoutes.IncomingHook.Handle("", ApiSessionRequired(deleteIncomingHook)).Methods("DELETE") + api.BaseRoutes.IncomingHooks.Handle("", api.ApiSessionRequired(createIncomingHook)).Methods("POST") + api.BaseRoutes.IncomingHooks.Handle("", api.ApiSessionRequired(getIncomingHooks)).Methods("GET") + api.BaseRoutes.IncomingHook.Handle("", api.ApiSessionRequired(getIncomingHook)).Methods("GET") + api.BaseRoutes.IncomingHook.Handle("", api.ApiSessionRequired(updateIncomingHook)).Methods("PUT") + api.BaseRoutes.IncomingHook.Handle("", api.ApiSessionRequired(deleteIncomingHook)).Methods("DELETE") - BaseRoutes.OutgoingHooks.Handle("", ApiSessionRequired(createOutgoingHook)).Methods("POST") - BaseRoutes.OutgoingHooks.Handle("", ApiSessionRequired(getOutgoingHooks)).Methods("GET") - BaseRoutes.OutgoingHook.Handle("", ApiSessionRequired(getOutgoingHook)).Methods("GET") - BaseRoutes.OutgoingHook.Handle("", ApiSessionRequired(updateOutgoingHook)).Methods("PUT") - BaseRoutes.OutgoingHook.Handle("", ApiSessionRequired(deleteOutgoingHook)).Methods("DELETE") - BaseRoutes.OutgoingHook.Handle("/regen_token", ApiSessionRequired(regenOutgoingHookToken)).Methods("POST") + api.BaseRoutes.OutgoingHooks.Handle("", api.ApiSessionRequired(createOutgoingHook)).Methods("POST") + api.BaseRoutes.OutgoingHooks.Handle("", api.ApiSessionRequired(getOutgoingHooks)).Methods("GET") + api.BaseRoutes.OutgoingHook.Handle("", api.ApiSessionRequired(getOutgoingHook)).Methods("GET") + api.BaseRoutes.OutgoingHook.Handle("", api.ApiSessionRequired(updateOutgoingHook)).Methods("PUT") + api.BaseRoutes.OutgoingHook.Handle("", api.ApiSessionRequired(deleteOutgoingHook)).Methods("DELETE") + api.BaseRoutes.OutgoingHook.Handle("/regen_token", api.ApiSessionRequired(regenOutgoingHookToken)).Methods("POST") - BaseRoutes.Root.Handle("/hooks/commands/{id:[A-Za-z0-9]+}", ApiHandler(commandWebhook)).Methods("POST") - BaseRoutes.Root.Handle("/hooks/{id:[A-Za-z0-9]+}", ApiHandler(incomingWebhook)).Methods("POST") + api.BaseRoutes.Root.Handle("/hooks/commands/{id:[A-Za-z0-9]+}", api.ApiHandler(commandWebhook)).Methods("POST") + api.BaseRoutes.Root.Handle("/hooks/{id:[A-Za-z0-9]+}", api.ApiHandler(incomingWebhook)).Methods("POST") // Old endpoint for backwards compatibility - BaseRoutes.Root.Handle("/api/v3/teams/{team_id:[A-Za-z0-9]+}/hooks/{id:[A-Za-z0-9]+}", ApiHandler(incomingWebhook)).Methods("POST") + api.BaseRoutes.Root.Handle("/api/v3/teams/{team_id:[A-Za-z0-9]+}/hooks/{id:[A-Za-z0-9]+}", api.ApiHandler(incomingWebhook)).Methods("POST") } func createIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/webrtc.go b/api4/webrtc.go index a9f80fb7b..bf418d5e8 100644 --- a/api4/webrtc.go +++ b/api4/webrtc.go @@ -11,10 +11,10 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitWebrtc() { +func (api *API) InitWebrtc() { l4g.Debug(utils.T("api.webrtc.init.debug")) - BaseRoutes.Webrtc.Handle("/token", ApiSessionRequired(webrtcToken)).Methods("GET") + api.BaseRoutes.Webrtc.Handle("/token", api.ApiSessionRequired(webrtcToken)).Methods("GET") } func webrtcToken(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/websocket.go b/api4/websocket.go index fbc1ea9cc..7dfe3d61c 100644 --- a/api4/websocket.go +++ b/api4/websocket.go @@ -13,10 +13,10 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitWebSocket() { +func (api *API) InitWebSocket() { l4g.Debug(utils.T("api.web_socket.init.debug")) - BaseRoutes.ApiRoot.Handle("/websocket", ApiHandlerTrustRequester(connectWebSocket)).Methods("GET") + api.BaseRoutes.ApiRoot.Handle("/websocket", api.ApiHandlerTrustRequester(connectWebSocket)).Methods("GET") } func connectWebSocket(c *Context, w http.ResponseWriter, r *http.Request) { |