diff options
author | Corey Hulen <corey@hulen.com> | 2016-04-21 22:37:01 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-04-21 22:37:01 -0700 |
commit | 2e5617c29be69637acd384e85f795a0b343bec8d (patch) | |
tree | 6b8bdae1e664013b97c2dda94985375abda91aa5 /api/web_hub.go | |
parent | 5c755463ed3a4c74a383fb4460b5be02d8868481 (diff) | |
download | chat-2e5617c29be69637acd384e85f795a0b343bec8d.tar.gz chat-2e5617c29be69637acd384e85f795a0b343bec8d.tar.bz2 chat-2e5617c29be69637acd384e85f795a0b343bec8d.zip |
PLT-2057 User as a first class object (#2648)
* Adding TeamMember to system
* Fixing all unit tests on the backend
* Fixing merge conflicts
* Fixing merge conflict
* Adding javascript unit tests
* Adding TeamMember to system
* Fixing all unit tests on the backend
* Fixing merge conflicts
* Fixing merge conflict
* Adding javascript unit tests
* Adding client side unit test
* Cleaning up the clint side tests
* Fixing msg
* Adding more client side unit tests
* Adding more using tests
* Adding last bit of client side unit tests and adding make cmd
* Fixing bad merge
* Fixing libraries
* Updating to new client side API
* Fixing borken unit test
* Fixing unit tests
* ugg...trying to beat gofmt
* ugg...trying to beat gofmt
* Cleaning up remainder of the server side routes
* Adding inital load api
* Increased coverage of webhook unit tests (#2660)
* Adding loading ... to root html
* Fixing bad merge
* Removing explicit content type so superagent will guess corectly (#2685)
* Fixing merge and unit tests
* Adding create team UI
* Fixing signup flows
* Adding LDAP unit tests and enterprise unit test helper (#2702)
* Add the ability to reset MFA from the commandline (#2706)
* Fixing compliance unit tests
* Fixing client side tests
* Adding open server to system console
* Moving websocket connection
* Fixing unit test
* Fixing unit tests
* Fixing unit tests
* Adding nickname and more LDAP unit tests (#2717)
* Adding join open teams
* Cleaning up all TODOs in the code
* Fixing web sockets
* Removing unused webockets file
* PLT-2533 Add the ability to reset a user's MFA from the system console (#2715)
* Add the ability to reset a user's MFA from the system console
* Add client side unit test for adminResetMfa
* Reorganizing authentication to fix LDAP error message (#2723)
* Fixing failing unit test
* Initial upgrade db code
* Adding upgrade script
* Fixing upgrade script after running on core
* Update OAuth and Claim routes to work with user model changes (#2739)
* Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740)
* Fixing team invite ldap login call (#2741)
* Fixing bluebar and some img stuff
* Fix all the different file upload web utils (#2743)
* Fixing invalid session redirect (#2744)
* Redirect on bad channel name (#2746)
* Fixing a bunch of issue and removing dead code
* Patch to fix error message on leave channel (#2747)
* Setting EnableOpenServer to false by default
* Fixing config
* Fixing upgrade
* Fixing reported bugs
* Bug fixes for PLT-2057
* PLT-2563 Redo password recovery to use a database table (#2745)
* Redo password recovery to use a database table
* Update reset password audits
* Split out admin and user reset password APIs to be separate
* Delete password recovery when user is permanently deleted
* Consolidate password resetting into a single function
* Removed private channels as an option for outgoing webhooks (#2752)
* PLT-2577/PLT-2552 Fixes for backstage (#2753)
* Added URL to incoming webhook list
* Fixed client functions for adding/removing integrations
* Disallowed slash commands without trigger words
* Fixed clientside handling of errors on AddCommand page
* Minor auth cleanup (#2758)
* Changed EditPostModal to just close if you save without making any changes (#2759)
* Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756)
* Fixed url in channel info modal (#2755)
* Fixing reported issues
* Moving to version 3 of the apis
* Fixing command unit tests (#2760)
* Adding team admins
* Fixing DM issue
* Fixing eslint error
* Properly set EditPostModal's originalText state in all cases (#2762)
* Update client config check to assume features is defined if server is licensed (#2772)
* Fixing url link
* Fixing issue with websocket crashing when sending messages to different teams
Diffstat (limited to 'api/web_hub.go')
-rw-r--r-- | api/web_hub.go | 128 |
1 files changed, 90 insertions, 38 deletions
diff --git a/api/web_hub.go b/api/web_hub.go index 5fe9d6ae8..241ebcef0 100644 --- a/api/web_hub.go +++ b/api/web_hub.go @@ -10,19 +10,21 @@ import ( ) type Hub struct { - teamHubs map[string]*TeamHub - register chan *WebConn - unregister chan *WebConn - broadcast chan *model.Message - stop chan string + connections map[*WebConn]bool + register chan *WebConn + unregister chan *WebConn + broadcast chan *model.Message + stop chan string + invalidateUser chan string } var hub = &Hub{ - register: make(chan *WebConn), - unregister: make(chan *WebConn), - teamHubs: make(map[string]*TeamHub), - broadcast: make(chan *model.Message), - stop: make(chan string), + register: make(chan *WebConn), + unregister: make(chan *WebConn), + connections: make(map[*WebConn]bool), + broadcast: make(chan *model.Message), + stop: make(chan string), + invalidateUser: make(chan string), } func PublishAndForget(message *model.Message) { @@ -31,16 +33,8 @@ func PublishAndForget(message *model.Message) { }() } -func UpdateChannelAccessCache(teamId, userId, channelId string) { - if nh, ok := hub.teamHubs[teamId]; ok { - nh.UpdateChannelAccessCache(userId, channelId) - } -} - -func UpdateChannelAccessCacheAndForget(teamId, userId, channelId string) { - go func() { - UpdateChannelAccessCache(teamId, userId, channelId) - }() +func InvalidateCacheForUser(userId string) { + hub.invalidateUser <- userId } func (h *Hub) Register(webConn *WebConn) { @@ -65,34 +59,92 @@ func (h *Hub) Start() { go func() { for { select { + case webCon := <-h.register: + h.connections[webCon] = true - case c := <-h.register: - nh := h.teamHubs[c.TeamId] - - if nh == nil { - nh = NewTeamHub(c.TeamId) - h.teamHubs[c.TeamId] = nh - nh.Start() + case webCon := <-h.unregister: + if _, ok := h.connections[webCon]; ok { + delete(h.connections, webCon) + close(webCon.Send) } - - nh.Register(c) - - case c := <-h.unregister: - if nh, ok := h.teamHubs[c.TeamId]; ok { - nh.Unregister(c) + case userId := <-h.invalidateUser: + for webCon := range h.connections { + if webCon.UserId == userId { + webCon.InvalidateCache() + } } + case msg := <-h.broadcast: - nh := h.teamHubs[msg.TeamId] - if nh != nil { - nh.broadcast <- msg + for webCon := range h.connections { + if shouldSendEvent(webCon, msg) { + select { + case webCon.Send <- msg: + default: + close(webCon.Send) + delete(h.connections, webCon) + } + } } + case s := <-h.stop: l4g.Debug(utils.T("api.web_hub.start.stopping.debug"), s) - for _, v := range h.teamHubs { - v.Stop() + + for webCon := range h.connections { + webCon.WebSocket.Close() } + return } } }() } + +func shouldSendEvent(webCon *WebConn, msg *model.Message) bool { + + if webCon.UserId == msg.UserId { + // Don't need to tell the user they are typing + if msg.Action == model.ACTION_TYPING { + return false + } + + // We have to make sure the user is in the channel. Otherwise system messages that + // post about users in channels they are not in trigger warnings. + if len(msg.ChannelId) > 0 { + allowed := webCon.HasPermissionsToChannel(msg.ChannelId) + + if !allowed { + return false + } + } + } else { + // Don't share a user's view or preference events with other users + if msg.Action == model.ACTION_CHANNEL_VIEWED { + return false + } else if msg.Action == model.ACTION_PREFERENCE_CHANGED { + return false + } else if msg.Action == model.ACTION_EPHEMERAL_MESSAGE { + // For now, ephemeral messages are sent directly to individual users + return false + } + + // Only report events to users who are in the team for the event + if len(msg.TeamId) > 0 { + allowed := webCon.HasPermissionsToTeam(msg.TeamId) + + if !allowed { + return false + } + } + + // Only report events to users who are in the channel for the event + if len(msg.ChannelId) > 0 { + allowed := webCon.HasPermissionsToChannel(msg.ChannelId) + + if !allowed { + return false + } + } + } + + return true +} |