Marko Tikvić / webutility

Browse Code »

Commit 34436d11e24884e190b5addb8fb575ad2676eb3f

Authored by Marko Tikvić 2018-06-15 11:16:39 +0200

1 parent 932f814613

Exists in master and in 1 other branch

in-out http logs are written at the same time

Showing 2 changed files with 29 additions and 7 deletions Show diff stats

http.go

Diff comments View file @34436d1

 package webutility
 import (
 	"encoding/json"
 	"fmt"
 	"net/http"
 )
+type ResponseWriterStatusRecorder struct {
+	http.ResponseWriter
+	status int
+}
+func WrapWithStatusRecorder(w http.ResponseWriter) *ResponseWriterStatusRecorder {
+	return &ResponseWriterStatusRecorder{w, 0}
+}
+func (r *ResponseWriterStatusRecorder) WriteHeader(code int) {
+	r.status = code
+	r.ResponseWriter.WriteHeader(code)
+}
+func (r *ResponseWriterStatusRecorder) Status() int {
+	return r.status
+}
 // NotFoundHandlerFunc writes HTTP error 404 to w.
 func NotFoundHandlerFunc(w http.ResponseWriter, req *http.Request) {
 	SetDefaultHeaders(w)
 	if req.Method == "OPTIONS" {
 		return
 	}
 	NotFound(w, req, fmt.Sprintf("Resource you requested was not found: %s", req.URL.String()))
 }
 // SetDefaultHeaders set's default headers for an HTTP response.
 func SetDefaultHeaders(w http.ResponseWriter) {
 	w.Header().Set("Access-Control-Allow-Origin", "*")
 	w.Header().Set("Access-Control-Allow-Methods", "POST, GET, PUT, DELETE, OPTIONS")
-	w.Header().Set("Access-Control-Allow-Headers", `Accept, Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization`)
+	w.Header().Set("Access-Control-Allow-Headers", "Accept, Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization")
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 }
-func ReqLocale(req *http.Request, dflt string) string {
+func GetLocale(req *http.Request, dflt string) string {
 	loc := req.FormValue("locale")
 	if loc == "" {
 		return dflt
 	}
 	return loc
 }
 // 2xx
 func Success(w http.ResponseWriter, payload interface{}, code int) {
 	w.WriteHeader(code)
 	if payload != nil {
 		json.NewEncoder(w).Encode(payload)
 	}
 }
 // 200
 func OK(w http.ResponseWriter, payload interface{}) {
 	Success(w, payload, http.StatusOK)
 }
 // 201
 func Created(w http.ResponseWriter, payload interface{}) {
 	Success(w, payload, http.StatusCreated)
 }
 type weberror struct {
 	Request string `json:"request"`
 	Error   string `json:"error"`
 }
 // 4xx; 5xx
 func Error(w http.ResponseWriter, r *http.Request, code int, err string) {
 	werr := weberror{Error: err, Request: r.Method + " " + r.RequestURI}
 	w.WriteHeader(code)
 	json.NewEncoder(w).Encode(werr)
 }
 // 400
 func BadRequest(w http.ResponseWriter, r *http.Request, err string) {
 	Error(w, r, http.StatusBadRequest, err)
 }
 // 401
 func Unauthorized(w http.ResponseWriter, r *http.Request, err string) {
 	Error(w, r, http.StatusUnauthorized, err)
 }
 // 403
 func Forbidden(w http.ResponseWriter, r *http.Request, err string) {
 	Error(w, r, http.StatusForbidden, err)
 }
 // 404
 func NotFound(w http.ResponseWriter, r *http.Request, err string) {
 	Error(w, r, http.StatusNotFound, err)
 }
 // 409
 func Conflict(w http.ResponseWriter, r *http.Request, err string) {
 	Error(w, r, http.StatusConflict, err)
 }
 // 500
 func InternalServerError(w http.ResponseWriter, r *http.Request, err string) {
 	Error(w, r, http.StatusInternalServerError, err)
 }

middleware.go

Diff comments View file @34436d1

1	package webutility	1	package webutility
2		2
3	import (	3	import (
4	"net/http"	4	"net/http"
5	"time"	5	"time"
6		6
7	"git.to-net.rs/marko.tikvic/gologger"	7	"git.to-net.rs/marko.tikvic/gologger"
8	)	8	)
9		9
10	func SetHeaders(h http.HandlerFunc) http.HandlerFunc {	10	func SetHeaders(h http.HandlerFunc) http.HandlerFunc {
11	return func(w http.ResponseWriter, req *http.Request) {	11	return func(w http.ResponseWriter, req *http.Request) {
12	SetDefaultHeaders(w)	12	SetDefaultHeaders(w)
13	if req.Method == http.MethodOptions {	13	if req.Method == http.MethodOptions {
14	return	14	return
15	}	15	}
16	h(w, req)	16	h(w, req)
17	}	17	}
18	}	18	}
19		19
20	func ParseForm(h http.HandlerFunc) http.HandlerFunc {	20	func ParseForm(h http.HandlerFunc) http.HandlerFunc {
21	return func(w http.ResponseWriter, req *http.Request) {	21	return func(w http.ResponseWriter, req *http.Request) {
22	err := req.ParseForm()	22	err := req.ParseForm()
23	if err != nil {	23	if err != nil {
24	BadRequest(w, req, err.Error())	24	BadRequest(w, req, err.Error())
25	return	25	return
26	}	26	}
27	h(w, req)	27	h(w, req)
28	}	28	}
29	}	29	}
30		30
31	var reqLogger *gologger.Logger	31	var trafficLogger *gologger.Logger
32		32
33	func EnableLogging(log string) error {	33	func EnableLogging(log string) error {
34	var err error	34	var err error
35	reqLogger, err = gologger.New(log, gologger.MaxLogSize5MB)	35	trafficLogger, err = gologger.New(log, gologger.MaxLogSize5MB)
36	return err	36	return err
37	}	37	}
38		38
39	func Log(h http.HandlerFunc) http.HandlerFunc {	39	func Log(h http.HandlerFunc) http.HandlerFunc {
40	return func(w http.ResponseWriter, req *http.Request) {	40	return func(w http.ResponseWriter, req *http.Request) {
41	reqLogger.LogRequest(req, "")	41	in := trafficLogger.RequestLog(req, "")
		42
		43	w2 := WrapWithStatusRecorder(w)
42	t1 := time.Now()	44	t1 := time.Now()
43	h(w, req)	45	h(w2, req)
44	t2 := time.Now()	46	t2 := time.Now()
45	reqLogger.LogResponse(w, req, t2.Sub(t1))	47
		48	out := trafficLogger.ResponseLog(w2.Status(), t2.Sub(t1))
		49	trafficLogger.LogHTTPTraffic(in, out)
46	}	50	}
47	}	51	}
48		52
49	func Auth(roles string, h http.HandlerFunc) http.HandlerFunc {	53	func Auth(roles string, h http.HandlerFunc) http.HandlerFunc {
50	return func(w http.ResponseWriter, req *http.Request) {	54	return func(w http.ResponseWriter, req *http.Request) {
51	if _, ok := AuthCheck(req, roles); !ok {	55	if _, ok := AuthCheck(req, roles); !ok {
52	Unauthorized(w, req, "")	56	Unauthorized(w, req, "")
53	return	57	return
54	}	58	}
55	h(w, req)	59	h(w, req)
56	}	60	}
57	}	61	}
58		62