[FAB-6275] Removed tls:enabled from SDK GO config file

Change-Id: I3921722f2e2b73a5b289be332cbf134dd825fd00
Signed-off-by: Baha Shaaban <baha.shaaban@securekey.com>

Author: Baha Shaaban

api/apiconfig/configprovider.go

@@ -30,7 +30,6 @@ type Config interface {
 	NetworkConfig() (*NetworkConfig, error)
 	ChannelConfig(name string) (*ChannelConfig, error)
 	ChannelPeers(name string) ([]ChannelPeer, error)
-	IsTLSEnabled() bool
 	SetTLSCACertPool(*x509.CertPool)
 	TLSCACertPool(tlsCertificate string) (*x509.CertPool, error)
 	IsSecurityEnabled() bool

api/apiconfig/mocks/mockconfig.gen.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
 
+	"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors"
 	"github.com/hyperledger/fabric-sdk-go/pkg/logging"
 	bccspFactory "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/factory"
@@ -375,7 +376,7 @@ func (c *Config) PeersConfig(org string) ([]apiconfig.PeerConfig, error) {
 
 	for _, peerName := range peersConfig {
 		p := config.Peers[strings.ToLower(peerName)]
-		if err = verifyPeerConfig(p, peerName, c.IsTLSEnabled()); err != nil {
+		if err = verifyPeerConfig(p, peerName, urlutil.IsTLSEnabled(p.URL)); err != nil {
 			return nil, err
 		}
 		if p.TLSCACerts.Path != "" {
@@ -464,7 +465,7 @@ func (c *Config) ChannelPeers(name string) ([]apiconfig.ChannelPeer, error) {
 			return nil, errors.Errorf("peer config not found for %s", peerName)
 		}
 
-		if err = verifyPeerConfig(p, peerName, c.IsTLSEnabled()); err != nil {
+		if err = verifyPeerConfig(p, peerName, urlutil.IsTLSEnabled(p.URL)); err != nil {
 			return nil, err
 		}
 
@@ -507,11 +508,6 @@ func verifyPeerConfig(p apiconfig.PeerConfig, peerName string, tlsEnabled bool)
 	return nil
 }
 
-// IsTLSEnabled is TLS enabled?
-func (c *Config) IsTLSEnabled() bool {
-	return myViper.GetBool("client.tls.enabled")
-}
-
 // SetTLSCACertPool allows a user to set a global cert pool with a set of
 // root TLS CAs that will be used for all outgoing connections
 func (c *Config) SetTLSCACertPool(certPool *x509.CertPool) {

pkg/config/config.go

@@ -63,10 +63,6 @@ client:
   cryptoconfig:
     path: path/to/cryptoconfig
 
-  # enable/disable tls for the client
-  tls:
-    enabled: true
-
   # Some SDKs support pluggable KV stores, the properties under "credentialStore"
   # are implementation specific
   credentialStore:
@@ -185,7 +181,7 @@ organizations:
 #
 orderers:
 #  orderer.example.com:
-#    url: orderer.example.com:7050
+#    url: grpcs://orderer.example.com:7050
 
     # these are standard properties defined by the gRPC library
     # they will be passed in as-is to gRPC client constructor
@@ -204,10 +200,10 @@ orderers:
 peers:
 #  peer0.org1.example.com:
     # this URL is used to send endorsement and query requests
-#    url: peer0.org1.example.com:7051
+#    url: grpcs://peer0.org1.example.com:7051
 
     # this URL is used to connect the EventHub and registering event listeners
-#    eventUrl: peer0.org1.example.com:7053
+#    eventUrl: grpcs://peer0.org1.example.com:7053
 
 #    grpcOptions:
 #      ssl-target-name-override: peer0.org1.example.com

pkg/config/config.yaml

@@ -0,0 +1,40 @@
+/*
+Copyright SecureKey Technologies Inc. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package urlutil
+
+import (
+	"strings"
+
+	"github.com/hyperledger/fabric-sdk-go/pkg/logging"
+)
+
+var logger = logging.NewLogger("fabric_sdk_go")
+
+// IsTLSEnabled is a generic function that expects a URL and verifies if it has
+// a prefix HTTPS or GRPCS to return true for TLS Enabled URLs or false otherwise
+func IsTLSEnabled(url string) bool {
+	tlsURL := strings.ToLower(url)
+	if strings.HasPrefix(tlsURL, "https://") || strings.HasPrefix(tlsURL, "grpcs://") {
+		return true
+	}
+	return false
+}
+
+// ToAddress is a utility function to trim the GRPC protocol prefix as it is not needed by GO
+// if the GRPC protocol is not found, the url is returned unchanged
+func ToAddress(url string) string {
+	if strings.HasPrefix(url, "grpc://") {
+		return strings.TrimPrefix(url, "grpc://")
+	}
+	if strings.HasPrefix(url, "grpcs://") {
+		return strings.TrimPrefix(url, "grpcs://")
+	}
+	if !strings.HasPrefix(url, "http://") && !strings.HasPrefix(url, "https://") {
+		logger.Warnf("URL '%s' has no prefix. Please enter a prefix as it will be mandatory in a future release", url)
+	}
+	return url
+}

pkg/config/urlutil/urlutils.go

@@ -13,6 +13,7 @@ import (
 	sdkApi "github.com/hyperledger/fabric-sdk-go/api/apifabca"
 	api "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/api"
 	fabric_ca "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/lib"
+	"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
 	"github.com/hyperledger/fabric-sdk-go/pkg/logging"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
 )
@@ -44,10 +45,14 @@ func NewFabricCAClient(config config.Config, org string) (*FabricCA, error) {
 		return nil, err
 	}
 
+	if conf == nil {
+		return nil, errors.Errorf("Orgnization %s have no corresponding CA in the configs", org)
+	}
+
 	//set server CAName
 	c.Config.CAName = conf.CAName
 	//set server URL
-	c.Config.URL = conf.URL
+	c.Config.URL = urlutil.ToAddress(conf.URL)
 	//certs file list
 	c.Config.TLS.CertFiles, err = config.CAServerCertFiles(org)
 	if err != nil {
@@ -72,7 +77,7 @@ func NewFabricCAClient(config config.Config, org string) (*FabricCA, error) {
 	}
 
 	//TLS flag enabled/disabled
-	c.Config.TLS.Enabled = config.IsTLSEnabled()
+	c.Config.TLS.Enabled = urlutil.IsTLSEnabled(conf.URL)
 	c.Config.MSPDir = config.CAKeyStorePath()
 	c.Config.CSP = config.CSPConfig()