e2m/dispatch
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually make sure the user is in the channel before embedding channel data

Browse Source
This commit is contained in:
Ken-Håvard Lieng 2018-04-24 21:21:42 +02:00
parent 8724121552
commit 7f755d2a83
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/index_data.go
View File

@ -90,24 +90,30 @@ func getIndexData(r *http.Request, session *Session) *indexData {
}
server, channel := getTabFromPath(r.URL.EscapedPath())
if channel != "" {
if isInChannel(channels, server, channel) {
data.addUsersAndMessages(server, channel, session)
return &data
}
server, channel = parseTabCookie(r, r.URL.Path)
if channel != "" {
for _, ch := range channels {
if server == ch.Server && channel == ch.Name {
data.addUsersAndMessages(server, channel, session)
break
}
}
if isInChannel(channels, server, channel) {
data.addUsersAndMessages(server, channel, session)
}
return &data
}
func isInChannel(channels []storage.Channel, server, channel string) bool {
if channel != "" {
for _, ch := range channels {
if server == ch.Server && channel == ch.Name {
return true
}
}
}
return false
}
func getTabFromPath(rawPath string) (string, string) {
path := strings.Split(strings.Trim(rawPath, "/"), "/")
if len(path) == 2 {