unistack-org/micro-network-transport-http
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

not use selfsigned certs

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2020-11-05 23:55:31 +03:00
parent bf27264d70
commit f4ab3cbb40
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
http.go
View File

@ -5,6 +5,7 @@ import (
"bytes" "bytes"
"crypto/tls" "crypto/tls"
"errors" "errors"
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"net" "net"
@ -14,10 +15,8 @@ import (
"time" "time"
"github.com/unistack-org/micro/v3/network/transport" "github.com/unistack-org/micro/v3/network/transport"
maddr "github.com/unistack-org/micro/v3/util/addr"
"github.com/unistack-org/micro/v3/util/buf" "github.com/unistack-org/micro/v3/util/buf"
mnet "github.com/unistack-org/micro/v3/util/net" mnet "github.com/unistack-org/micro/v3/util/net"
mls "github.com/unistack-org/micro/v3/util/tls"
"golang.org/x/net/http2" "golang.org/x/net/http2"
"golang.org/x/net/http2/h2c" "golang.org/x/net/http2/h2c"
) )
@ -533,30 +532,11 @@ func (h *httpTransport) Listen(addr string, opts ...transport.ListenOption) (tra
var err error var err error
// TODO: support use of listen options // TODO: support use of listen options
if h.opts.Secure || h.opts.TLSConfig != nil { if h.opts.Secure && h.opts.TLSConfig == nil {
config := h.opts.TLSConfig return nil, fmt.Errorf("request secure communication, but *tls.Config is nil")
} else if h.opts.Secure && h.opts.TLSConfig != nil {
fn := func(addr string) (net.Listener, error) { fn := func(addr string) (net.Listener, error) {
if config == nil { return tls.Listen("tcp", addr, h.opts.TLSConfig)
hosts := []string{addr}
// check if its a valid host:port
if host, _, err := net.SplitHostPort(addr); err == nil {
if len(host) == 0 {
hosts = maddr.IPs()
} else {
hosts = []string{host}
}
}
// generate a certificate
cert, err := mls.Certificate(hosts...)
if err != nil {
return nil, err
}
config = &tls.Config{Certificates: []tls.Certificate{cert}}
}
return tls.Listen("tcp", addr, config)
} }
l, err = mnet.Listen(addr, fn) l, err = mnet.Listen(addr, fn)