Fix some bugs (#788)
* fix config restore * fix panic on middleware Co-authored-by: AlteredCoder <AlteredCoder>
This commit is contained in:
parent
ab4878d4e6
commit
fd830b4293
|
@ -417,6 +417,9 @@ func NewConfigCmd() *cobra.Command {
|
||||||
Args: cobra.ExactArgs(1),
|
Args: cobra.ExactArgs(1),
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
var err error
|
var err error
|
||||||
|
if err := csConfig.LoadHub(); err != nil {
|
||||||
|
log.Fatalf(err.Error())
|
||||||
|
}
|
||||||
if err = cwhub.GetHubIdx(csConfig.Hub); err != nil {
|
if err = cwhub.GetHubIdx(csConfig.Hub); err != nil {
|
||||||
log.Fatalf("Failed to get Hub index : %v", err)
|
log.Fatalf("Failed to get Hub index : %v", err)
|
||||||
log.Infoln("Run 'sudo cscli hub update' to get the hub index")
|
log.Infoln("Run 'sudo cscli hub update' to get the hub index")
|
||||||
|
|
|
@ -9,7 +9,6 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/crowdsecurity/crowdsec/pkg/database"
|
"github.com/crowdsecurity/crowdsec/pkg/database"
|
||||||
"github.com/crowdsecurity/crowdsec/pkg/types"
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
@ -49,7 +48,6 @@ func HashSHA512(str string) string {
|
||||||
|
|
||||||
func (a *APIKey) MiddlewareFunc() gin.HandlerFunc {
|
func (a *APIKey) MiddlewareFunc() gin.HandlerFunc {
|
||||||
return func(c *gin.Context) {
|
return func(c *gin.Context) {
|
||||||
defer types.CatchPanic("crowdsec/middlewaresV1/api_key/MiddlewareFunc")
|
|
||||||
val, ok := c.Request.Header[APIKeyHeader]
|
val, ok := c.Request.Header[APIKeyHeader]
|
||||||
if !ok {
|
if !ok {
|
||||||
c.JSON(http.StatusForbidden, gin.H{"message": "access forbidden"})
|
c.JSON(http.StatusForbidden, gin.H{"message": "access forbidden"})
|
||||||
|
|
|
@ -13,7 +13,6 @@ import (
|
||||||
"github.com/crowdsecurity/crowdsec/pkg/database"
|
"github.com/crowdsecurity/crowdsec/pkg/database"
|
||||||
"github.com/crowdsecurity/crowdsec/pkg/database/ent/machine"
|
"github.com/crowdsecurity/crowdsec/pkg/database/ent/machine"
|
||||||
"github.com/crowdsecurity/crowdsec/pkg/models"
|
"github.com/crowdsecurity/crowdsec/pkg/models"
|
||||||
"github.com/crowdsecurity/crowdsec/pkg/types"
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/go-openapi/strfmt"
|
"github.com/go-openapi/strfmt"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
|
@ -45,7 +44,6 @@ func IdentityHandler(c *gin.Context) interface{} {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (j *JWT) Authenticator(c *gin.Context) (interface{}, error) {
|
func (j *JWT) Authenticator(c *gin.Context) (interface{}, error) {
|
||||||
defer types.CatchPanic("crowdsec/middlewaresV1/jwt/Authenticator")
|
|
||||||
var loginInput models.WatcherAuthRequest
|
var loginInput models.WatcherAuthRequest
|
||||||
var scenarios string
|
var scenarios string
|
||||||
var err error
|
var err error
|
||||||
|
|
Loading…
Reference in a new issue