properly detect content-type

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
Update module github.com/unistack-org/micro/v3 to v3.3.13
2021-04-10 12:38:17 +03:00 · 2021-04-10 00:02:08 +00:00 · 2021-04-10 01:24:34 +03:00 · 2021-04-05 21:22:50 +00:00 · 2021-04-03 11:43:48 +00:00 · 2021-04-01 00:46:07 +00:00
4 changed files with 90 additions and 19 deletions
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/unistack-org/micro-server-http/v3
 go 1.16

 require (
-	github.com/unistack-org/micro/v3 v3.3.0
-	golang.org/x/net v0.0.0-20210323141857-08027d57d8cf
+	github.com/unistack-org/micro/v3 v3.3.13
+	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
 )

 //replace github.com/unistack-org/micro/v3 => ../../micro
--- a/go.sum
+++ b/go.sum
@@ -8,11 +8,53 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK
 github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
 github.com/unistack-org/micro/v3 v3.3.0 h1:pEj/8QVFzMlNMEL//q/Te8qgG+XI6LTYIQrb6hMymgk=
 github.com/unistack-org/micro/v3 v3.3.0/go.mod h1:iJwCWq2PECMxigfqe6TPC5GLWvj6P94Kk+PTVZGL3w8=
+github.com/unistack-org/micro/v3 v3.3.1 h1:2KUgb5THy5GUjYgMcOf3TXYIJ0h2RbJHb2j6eeWdRx0=
+github.com/unistack-org/micro/v3 v3.3.1/go.mod h1:iJwCWq2PECMxigfqe6TPC5GLWvj6P94Kk+PTVZGL3w8=
+github.com/unistack-org/micro/v3 v3.3.2 h1:1r7fmaobJVZBKDhIewSBy8R4H/6YazQFetsDgULV6Mw=
+github.com/unistack-org/micro/v3 v3.3.2/go.mod h1:tX95c0Qx4w6oqU7qKThs9lya9P507BdZ29MsTVDmU6w=
+github.com/unistack-org/micro/v3 v3.3.4 h1:wSYjL1sfrqtMmgFfYKylrKpAepMHrPcOpe10hvQAKuo=
+github.com/unistack-org/micro/v3 v3.3.4/go.mod h1:tX95c0Qx4w6oqU7qKThs9lya9P507BdZ29MsTVDmU6w=
+github.com/unistack-org/micro/v3 v3.3.7 h1:AKQEevrlT2aqHYRFGd6BEFNnurHLvJyqvWvLCFP7iX4=
+github.com/unistack-org/micro/v3 v3.3.7/go.mod h1:M3RGgKZX1OlTn0QB+3R1tlSoGwmEg6rb/Isr0lLYmjQ=
+github.com/unistack-org/micro/v3 v3.3.8 h1:4e4gWuZI/cRUGZ6ZZpdrIDOF2MLO6cjHxeFfZzy610Y=
+github.com/unistack-org/micro/v3 v3.3.8/go.mod h1:M3RGgKZX1OlTn0QB+3R1tlSoGwmEg6rb/Isr0lLYmjQ=
+github.com/unistack-org/micro/v3 v3.3.9 h1:NFF4wymDDxgYeZU++04BxvETrrAnd0iNzVyfm/ssQI4=
+github.com/unistack-org/micro/v3 v3.3.9/go.mod h1:M3RGgKZX1OlTn0QB+3R1tlSoGwmEg6rb/Isr0lLYmjQ=
+github.com/unistack-org/micro/v3 v3.3.10 h1:yMSiyplupFQ7xy/kNXL/zqSnqGSjrlNa2GTCwea5BVg=
+github.com/unistack-org/micro/v3 v3.3.10/go.mod h1:5ragE2E8ER5d4FZQJG9pB6qdfOoLXLfKW89l77Dy3jQ=
+github.com/unistack-org/micro/v3 v3.3.11 h1:Jr0gAw5lLqgddiHKQeWUOUeP6ZqgRhz52EA9zJ5MJ3U=
+github.com/unistack-org/micro/v3 v3.3.11/go.mod h1:PPCt675o3HPcODFbJ4iRWPmQFAk1WQ+asQSOb/syq6U=
+github.com/unistack-org/micro/v3 v3.3.13 h1:y4bDDkbwnjgOckrhFkC6D/o42tr75X33UbrB+Ko0M68=
+github.com/unistack-org/micro/v3 v3.3.13/go.mod h1:98hNcMXp/WyWJwLwCuwrhN1Jm7aCWaRNsMfRjK8Fq+Y=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210323141857-08027d57d8cf h1:sewfyKLWuY3ko6EI4hbFziQ8bHkfammpzCDfLT92I1c=
 golang.org/x/net v0.0.0-20210323141857-08027d57d8cf/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826 h1:lNRDRnwZWawoPHDS50ebYHTOHjctRMLSrUSQFcAHiW4=
+golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+golang.org/x/net v0.0.0-20210324205630-d1beb07c2056 h1:sANdAef76Ioam9aQUUdcAqricwY/WUaMc4+7LY4eGg8=
+golang.org/x/net v0.0.0-20210324205630-d1beb07c2056/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
+golang.org/x/net v0.0.0-20210326060303-6b1517762897 h1:KrsHThm5nFk34YtATK1LsThyGhGbGe1olrte/HInHvs=
+golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
+golang.org/x/net v0.0.0-20210326220855-61e056675ecf h1:WUcCxqQqDT0aXO4VnQbfMvp4zh7m1Gb2clVuHUAGGRE=
+golang.org/x/net v0.0.0-20210326220855-61e056675ecf/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
+golang.org/x/net v0.0.0-20210329181859-df645c7b52b1 h1:GDp1VG8WvY8lq4ic4L7GzKC3fNRlOa3UqUEpib8aBQE=
+golang.org/x/net v0.0.0-20210329181859-df645c7b52b1/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
+golang.org/x/net v0.0.0-20210330075724-22f4162a9025 h1:WkEv4x2mvGbnkuK9cWl/Ru2pzfVxAgpSDLT/holPSug=
+golang.org/x/net v0.0.0-20210330075724-22f4162a9025/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
+golang.org/x/net v0.0.0-20210330142815-c8897c278d10 h1:j6SlnKgJhONcqBZAH/cLNz6hg79L7Q18RY4BiN0r0LI=
+golang.org/x/net v0.0.0-20210330142815-c8897c278d10/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
+golang.org/x/net v0.0.0-20210330230544-e57232859fb2 h1:nGCZOty+lVDsc4H2qPFksI5Se296+V+GhMiL/TzmYNk=
+golang.org/x/net v0.0.0-20210330230544-e57232859fb2/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210331060903-cb1fcc7394e5 h1:zuP3axpB9rV3xH0EA7n3/gCrNPZm2SRl0l4mVH2BRj4=
+golang.org/x/net v0.0.0-20210331060903-cb1fcc7394e5/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c h1:KHUzaHIpjWVlVVNh65G3hhuj3KB1HnjY6Cq5cTvRQT8=
+golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
--- a/handler.go
+++ b/handler.go
@@ -78,10 +78,18 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {

 	ct := DefaultContentType
 	if htype := r.Header.Get("Content-Type"); htype != "" {
-		ct = htype
+		ct = strings.Split(htype, ";")[0]
+	}
+
+	var cf codec.Codec
+	var err error
+	switch ct {
+	case "application/x-www-form-urlencoded":
+		cf, err = h.newCodec(DefaultContentType)
+	default:
+		cf, err = h.newCodec(ct)
 	}

-	cf, err := h.newCodec(ct)
 	if err != nil {
 		h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
 		return
@@ -101,6 +109,7 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}

 	matches := make(map[string]interface{})
+
 	var match bool
 	var hldr patHandler
 	var handler *httpHandler
@@ -146,6 +155,22 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}

+	if ct == "application/x-www-form-urlencoded" {
+		buf, err := io.ReadAll(r.Body)
+		if err != nil {
+			h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
+			return
+		}
+		umd, err := rflutil.URLMap(string(buf))
+		if err != nil {
+			h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
+			return
+		}
+		for k, v := range umd {
+			matches[k] = v
+		}
+	}
+
 	var argv, replyv reflect.Value

 	// Decode the argument value.
@@ -168,21 +193,26 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	//function := hldr.rcvr
 	var returnValues []reflect.Value

-	if err = cf.ReadBody(r.Body, argv.Interface()); err != nil && err != io.EOF {
-		h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
-		return
+	if ct != "application/x-www-form-urlencoded" {
+		if err = cf.ReadBody(r.Body, argv.Interface()); err != nil && err != io.EOF {
+			h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
+			return
+		}
 	}

 	matches = rflutil.FlattenMap(matches)
-	if err = rflutil.MergeMap(argv.Interface(), matches); err != nil {
+	if err = rflutil.Merge(argv.Interface(), matches, rflutil.SliceAppend(true), rflutil.Tags([]string{"protobuf", "json"})); err != nil {
 		h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
 		return
 	}

-	b, err := cf.Marshal(argv.Interface())
-	if err != nil {
-		h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
-		return
+	var b []byte
+	if ct != "application/x-www-form-urlencoded" {
+		b, err = cf.Marshal(argv.Interface())
+		if err != nil {
+			h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
+			return
+		}
 	}

 	hr := &rpcRequest{
@@ -247,7 +277,8 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if scode != 0 {
 		w.WriteHeader(scode)
 	} else {
-		handler.sopts.Logger.Warn(handler.sopts.Context, "response code not set in handler via SetRspCode(ctx, http.StatusXXX)")
+		//handler.sopts.Logger.Warn(handler.sopts.Context, "response code not set in handler via SetRspCode(ctx, http.StatusXXX)")
+		w.WriteHeader(200)
 	}
 	w.Write(b)
 }
--- a/http.go
+++ b/http.go
@@ -63,9 +63,6 @@ func (h *httpServer) Init(opts ...server.Option) error {
 	if fn, ok := h.opts.Context.Value(errorHandlerKey{}).(func(ctx context.Context, s server.Handler, w http.ResponseWriter, r *http.Request, err error, status int)); ok && fn != nil {
 		h.errorHandler = fn
 	}
-	if h.errorHandler == nil {
-		h.errorHandler = DefaultErrorHandler
-	}
 	if h.handlers == nil {
 		h.handlers = make(map[string]server.Handler)
 	}
@@ -553,8 +550,9 @@ func (h *httpServer) Name() string {
 func NewServer(opts ...server.Option) server.Server {
 	options := server.NewOptions(opts...)
 	return &httpServer{
-		opts:        options,
-		exit:        make(chan chan error),
-		subscribers: make(map[*httpSubscriber][]broker.Subscriber),
+		opts:         options,
+		exit:         make(chan chan error),
+		subscribers:  make(map[*httpSubscriber][]broker.Subscriber),
+		errorHandler: DefaultErrorHandler,
 	}
 }
Author	SHA1	Message	Date
Vasiliy Tolstov	0d442683ee	properly detect content-type Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-04-10 12:38:17 +03:00
Renovate Bot	c8587ec93a	Update module github.com/unistack-org/micro/v3 to v3.3.13	2021-04-10 00:02:08 +00:00
Vasiliy Tolstov	7e35316cf2	rewrite x-www-form-urlencoded Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-04-10 01:24:34 +03:00
Renovate Bot	475452a781	Update golang.org/x/net commit hash to a5a99cb	2021-04-05 21:22:50 +00:00
Renovate Bot	dd0bb7c5d4	Update module github.com/unistack-org/micro/v3 to v3.3.11	2021-04-03 11:43:48 +00:00
Renovate Bot	b74f3762dd	Update all deps	2021-04-01 00:46:07 +00:00
Renovate Bot	e30590c707	Update golang.org/x/net commit hash to cb1fcc7	2021-03-31 08:14:56 +00:00
Renovate Bot	132e95dec6	Update golang.org/x/net commit hash to e572328	2021-03-31 00:41:40 +00:00
Vasiliy Tolstov	48620e6297	handle x-form-urlencoded content-type Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-03-31 00:50:02 +03:00
Renovate Bot	e31185b6dc	Update golang.org/x/net commit hash to c8897c2	2021-03-30 16:23:29 +00:00
Renovate Bot	151e45ca30	Update golang.org/x/net commit hash to 22f4162	2021-03-30 12:06:34 +00:00
Renovate Bot	93c4f219e9	Update all deps	2021-03-30 06:47:00 +00:00
Renovate Bot	396654b066	Update module github.com/unistack-org/micro/v3 to v3.3.8	2021-03-29 03:27:06 +00:00
Renovate Bot	a769031246	Update module github.com/unistack-org/micro/v3 to v3.3.7	2021-03-28 20:50:08 +00:00
Renovate Bot	99915c1633	Update golang.org/x/net commit hash to 61e0566	2021-03-27 01:57:17 +00:00
Renovate Bot	c7759d29b8	Update all deps	2021-03-26 17:42:44 +00:00
Renovate Bot	0f97e432a4	Update module github.com/unistack-org/micro/v3 to v3.3.2	2021-03-25 13:14:58 +00:00
Renovate Bot	713b4f96be	Update all deps	2021-03-25 00:08:52 +00:00
Vasiliy Tolstov	360b15a3b6	remove Warn on missing rsp code Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-03-24 23:58:35 +03:00
Renovate Bot	4959b0040b	Update golang.org/x/net commit hash to 2c4c8ec	2021-03-24 15:09:22 +00:00