Fix issue 2168 (#2205)

Author: David Geng

core/chaincode/exectransaction_test.go

@@ -57,6 +57,7 @@ func initMemSrvc() (net.Listener, error) {
 	finitMemSrvc(nil)
 
 	ca.LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
+	ca.CacheConfiguration() // Cache configuration
 
 	aca := ca.NewACA()
 	eca := ca.NewECA()

core/crypto/crypto_test.go

@@ -1512,6 +1512,7 @@ func setup() {
 
 func initPKI() {
 	ca.LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
+	ca.CacheConfiguration() // Need cache the configuration first
 	aca = ca.NewACA()
 	eca = ca.NewECA()
 	tca = ca.NewTCA(eca)

examples/chaincode/go/asset_management02/asset_management02_test.go

@@ -527,7 +527,7 @@ func setup() {
 
 func initMembershipSrvc() {
 	ca.LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
-
+	ca.CacheConfiguration() // Cache configuration
 	aca = ca.NewACA()
 	eca = ca.NewECA()
 	tca = ca.NewTCA(eca)

examples/chaincode/go/asset_management_with_roles/asset_management_with_roles_test.go

@@ -365,7 +365,7 @@ func setup() {
 
 func initMembershipSrvc() {
 	ca.LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
-
+	ca.CacheConfiguration() // Cache configuration
 	aca = ca.NewACA()
 	eca = ca.NewECA()
 	tca = ca.NewTCA(eca)

examples/chaincode/go/rbac_tcerts_no_attrs/rbac_test.go

@@ -441,7 +441,7 @@ func setup() {
 
 func initMemershipServices() {
 	ca.LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
-
+	ca.CacheConfiguration() // Cache configuration
 	eca = ca.NewECA()
 	tca = ca.NewTCA(eca)
 	tlsca = ca.NewTLSCA(eca)

membersrvc/ca/ca.go

@@ -29,6 +29,7 @@ import (
 	"io/ioutil"
 	"math/big"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"sync"
@@ -73,7 +74,11 @@ type AffiliationGroup struct {
 }
 
 var (
-	mutex = &sync.Mutex{}
+	mutex          = &sync.Mutex{}
+	caOrganization string
+	caCountry      string
+	rootPath       string
+	caDir          string
 )
 
 // NewCertificateSpec creates a new certificate spec
@@ -118,6 +123,13 @@ func NewDefaultCertificateSpecWithCommonName(id string, commonName string, pub i
 	return NewDefaultPeriodCertificateSpecWithCommonName(id, commonName, serialNumber, pub, usage, opt...)
 }
 
+func CacheConfiguration() {
+	caOrganization = viper.GetString("pki.ca.subject.organization")
+	caCountry = viper.GetString("pki.ca.subject.country")
+	rootPath = viper.GetString("server.rootpath")
+	caDir = viper.GetString("server.cadir")
+}
+
 // GetID returns the spec's ID field/value
 //
 func (spec *CertificateSpec) GetID() string {
@@ -163,13 +175,13 @@ func (spec *CertificateSpec) GetNotAfter() *time.Time {
 // GetOrganization returns the spec's Organization field/value
 //
 func (spec *CertificateSpec) GetOrganization() string {
-	return viper.GetString("pki.ca.subject.organization")
+	return caOrganization
 }
 
 // GetCountry returns the spec's Country field/value
 //
 func (spec *CertificateSpec) GetCountry() string {
-	return viper.GetString("pki.ca.subject.country")
+	return caCountry
 }
 
 // GetSubjectKeyID returns the spec's subject KeyID
@@ -209,7 +221,7 @@ func initializeCommonTables(db *sql.DB) error {
 // NewCA sets up a new CA.
 func NewCA(name string, initTables TableInitializer) *CA {
 	ca := new(CA)
-	ca.path = viper.GetString("server.rootpath") + "/" + viper.GetString("server.cadir")
+	ca.path = filepath.Join(rootPath, caDir)
 
 	if _, err := os.Stat(ca.path); err != nil {
 		Info.Println("Fresh start; creating databases, key pairs, and certificates.")

membersrvc/ca/ca_test.go

@@ -46,7 +46,7 @@ func TestNewCA(t *testing.T) {
 
 	//initialize logging to avoid panics in the current code
 	LogInit(os.Stdout, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
-
+	CacheConfiguration() // Cache configuration
 	//Create new CA
 	ca := NewCA(name, initializeTables)
 	if ca == nil {

membersrvc/ca/membersrvc_test.go

@@ -70,6 +70,7 @@ func setupTestConfig() {
 
 func initPKI() {
 	LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
+	CacheConfiguration() // Cache configuration
 	aca = NewACA()
 	eca = NewECA()
 	tca = NewTCA(eca)

membersrvc/ca/tca_test.go

@@ -157,7 +157,7 @@ func initTCA() (*TCA, error) {
 
 	//initialize logging to avoid panics in the current code
 	LogInit(os.Stdout, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
-
+	CacheConfiguration() // Cache configuration
 	eca := NewECA()
 	if eca == nil {
 		return nil, fmt.Errorf("Could not create a new ECA")

membersrvc/ca/tlsca_test.go

@@ -64,7 +64,7 @@ func TestTLS(t *testing.T) {
 
 func startTLSCA(t *testing.T) {
 	LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
-
+	CacheConfiguration() // Cache configuration
 	ecaS = NewECA()
 	tlscaS = NewTLSCA(ecaS)
 

membersrvc/server.go

@@ -88,6 +88,9 @@ func main() {
 	}
 
 	ca.LogInit(iotrace, ioinfo, iowarning, ioerror, iopanic)
+	// cache configure
+	ca.CacheConfiguration()
+
 	ca.Info.Println("CA Server (" + viper.GetString("server.version") + ")")
 
 	aca := ca.NewACA()