github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-07 13:32:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refact: refactored api.rest module to use GIN and have better security (fixes #11)

Browse source
This commit is contained in:
evilsocket 2018-01-14 15:10:11 +01:00
parent 2454a669bb
commit fd18dffd1a
5 changed files with 164 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

50
modules/api_rest.go
View file

@ -10,13 +10,14 @@ import (
"github.com/evilsocket/bettercap-ng/log"
"github.com/evilsocket/bettercap-ng/session"
"github.com/evilsocket/bettercap-ng/tls"
"github.com/gin-gonic/gin"
)
type RestAPI struct {
session.SessionModule
router *gin.Engine
server *http.Server
username string
password string
certFile string
keyFile string
}
@ -38,9 +39,14 @@ func NewRestAPI(s *session.Session) *RestAPI {
api.AddParam(session.NewStringParameter("api.rest.username",
"",
"",
".+",
"API authentication username."))
api.AddParam(session.NewStringParameter("api.rest.password",
"",
".+",
"API authentication password."))
api.AddParam(session.NewStringParameter("api.rest.certificate",
"~/.bcap-api.rest.certificate.pem",
"",
@ -51,11 +57,6 @@ func NewRestAPI(s *session.Session) *RestAPI {
"",
"API TLS key"))
api.AddParam(session.NewStringParameter("api.rest.password",
"",
"",
"API authentication password."))
api.AddHandler(session.NewModuleHandler("api.rest on", "",
"Start REST API server.",
func(args []string) error {
@ -68,8 +69,6 @@ func NewRestAPI(s *session.Session) *RestAPI {
return api.Stop()
}))
api.setupRoutes()
return api
}
@ -95,16 +94,17 @@ func (api *RestAPI) Author() string {
func (api *RestAPI) Configure() error {
var err error
var address string
var username string
var password string
var ip string
var port int
if err, address = api.StringParam("api.rest.address"); err != nil {
if err, ip = api.StringParam("api.rest.address"); err != nil {
return err
} else if err, port = api.IntParam("api.rest.port"); err != nil {
return err
} else {
api.server.Addr = fmt.Sprintf("%s:%d", address, port)
}
api.server.Addr = fmt.Sprintf("%s:%d", ip, port)
if err, api.certFile = api.StringParam("api.rest.certificate"); err != nil {
return err
@ -118,16 +118,12 @@ func (api *RestAPI) Configure() error {
return err
}
if err, api.username = api.StringParam("api.rest.username"); err != nil {
if err, username = api.StringParam("api.rest.username"); err != nil {
return err
} else if api.username == "" {
return fmt.Errorf("api.rest.username is empty.")
}
if err, api.password = api.StringParam("api.rest.password"); err != nil {
if err, password = api.StringParam("api.rest.password"); err != nil {
return err
} else if api.password == "" {
return fmt.Errorf("api.rest.password is empty.")
}
if core.Exists(api.certFile) == false || core.Exists(api.keyFile) == false {
@ -141,6 +137,20 @@ func (api *RestAPI) Configure() error {
log.Info("Loading TLS certificate from %s", api.certFile)
}
gin.SetMode(gin.ReleaseMode)
api.router = gin.New()
api.router.Use(SecurityMiddleware())
api.router.Use(gin.BasicAuth(gin.Accounts{username: password}))
group := api.router.Group("/api")
group.GET("/session", ShowRestSession)
group.POST("/session", RunRestCommand)
group.GET("/events", ShowRestEvents)
group.DELETE("/events", ClearRestEvents)
api.server.Handler = api.router
return nil
}