config: use constants with config keys instead of struct as its easier to handle

This commit is contained in:
Jakob Schrettenbrunner
2017-08-31 20:13:01 +02:00
parent 5f0804ea53
commit ef28b61136
6 changed files with 106 additions and 24 deletions

View File

@@ -6,6 +6,7 @@ import (
"github.com/gin-gonic/gin"
log "github.com/sirupsen/logrus"
"github.com/spf13/viper"
"github.com/Pterodactyl/wings/config"
)
@@ -22,7 +23,7 @@ func NewAPI() API {
// Listen starts the api http server
func (api *API) Listen() {
if !config.Get().Debug {
if !viper.GetBool(config.Debug) {
gin.SetMode(gin.ReleaseMode)
}
@@ -30,7 +31,7 @@ func (api *API) Listen() {
api.registerRoutes()
listenString := fmt.Sprintf("%s:%d", config.Get().Web.ListenHost, config.Get().Web.ListenPort)
listenString := fmt.Sprintf("%s:%d", viper.GetString(config.APIHost), viper.GetInt(config.APIPort))
api.router.Run(listenString)

View File

@@ -45,14 +45,14 @@ func (a *authorizationManager) HasPermission(permission string) bool {
}
prefix := permission[:1]
if prefix == "c" {
return config.Get().ContainsAuthKey(a.token)
return config.ContainsAuthKey(a.token)
}
if a.server == nil {
log.WithField("permission", permission).Error("Auth: Server required but none found.")
return false
}
if prefix == "g" {
return config.Get().ContainsAuthKey(a.token)
return config.ContainsAuthKey(a.token)
}
if prefix == "s" {
return a.server.HasPermission(a.token, permission)