Skip to content
Snippets Groups Projects
Commit 3cf0b9df authored by Benjamin Wenger's avatar Benjamin Wenger
Browse files

Merge branch 'hotfix/webcert' into 'release'

Web hosts still need cert

See merge request !60
parents 7db5c9f7 fd9629d8
Branches
Tags
2 merge requests!60Web hosts still need cert,!39Merge release into master
......@@ -151,7 +151,7 @@ func TestWebConnection_TLS(t *testing.T) {
hostParams := GetDefaultHostParams()
hostParams.ConnectionType = Web
h, err := newHost(hostId, addr, nil, hostParams)
h, err := newHost(hostId, addr, httpsCertBytes, hostParams)
if err != nil {
t.Fatal(err)
}
......
......@@ -118,12 +118,12 @@ func newHost(id *id.ID, address string, cert []byte, params HostParams) (host *H
host.UpdateAddress(address)
// Configure the transport credentials for GRPC hosts
if !host.IsWeb() {
//if !host.IsWeb() {
err = host.setCredentials()
if err != nil {
return
}
}
//}
// Connect immediately if configured to do so
if params.DisableLazyConnection {
......
......@@ -79,9 +79,9 @@ func (wc *webConn) connectWebHelper() (err error) {
// Configure TLS options
var securityDial []grpcweb.DialOption
if wc.h.credentials != nil {
return errors.New("Web hosts should not have credentials specified")
}
//if wc.h.credentials != nil {
// return errors.New("Web hosts should not have credentials specified")
//}
if !TestingOnlyDisableTLS {
securityDial = []grpcweb.DialOption{grpcweb.WithSecure()}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment