[FABCJ-276] Access localmspid

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

Author: mbwhite

fabric-chaincode-shim/build.gradle

@@ -319,6 +319,9 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 tasks.withType(Test) {
+
+    environment "CORE_PEER_LOCALMSPID", "mymsp"
+
     testLogging {
         // set options for log level LIFECYCLE
         events TestLogEvent.FAILED,

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeBase.java

@@ -89,13 +89,15 @@ public abstract class ChaincodeBase implements Chaincode {
     private String tlsClientRootCertPath;
 
     private String id;
+    private String localMspId = "";
 
     private static final String CORE_CHAINCODE_ID_NAME = "CORE_CHAINCODE_ID_NAME";
     private static final String CORE_PEER_ADDRESS = "CORE_PEER_ADDRESS";
     private static final String CORE_PEER_TLS_ENABLED = "CORE_PEER_TLS_ENABLED";
     private static final String CORE_PEER_TLS_ROOTCERT_FILE = "CORE_PEER_TLS_ROOTCERT_FILE";
     private static final String ENV_TLS_CLIENT_KEY_PATH = "CORE_TLS_CLIENT_KEY_PATH";
     private static final String ENV_TLS_CLIENT_CERT_PATH = "CORE_TLS_CLIENT_CERT_PATH";
+    private static final String CORE_PEER_LOCALMSPID = "CORE_PEER_LOCALMSPID";
     private Properties props;
     private Level logLevel;
 
@@ -145,7 +147,8 @@ protected final void connectToPeer() throws IOException {
     }
 
     protected final void initializeLogging() {
-        System.setProperty("java.util.logging.SimpleFormatter.format", "%1$tH:%1$tM:%1$tS:%1$tL %4$-7.7s %2$-80.80s %5$s%6$s%n");
+        System.setProperty("java.util.logging.SimpleFormatter.format",
+                "%1$tH:%1$tM:%1$tS:%1$tL %4$-7.7s %2$-80.80s %5$s%6$s%n");
         final Logger rootLogger = Logger.getLogger("");
 
         for (final java.util.logging.Handler handler : rootLogger.getHandlers()) {
@@ -156,8 +159,10 @@ protected final void initializeLogging() {
                 public synchronized String format(final LogRecord record) {
                     return super.format(record).replaceFirst(".*SEVERE\\s*\\S*\\s*\\S*", "\u001B[1;31m$0\u001B[0m")
                             .replaceFirst(".*WARNING\\s*\\S*\\s*\\S*", "\u001B[1;33m$0\u001B[0m")
-                            .replaceFirst(".*CONFIG\\s*\\S*\\s*\\S*", "\u001B[35m$0\u001B[0m").replaceFirst(".*FINE\\s*\\S*\\s*\\S*", "\u001B[36m$0\u001B[0m")
-                            .replaceFirst(".*FINER\\s*\\S*\\s*\\S*", "\u001B[36m$0\u001B[0m").replaceFirst(".*FINEST\\s*\\S*\\s*\\S*", "\u001B[36m$0\u001B[0m");
+                            .replaceFirst(".*CONFIG\\s*\\S*\\s*\\S*", "\u001B[35m$0\u001B[0m")
+                            .replaceFirst(".*FINE\\s*\\S*\\s*\\S*", "\u001B[36m$0\u001B[0m")
+                            .replaceFirst(".*FINER\\s*\\S*\\s*\\S*", "\u001B[36m$0\u001B[0m")
+                            .replaceFirst(".*FINEST\\s*\\S*\\s*\\S*", "\u001B[36m$0\u001B[0m");
                 }
 
             });
@@ -192,7 +197,8 @@ public String format(final LogRecord record) {
                     pw.close();
                     throwable = sw.toString();
                 }
-                return String.format(format, dat, source, record.getLoggerName(), record.getLevel(), message, throwable);
+                return String.format(format, dat, source, record.getLoggerName(), record.getLevel(), message,
+                        throwable);
 
             }
 
@@ -220,7 +226,7 @@ public String format(final LogRecord record) {
         final List<?> loggers = Collections.list(LogManager.getLogManager().getLoggerNames());
         loggers.forEach(x -> {
             final Logger l = LogManager.getLogManager().getLogger((String) x);
-            //  err what is the code supposed to do?
+            // err what is the code supposed to do?
         });
 
     }
@@ -249,19 +255,22 @@ private Level mapLevel(final String level) {
 
     protected final void validateOptions() {
         if (this.id == null) {
-            throw new IllegalArgumentException(
-                    format("The chaincode id must be specified using either the -i or --i command line options or the %s environment variable.",
-                            CORE_CHAINCODE_ID_NAME));
+            throw new IllegalArgumentException(format(
+                    "The chaincode id must be specified using either the -i or --i command line options or the %s environment variable.",
+                    CORE_CHAINCODE_ID_NAME));
         }
         if (this.tlsEnabled) {
             if (tlsClientCertPath == null) {
-                throw new IllegalArgumentException(format("Client key certificate chain (%s) was not specified.", ENV_TLS_CLIENT_CERT_PATH));
+                throw new IllegalArgumentException(
+                        format("Client key certificate chain (%s) was not specified.", ENV_TLS_CLIENT_CERT_PATH));
             }
             if (tlsClientKeyPath == null) {
-                throw new IllegalArgumentException(format("Client key (%s) was not specified.", ENV_TLS_CLIENT_KEY_PATH));
+                throw new IllegalArgumentException(
+                        format("Client key (%s) was not specified.", ENV_TLS_CLIENT_KEY_PATH));
             }
             if (tlsClientRootCertPath == null) {
-                throw new IllegalArgumentException(format("Peer certificate trust store (%s) was not specified.", CORE_PEER_TLS_ROOTCERT_FILE));
+                throw new IllegalArgumentException(
+                        format("Peer certificate trust store (%s) was not specified.", CORE_PEER_TLS_ROOTCERT_FILE));
             }
         }
     }
@@ -286,7 +295,8 @@ protected final void processCommandLineOptions(final String[] args) {
                     port = Integer.valueOf(hostArr[1].trim());
                     host = hostArr[0].trim();
                 } else {
-                    final String msg = String.format("peer address argument should be in host:port format, current %s in wrong", hostAddrStr);
+                    final String msg = String.format(
+                            "peer address argument should be in host:port format, current %s in wrong", hostAddrStr);
                     LOGGER.severe(msg);
                     throw new IllegalArgumentException(msg);
                 }
@@ -318,10 +328,17 @@ protected final void processEnvironmentOptions() {
                 this.port = Integer.valueOf(hostArr[1].trim());
                 this.host = hostArr[0].trim();
             } else {
-                final String msg = String.format("peer address argument should be in host:port format, ignoring current %s", System.getenv(CORE_PEER_ADDRESS));
+                final String msg = String.format(
+                        "peer address argument should be in host:port format, ignoring current %s",
+                        System.getenv(CORE_PEER_ADDRESS));
                 LOGGER.severe(msg);
             }
         }
+
+        if (System.getenv().containsKey(CORE_PEER_LOCALMSPID)) {
+            this.localMspId = System.getenv(CORE_PEER_LOCALMSPID);
+        }
+
         this.tlsEnabled = Boolean.parseBoolean(System.getenv(CORE_PEER_TLS_ENABLED));
         if (this.tlsEnabled) {
             this.tlsClientRootCertPath = System.getenv(CORE_PEER_TLS_ROOTCERT_FILE);
@@ -336,12 +353,13 @@ protected final void processEnvironmentOptions() {
         LOGGER.info("CORE_PEER_TLS_ROOTCERT_FILE: " + this.tlsClientRootCertPath);
         LOGGER.info("CORE_TLS_CLIENT_KEY_PATH: " + this.tlsClientKeyPath);
         LOGGER.info("CORE_TLS_CLIENT_CERT_PATH: " + this.tlsClientCertPath);
+        LOGGER.info("CORE_PEER_LOCALMSPID: " + this.localMspId);
         LOGGER.info("LOGLEVEL: " + this.logLevel);
     }
 
     /**
-     * Obtains configuration specifically for running the chaincode and settable
-     * on a per chaincode basis rather than taking properties from the Peers'
+     * Obtains configuration specifically for running the chaincode and settable on
+     * a per chaincode basis rather than taking properties from the Peers'
      * configuration.
      *
      * @return Configuration
@@ -400,7 +418,9 @@ final SslContext createSSLContext() throws IOException {
         final byte[] ccb = Files.readAllBytes(Paths.get(this.tlsClientCertPath));
 
         return GrpcSslContexts.forClient().trustManager(new File(this.tlsClientRootCertPath))
-                .keyManager(new ByteArrayInputStream(Base64.getDecoder().decode(ccb)), new ByteArrayInputStream(Base64.getDecoder().decode(ckb))).build();
+                .keyManager(new ByteArrayInputStream(Base64.getDecoder().decode(ccb)),
+                        new ByteArrayInputStream(Base64.getDecoder().decode(ckb)))
+                .build();
     }
 
     @Deprecated

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeStub.java

@@ -708,4 +708,10 @@ default void putStringState(final String key, final String value) {
      */
     byte[] getBinding();
 
+    /**
+     * Get the MSPID of the peer that started this chaincode.
+     *
+     * @return string MSPID
+     */
+    String getMspId();
 }