fix permission check

This commit is contained in:
Dot-Rar 2020-03-24 17:39:42 +00:00
parent 61c0fdd8df
commit 9d83d3b668
16 changed files with 30 additions and 30 deletions

View File

@ -44,8 +44,8 @@ func BlacklistHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -45,8 +45,8 @@ func BlacklistRemoveHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -53,8 +53,8 @@ func LogsHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -47,8 +47,8 @@ func PanelCreateHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -51,8 +51,8 @@ func PanelDeleteHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -52,8 +52,8 @@ func PanelHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -47,8 +47,8 @@ func SendMessage(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -44,8 +44,8 @@ func SettingsHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -46,8 +46,8 @@ func TicketCloseHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -45,8 +45,8 @@ func TicketListHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -50,8 +50,8 @@ func TicketViewHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -45,8 +45,8 @@ func UpdateSettingsHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -48,8 +48,8 @@ func LogViewHandler(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if !<-isAdmin {
ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
return
}

View File

@ -137,8 +137,8 @@ func WebChatWs(ctx *gin.Context) {
// Verify the user has permissions to be here
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildIdParsed, userId, isAdmin)
if <-isAdmin {
go utils.IsAdmin(guild, guildIdParsed, userId, isAdmin)
if !<-isAdmin {
fmt.Println(err.Error())
conn.Close()
return

View File

@ -33,7 +33,7 @@ func IndexHandler(ctx *gin.Context) {
}
isAdmin := make(chan bool)
go utils.IsAdmin(store, guild, guildId, userId, isAdmin)
go utils.IsAdmin(guild, guildId, userId, isAdmin)
if <-isAdmin {
adminGuilds = append(adminGuilds, guild)
}

View File

@ -14,7 +14,7 @@ import (
var roleCache = cache.New(time.Minute, time.Minute)
func IsAdmin(store sessions.Session, guild objects.Guild, guildId, userId int64, res chan bool) {
func IsAdmin(guild objects.Guild, guildId, userId int64, res chan bool) {
if Contains(config.Conf.Admins, strconv.Itoa(int(userId))) {
res <- true
}