Merge pull request 'add tls headers' (#170) from tls_header into v3

Reviewed-on: #170

handler.go

@@ -119,6 +119,12 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 		md["TransferEncoding"] = strings.Join(r.TransferEncoding, ",")
 		md["Host"] = r.Host
 		md["RequestURI"] = r.RequestURI
+		if r.TLS != nil {
+			md["TLS"] = "true"
+			md["TLS_ALPN"] = r.TLS.NegotiatedProtocol
+			md["TLS_ServerName"] = r.TLS.ServerName
+		}
+
 		ctx = metadata.NewIncomingContext(ctx, md)
 
 		path := r.URL.Path
@@ -334,12 +340,6 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 }
 
 func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	// check for http.HandlerFunc handlers
-	if ph, _, err := h.pathHandlers.Search(r.Method, r.URL.Path); err == nil {
-		ph.(http.HandlerFunc)(w, r)
-		return
-	}
-
 	ct := DefaultContentType
 	if htype := r.Header.Get(metadata.HeaderContentType); htype != "" {
 		ct = htype
@@ -355,19 +355,22 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		md[k] = strings.Join(v, ", ")
 	}
 	md["RemoteAddr"] = r.RemoteAddr
+	if r.TLS != nil {
+		md["Scheme"] = "https"
+	} else {
+		md["Scheme"] = "http"
+	}
 	md["Method"] = r.Method
 	md["URL"] = r.URL.String()
 	md["Proto"] = r.Proto
 	md["ContentLength"] = fmt.Sprintf("%d", r.ContentLength)
-	md["TransferEncoding"] = strings.Join(r.TransferEncoding, ",")
+	if len(r.TransferEncoding) > 0 {
+		md["TransferEncoding"] = strings.Join(r.TransferEncoding, ",")
+	}
 	md["Host"] = r.Host
 	md["RequestURI"] = r.RequestURI
 	ctx = metadata.NewIncomingContext(ctx, md)
 
-	if r.Body != nil {
-		defer r.Body.Close()
-	}
-
 	path := r.URL.Path
 	if !strings.HasPrefix(path, "/") {
 		h.errorHandler(ctx, nil, w, r, fmt.Errorf("path must starts with /"), http.StatusBadRequest)
@@ -424,6 +427,11 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else if !match {
+		// check for http.HandlerFunc handlers
+		if ph, _, err := h.pathHandlers.Search(r.Method, r.URL.Path); err == nil {
+			ph.(http.HandlerFunc)(w, r)
+			return
+		}
 		h.errorHandler(ctx, nil, w, r, fmt.Errorf("not matching route found"), http.StatusNotFound)
 		return
 	}
@@ -440,6 +448,10 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	if r.Body != nil {
+		defer r.Body.Close()
+	}
+
 	cf, err := h.newCodec(ct)
 	if err != nil {
 		h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
@@ -481,10 +493,12 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	matches = rflutil.FlattenMap(matches)
-	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
+	if len(matches) > 0 {
+		matches = rflutil.FlattenMap(matches)
+		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
+		}
 	}
 
 	hr := &rpcRequest{

handler/swagger/swagger.go

@@ -0,0 +1,55 @@
+package swagger
+
+import (
+	"io/fs"
+	"net/http"
+
+	yamlcodec "go.unistack.org/micro-codec-yaml/v3"
+	rutil "go.unistack.org/micro/v3/util/reflect"
+)
+
+// Handler append to generated swagger data from dst map[string]interface{}
+var Handler = func(dst map[string]interface{}, fsys fs.FS) http.HandlerFunc {
+	c := yamlcodec.NewCodec()
+	return func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodGet {
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+
+		path := r.URL.Path
+		if len(path) > 1 && path[0] == '/' {
+			path = path[1:]
+		}
+
+		buf, err := fs.ReadFile(fsys, path)
+		if err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			_, _ = w.Write([]byte(err.Error()))
+			return
+		}
+
+		var src interface{}
+
+		if err = c.Unmarshal(buf, src); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			_, _ = w.Write([]byte(err.Error()))
+			return
+		}
+
+		if err = rutil.Merge(src, dst); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			_, _ = w.Write([]byte(err.Error()))
+			return
+		}
+
+		if buf, err = c.Marshal(src); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			_, _ = w.Write([]byte(err.Error()))
+			return
+		}
+
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write(buf)
+	}
+}

http.go

@@ -378,6 +378,17 @@ func (h *Server) Register() error {
 	}
 
 	h.Lock()
+
+	h.registered = true
+	h.rsvc = service
+	h.Unlock()
+
+	return nil
+}
+
+func (h *Server) subscribe() error {
+	config := h.opts
+
 	for sb := range h.subscribers {
 		handler := h.createSubHandler(sb, config)
 		var opts []broker.SubscribeOption
@@ -401,10 +412,6 @@ func (h *Server) Register() error {
 		h.subscribers[sb] = []broker.Subscriber{sub}
 	}
 
-	h.registered = true
-	h.rsvc = service
-	h.Unlock()
-
 	return nil
 }
 
@@ -539,6 +546,10 @@ func (h *Server) Start() error {
 		}
 	}
 
+	if err := h.subscribe(); err != nil {
+		return err
+	}
+
 	fn := handler
 
 	if h.opts.Context != nil {