Refactoring and improve tracer on HTTPStrategy

This commit is contained in:
Mario
2022-05-10 22:49:23 +02:00
parent f18b1f3806
commit 98f9835079

View File

@ -4,6 +4,7 @@ import (
"beelzebub/parser"
"beelzebub/tracer"
"fmt"
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
"io"
"net/http"
@ -12,38 +13,15 @@ import (
)
type HypertextTransferProtocolStrategy struct {
serverMux *http.ServeMux
beelzebubServiceConfiguration parser.BeelzebubServiceConfiguration
}
func (httpStrategy HypertextTransferProtocolStrategy) Init(beelzebubServiceConfiguration parser.BeelzebubServiceConfiguration, tr tracer.Tracer) error {
httpStrategy.beelzebubServiceConfiguration = beelzebubServiceConfiguration
httpStrategy.serverMux = http.NewServeMux()
serverMux := http.NewServeMux()
httpStrategy.buildHandler()
go func() {
httpStrategy.listenAndServe()
}()
log.WithFields(log.Fields{
"port": beelzebubServiceConfiguration.Address,
"commands": len(beelzebubServiceConfiguration.Commands),
}).Infof("Init service %s", beelzebubServiceConfiguration.Protocol)
return nil
}
func (httpStrategy HypertextTransferProtocolStrategy) listenAndServe() {
err := http.ListenAndServe(httpStrategy.beelzebubServiceConfiguration.Address, httpStrategy.serverMux)
if err != nil {
log.Errorf("Error during init HTTP Protocol: %s", err.Error())
return
}
}
func (httpStrategy HypertextTransferProtocolStrategy) buildHandler() {
httpStrategy.serverMux.HandleFunc("/", func(responseWriter http.ResponseWriter, request *http.Request) {
traceRequest(request)
serverMux.HandleFunc("/", func(responseWriter http.ResponseWriter, request *http.Request) {
traceRequest(request, tr)
for _, command := range httpStrategy.beelzebubServiceConfiguration.Commands {
matched, err := regexp.MatchString(command.Regex, request.RequestURI)
if err != nil {
@ -58,30 +36,48 @@ func (httpStrategy HypertextTransferProtocolStrategy) buildHandler() {
}
}
})
go func() {
err := http.ListenAndServe(httpStrategy.beelzebubServiceConfiguration.Address, serverMux)
if err != nil {
log.Errorf("Error during init HTTP Protocol: %s", err.Error())
return
}
}()
log.WithFields(log.Fields{
"port": beelzebubServiceConfiguration.Address,
"commands": len(beelzebubServiceConfiguration.Commands),
}).Infof("Init service %s", beelzebubServiceConfiguration.Protocol)
return nil
}
func traceRequest(request *http.Request) {
func traceRequest(request *http.Request, tr tracer.Tracer) {
bodyBytes, err := io.ReadAll(request.Body)
body := ""
if err == nil {
body = string(bodyBytes)
}
log.WithFields(log.Fields{
"requestURI": request.RequestURI,
"proto": request.Proto,
"method": request.Method,
"body": body,
"host": request.Host,
"userAgent": request.UserAgent(),
"cookies": request.Cookies(),
"ip": request.RemoteAddr,
"headers": request.Header,
"remoteAddr": request.RemoteAddr,
}).Info("New HTTP request")
tr.TraceEvent(tracer.Event{
Msg: "HTTP New request",
RequestURI: request.RequestURI,
Protocol: tracer.HTTP,
HTTPMethod: request.Method,
Body: body,
HostHTTPRequest: request.Host,
UserAgent: request.UserAgent(),
Cookies: request.Cookies(),
Headers: request.Header,
Status: tracer.Stateless,
RemoteAddr: request.RemoteAddr,
ID: uuid.New().String(),
})
}
func setResponseHeaders(responseWriter http.ResponseWriter, headers []string, statusCode int) {
responseWriter.WriteHeader(statusCode)
// http.StatusText(statusCode): empty string if the code is unknown.
if len(http.StatusText(statusCode)) > 0 {
responseWriter.WriteHeader(statusCode)
}
for _, headerStr := range headers {
keyValue := strings.Split(headerStr, ":")
if len(keyValue) > 1 {