unistack-org/micro-server-http
4
0
Fork 3
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 116 Wiki Activity

hotfix #186

Merged
vtolstov merged 8 commits from kgorbunov/micro-server-http:hotfix into master 2024-03-26 14:53:15 +03:00
Conversation 0 Commits 8 Files Changed 5 +31 -33
3 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ebd953de1c - Show all commits

50
handler.go
View File

@ -109,20 +109,20 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
md = metadata.New(len(r.Header) + 8) md = metadata.New(len(r.Header) + 8)
} }
for k, v := range r.Header { for k, v := range r.Header {
md[k] = v md[k] = v[0]
} }
md["RemoteAddr"] = []string{r.RemoteAddr} md["RemoteAddr"] = r.RemoteAddr
md["Method"] = []string{r.Method} md["Method"] = r.Method
md["URL"] = []string{r.URL.String()} md["URL"] = r.URL.String()
md["Proto"] = []string{r.Proto} md["Proto"] = r.Proto
md["Content-Length"] = []string{fmt.Sprintf("%d", r.ContentLength)} md["Content-Length"] = fmt.Sprintf("%d", r.ContentLength)
md["Transfer-Encoding"] = r.TransferEncoding md["Transfer-Encoding"] = r.TransferEncoding[0]
md["Host"] = []string{r.Host} md["Host"] = r.Host
md["RequestURI"] = []string{r.RequestURI} md["RequestURI"] = r.RequestURI
if r.TLS != nil { if r.TLS != nil {
md["TLS"] = []string{"true"} md["TLS"] = "true"
md["TLS-ALPN"] = []string{r.TLS.NegotiatedProtocol} md["TLS-ALPN"] = r.TLS.NegotiatedProtocol
md["TLS-ServerName"] = []string{r.TLS.ServerName} md["TLS-ServerName"] = r.TLS.ServerName
} }
ctx = metadata.NewIncomingContext(ctx, md) ctx = metadata.NewIncomingContext(ctx, md)
@ -290,7 +290,7 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
w.Header().Set(metadata.HeaderContentType, ct) w.Header().Set(metadata.HeaderContentType, ct)
if md, ok := metadata.FromOutgoingContext(ctx); ok { if md, ok := metadata.FromOutgoingContext(ctx); ok {
for k, v := range md { for k, v := range md {
w.Header()[k] = v w.Header()[k] = []string{v}
} }
} }
if md := getRspHeader(ctx); md != nil { if md := getRspHeader(ctx); md != nil {
@ -349,23 +349,23 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
md = metadata.New(len(r.Header) + 8) md = metadata.New(len(r.Header) + 8)
} }
for k, v := range r.Header { for k, v := range r.Header {
md[k] = v md[k] = v[0]
} }
md["RemoteAddr"] = []string{r.RemoteAddr} md["RemoteAddr"] = r.RemoteAddr
if r.TLS != nil { if r.TLS != nil {
md["Scheme"] = []string{"https"} md["Scheme"] = "https"
} else { } else {
md["Scheme"] = []string{"http"} md["Scheme"] = "http"
} }
md["Method"] = []string{r.Method} md["Method"] = r.Method
md["URL"] = []string{r.URL.String()} md["URL"] = r.URL.String()
md["Proto"] = []string{r.Proto} md["Proto"] = r.Proto
md["Content-Length"] = []string{fmt.Sprintf("%d", r.ContentLength)} md["Content-Length"] = fmt.Sprintf("%d", r.ContentLength)
if len(r.TransferEncoding) > 0 { if len(r.TransferEncoding) > 0 {
md["Transfer-Encoding"] = r.TransferEncoding md["Transfer-Encoding"] = r.TransferEncoding[0]
} }
md["Host"] = []string{r.Host} md["Host"] = r.Host
md["RequestURI"] = []string{r.RequestURI} md["RequestURI"] = r.RequestURI
ctx = metadata.NewIncomingContext(ctx, md) ctx = metadata.NewIncomingContext(ctx, md)
path := r.URL.Path path := r.URL.Path
@ -550,7 +550,7 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
w.Header().Set(metadata.HeaderContentType, ct) w.Header().Set(metadata.HeaderContentType, ct)
if md, ok := metadata.FromOutgoingContext(ctx); ok { if md, ok := metadata.FromOutgoingContext(ctx); ok {
for k, v := range md { for k, v := range md {
w.Header()[k] = v w.Header()[k] = []string{v}
} }
} }
if md := getRspHeader(ctx); md != nil { if md := getRspHeader(ctx); md != nil {

4
http.go
View File

@ -217,7 +217,7 @@ func (h *Server) newHTTPHandler(handler interface{}, opts ...options.Option) *ht
pth := &patHandler{mtype: mtype, name: name, rcvr: rcvr} pth := &patHandler{mtype: mtype, name: name, rcvr: rcvr}
hdlr.name = name hdlr.name = name
if err := hdlr.handlers.Insert(md["Method"], md["Path"][0], pth); err != nil { if err := hdlr.handlers.Insert([]string{md["Method"]}, md["Path"], pth); err != nil {
h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("cant add handler for %s %s", md["Method"][0], md["Path"][0])) h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("cant add handler for %s %s", md["Method"][0], md["Path"][0]))
} }
@ -468,7 +468,7 @@ func (h *Server) Start() error {
go func() { go func() {
if cerr := hs.Serve(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) { if cerr := hs.Serve(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) {
h.opts.Logger.Error(h.opts.Context, cerr) h.opts.Logger.Error(h.opts.Context, cerr.Error())
} }
}() }()

6
util.go
View File

@ -33,13 +33,11 @@ func FillRequest(ctx context.Context, req interface{}, opts ...FillRequestOption
cookies := md["Cookie"] cookies := md["Cookie"]
cmd := make(map[string]string, len(cookies)) cmd := make(map[string]string, len(cookies))
for _, cookie := range cookies { kv := strings.Split(cookies, "=")
kv := strings.Split(cookie, "=")
if len(kv) != 2 { if len(kv) != 2 {
continue return nil
} }
cmd[strings.TrimSpace(kv[0])] = strings.TrimSpace(kv[1]) cmd[strings.TrimSpace(kv[0])] = strings.TrimSpace(kv[1])
}
for idx := 0; idx < len(options.cookies)/2; idx += 2 { for idx := 0; idx < len(options.cookies)/2; idx += 2 {
k := http.CanonicalHeaderKey(options.cookies[idx]) k := http.CanonicalHeaderKey(options.cookies[idx])
v, ok := cmd[k] v, ok := cmd[k]