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

fix: api.rest will switch to http if provided key and certificate paths are empty

Browse source
This commit is contained in:
evilsocket 2018-08-30 12:52:01 +03:00
parent 00c32c2cc6
commit 1f9c151089
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
1 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

44
modules/api_rest.go
View file

@ -109,6 +109,10 @@ func (api *RestAPI) Author() string {
return "Simone Margaritelli <evilsocket@protonmail.com>" return "Simone Margaritelli <evilsocket@protonmail.com>"
} }
func (api *RestAPI) isTLS() bool {
return api.certFile != "" && api.keyFile != ""
}
func (api *RestAPI) Configure() error { func (api *RestAPI) Configure() error {
var err error var err error
var ip string var ip string
@ -136,21 +140,23 @@ func (api *RestAPI) Configure() error {
return err return err
} }
if !core.Exists(api.certFile) || !core.Exists(api.keyFile) { if api.isTLS() {
err, cfg := tls.CertConfigFromModule("api.rest", api.SessionModule) if !core.Exists(api.certFile) || !core.Exists(api.keyFile) {
if err != nil { err, cfg := tls.CertConfigFromModule("api.rest", api.SessionModule)
return err if err != nil {
} return err
}
log.Debug("%+v", cfg) log.Debug("%+v", cfg)
log.Info("generating TLS key to %s", api.keyFile) log.Info("generating TLS key to %s", api.keyFile)
log.Info("generating TLS certificate to %s", api.certFile) log.Info("generating TLS certificate to %s", api.certFile)
if err := tls.Generate(cfg, api.certFile, api.keyFile); err != nil { if err := tls.Generate(cfg, api.certFile, api.keyFile); err != nil {
return err return err
}
} else {
log.Info("loading TLS key from %s", api.keyFile)
log.Info("loading TLS certificate from %s", api.certFile)
} }
} else {
log.Info("loading TLS key from %s", api.keyFile)
log.Info("loading TLS certificate from %s", api.certFile)
} }
api.server.Addr = fmt.Sprintf("%s:%d", ip, port) api.server.Addr = fmt.Sprintf("%s:%d", ip, port)
@ -183,8 +189,16 @@ func (api *RestAPI) Start() error {
} }
api.SetRunning(true, func() { api.SetRunning(true, func() {
log.Info("API server starting on https://%s", api.server.Addr) var err error
err := api.server.ListenAndServeTLS(api.certFile, api.keyFile)
if api.isTLS() {
log.Info("API server starting on https://%s", api.server.Addr)
err = api.server.ListenAndServeTLS(api.certFile, api.keyFile)
} else {
log.Info("API server starting on http://%s", api.server.Addr)
err = api.server.ListenAndServe()
}
if err != nil && err != http.ErrServerClosed { if err != nil && err != http.ErrServerClosed {
panic(err) panic(err)
} }