chaincode updates in prep for alpha2 (#954)

Signed-off-by: Dave Kelsey <[email protected]>

Author: davek-at-ibm

packages/composer-runtime-hlfv1/chaincode.go

@@ -16,6 +16,37 @@ package main
 
 import "github.com/hyperledger/fabric/core/chaincode/shim"
 import pb "github.com/hyperledger/fabric/protos/peer"
+import "os"
+import "strings"
+// enable logging based on either world state or env variable.
+// default to INFO if neither have a value.
+func EnableLogging(stub shim.ChaincodeStubInterface) {
+	var levelStr string
+	levelBytes, err := stub.GetState("ComposerLogLevel")
+	if err != nil || levelBytes == nil {
+		var isSet bool
+		levelStr, isSet = os.LookupEnv("CORE_CHAINCODE_LOGLEVEL")
+		if !isSet {
+			levelStr = "INFO"
+		}
+	} else {
+		levelStr = string(levelBytes)
+	}
+
+	level, _ := shim.LogLevel(levelStr)
+	logger.SetLevel(level)
+}
+
+// explicitly set the logging to a specific level
+func SetLogging(stub shim.ChaincodeStubInterface, levelStr string) {
+	//We could check that the levelStr is valid but
+	//currently if it isn't then I think shim.LogLevel will return a default of loglevel of Error.
+	newLevel := strings.ToUpper(levelStr)
+	stub.PutState("ComposerLogLevel", []byte(newLevel))
+	level, _ := shim.LogLevel(newLevel)
+	logger.SetLevel(level)
+	logger.Warning("Setting loglevel to", newLevel)
+}
 
 // Chaincode is the chaincode class. It is an implementation of the
 // Chaincode interface.
@@ -36,10 +67,9 @@ func NewChaincode() (result *Chaincode) {
 // Init is called by the Hyperledger Fabric when the chaincode is deployed.
 // Init can read from and write to the world state.
 func (chaincode *Chaincode) Init(stub shim.ChaincodeStubInterface) (response pb.Response) {
-	//TODO: Need to control this via env var and/or api call.
 	//logging needs to be set here again as the fabric chaincode disables it
 	//even though it was enabled in main.
-	logger.SetLevel(shim.LogDebug)
+	EnableLogging(stub)
 	logger.Debug("Entering Chaincode.Init", &stub)
 	defer func() {
 		logger.Debug("Exiting Chaincode.Init", response.Status, response.Message, string(response.Payload))
@@ -51,6 +81,17 @@ func (chaincode *Chaincode) Init(stub shim.ChaincodeStubInterface) (response pb.
 
 	// Execute the init function.
 	function, arguments := stub.GetFunctionAndParameters()
+
+	// look for -d loglevel and set log and remove
+	// from arguments
+	var loglevel string
+	for i, value := range arguments {
+        if value == "-d" && (i + 1) < len(arguments) {
+            loglevel = arguments[i+1]
+            arguments = append(arguments[:i], arguments[i+2:]...)
+        }
+	}
+	SetLogging(stub, loglevel)
 	payload, err := composer.Init(stub, function, arguments)
 	if err != nil {
 		return shim.Error(err.Error())
@@ -61,10 +102,9 @@ func (chaincode *Chaincode) Init(stub shim.ChaincodeStubInterface) (response pb.
 // Invoke is called by the Hyperledger Fabric when the chaincode is invoked.
 // Invoke can read from and write to the world state.
 func (chaincode *Chaincode) Invoke(stub shim.ChaincodeStubInterface) (response pb.Response) {
-	//TODO: Need to control this via env var and/or api call.
 	//logging needs to be set here again as the fabric chaincode disables it
 	//even though it was enabled in main.
-	logger.SetLevel(shim.LogDebug)
+	EnableLogging(stub)
 	logger.Debug("Entering Chaincode.Invoke", &stub)
 	defer func() {
 		logger.Debug("Exiting Chaincode.Invoke", response.Status, response.Message, string(response.Payload))
@@ -76,9 +116,14 @@ func (chaincode *Chaincode) Invoke(stub shim.ChaincodeStubInterface) (response p
 
 	// Execute the invoke function.
 	function, arguments := stub.GetFunctionAndParameters()
-	payload, err := composer.Invoke(stub, function, arguments)
-	if err != nil {
-		return shim.Error(err.Error())
+		if strings.ToLower(function) == "logging" {
+		SetLogging(stub, arguments[0])
+		return shim.Success(nil)
+	} else {
+		payload, err := composer.Invoke(stub, function, arguments)
+		if err != nil {
+			return shim.Error(err.Error())
+		}
+		return shim.Success(payload)
 	}
-	return shim.Success(payload)
 }

packages/composer-runtime-hlfv1/identityservice.go

@@ -16,6 +16,7 @@ package main
 
 import (
 	"bytes"
+	"strings"
 	"crypto/x509"
 	"encoding/pem"
 
@@ -107,7 +108,7 @@ func (identityService *IdentityService) getCurrentUserID(vm *duktape.Context) (r
 
 	// TODO: temporary for V1 admin user returns null to give them
 	// full authority
-	if ucert.Subject.CommonName == "admin" {
+	if strings.Contains(strings.ToLower(ucert.Subject.CommonName), "admin") {
 		vm.PushNull()
 		return 1
 	}

packages/composer-runtime-hlfv1/main.go

@@ -26,8 +26,6 @@ var logger = shim.NewLogger("Composer")
 // main starts the shim, which establishes the connection to the Hyperledger
 // Fabric and registers the chaincode for deploys, queries, and invokes.
 func main() {
-	//TODO: Need to control this via env var and/or api call.
-	logger.SetLevel(shim.LogDebug)
 	logger.Debug("Entering main")
 	defer func() { logger.Debug("Exiting main") }()
 	chaincode := NewChaincode()