Added relay access check to Fabric Interop CC external request function

Signed-off-by: VRamakrishna <[email protected]>

Author: VRamakrishna

.github/workflows/data-transfer.yml

@@ -164,20 +164,20 @@ jobs:
           TOTAL=4
 
           # CORDA - FABRIC1
-          ./clients/build/install/clients/bin/clients request-state localhost:9081 relay-network1:9080/network1/mychannel:simplestate:Read:a &> tmp.out    
+          ./clients/build/install/clients/bin/clients request-state localhost:9081 relay-network1:9080/network1/mychannel:simplestate:Read:a 1> tmp.out
           tail -n 1 tmp.out | grep "SimpleState(key=a, value=Arcturus" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
-          ./clients/build/install/clients/bin/clients get-state a &> tmp.out
+          ./clients/build/install/clients/bin/clients get-state a 1> tmp.out
           tail -n 1 tmp.out | grep "SimpleState(key=a, value=Arcturus" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
           # CORDA - FABRIC2
-          ./clients/build/install/clients/bin/clients request-state localhost:9081 relay-network2:9083/network2/mychannel:simplestate:Read:Arcturus &> tmp.out
+          ./clients/build/install/clients/bin/clients request-state localhost:9081 relay-network2:9083/network2/mychannel:simplestate:Read:Arcturus 1> tmp.out
           tail -n 1 tmp.out | grep "SimpleState(key=Arcturus, value=17.671" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
-          ./clients/build/install/clients/bin/clients get-state Arcturus &> tmp.out
+          ./clients/build/install/clients/bin/clients get-state Arcturus 1> tmp.out
           tail -n 1 tmp.out | grep "SimpleState(key=Arcturus, value=17.671" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 

core/network/fabric-interop-cc/contracts/interop/handle_external_request.go

@@ -18,6 +18,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go/common"
 	protoV2 "google.golang.org/protobuf/proto"
+	wutils "github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils"
 )
 
 // HandleExternalRequest chaincode processes requests that come from external networks.
@@ -28,6 +29,16 @@ import (
 // 3. Checks the access control policy for the requester and view address is met
 // 4. Calls application chaincode
 func (s *SmartContract) HandleExternalRequest(ctx contractapi.TransactionContextInterface, b64QueryBytes string) (string, error) {
+	if !s.testMode {
+		relayAccessCheck, err := wutils.CheckAccessIfRelayClient(ctx.GetStub())
+		if err != nil {
+			return "", err
+		}
+		if !relayAccessCheck {
+			return "", fmt.Errorf("Illegal access by relay")
+		}
+		fmt.Println("Relay access check passed")
+	}
 	queryBytes, err := base64.StdEncoding.DecodeString(b64QueryBytes)
 	if err != nil {
 		errorMessage := fmt.Sprintf("Unable to base64 decode data: %s", err.Error())

core/network/fabric-interop-cc/contracts/interop/handle_external_request_test.go

@@ -116,6 +116,7 @@ func TestHandleExternalRequest(t *testing.T) {
 func testHandleExternalRequestInvalidJSON(t *testing.T) {
 	ctx, _ := wtest.PrepMockStub()
 	interopcc := SmartContract{}
+	interopcc.testMode = true
 
 	// Invalid Input
 	_, err := interopcc.HandleExternalRequest(ctx, "Invalid Input")
@@ -125,6 +126,7 @@ func testHandleExternalRequestInvalidJSON(t *testing.T) {
 func testHandleExternalRequestSignatureNotBase64(t *testing.T, query *common.Query) {
 	ctx, _ := wtest.PrepMockStub()
 	interopcc := SmartContract{}
+	interopcc.testMode = true
 
 	queryBytes, err := protoV2.Marshal(query)
 	require.NoError(t, err)
@@ -137,6 +139,7 @@ func testHandleExternalRequestSignatureNotBase64(t *testing.T, query *common.Que
 func testHandleExternalRequestSignatureCertificateMismatch(t *testing.T, query *common.Query) {
 	ctx, _ := wtest.PrepMockStub()
 	interopcc := SmartContract{}
+	interopcc.testMode = true
 
 	// set correct values for this test case
 	query.RequestorSignature = "U2lnbmF0dXJl"
@@ -151,6 +154,7 @@ func testHandleExternalRequestSignatureCertificateMismatch(t *testing.T, query *
 func testHandleExternalRequestInvalidCert(t *testing.T, query *common.Query) {
 	ctx, _ := wtest.PrepMockStub()
 	interopcc := SmartContract{}
+	interopcc.testMode = true
 
 	// set correct values for this test case
 	query.Certificate = "cert"
@@ -165,6 +169,7 @@ func testHandleExternalRequestInvalidCert(t *testing.T, query *common.Query) {
 func testHandleExternalRequestECDSAHappyCase(t *testing.T, query *common.Query, validCertificate string, signature []byte, pbResp pb.Response, accessControl *common.AccessControlPolicy, membership *common.Membership) {
 	ctx, chaincodeStub := wtest.PrepMockStub()
 	interopcc := SmartContract{}
+	interopcc.testMode = true
 
 	// set correct values for the success case
 	query.Certificate = validCertificate
@@ -197,6 +202,7 @@ func testHandleExternalRequestECDSAHappyCase(t *testing.T, query *common.Query,
 func testHandleExternalRequestED25519Signature(t *testing.T, query *common.Query, pbResp pb.Response, accessControl *common.AccessControlPolicy, fabricMembership *common.Membership, template x509.Certificate) {
 	ctx, chaincodeStub := wtest.PrepMockStub()
 	interopcc := SmartContract{}
+	interopcc.testMode = true
 
 	// create ed25519 cert and signature
 	certBytes, privKey, err := createED25519CertAndKeyFromTemplate(template)
@@ -232,6 +238,7 @@ func testHandleExternalRequestED25519Signature(t *testing.T, query *common.Query
 func testHandleExternalRequestNoMembership(t *testing.T, query *common.Query, validCertificate string, signature []byte, pbResp pb.Response) {
 	ctx, chaincodeStub := wtest.PrepMockStub()
 	interopcc := SmartContract{}
+	interopcc.testMode = true
 
 	// set correct values for this test case
 	query.Certificate = validCertificate
@@ -251,6 +258,7 @@ func testHandleExternalRequestNoMembership(t *testing.T, query *common.Query, va
 func testHandleExternalRequestNoAccessControlPolicy(t *testing.T, query *common.Query, validCertificate string, signature []byte, pbResp pb.Response, membership *common.Membership) {
 	ctx, chaincodeStub := wtest.PrepMockStub()
 	interopcc := SmartContract{}
+	interopcc.testMode = true
 
 	// set correct values for this test case
 	query.Certificate = validCertificate

core/network/fabric-interop-cc/contracts/interop/main.go

@@ -22,6 +22,7 @@ const applicationCCKey = "applicationccid"
 // SmartContract provides functions for managing arbitrary key-value pairs
 type SmartContract struct {
 	contractapi.Contract
+	testMode bool
 }
 
 func init() {
@@ -88,7 +89,9 @@ func (s *SmartContract) GetApplicationID(ctx contractapi.TransactionContextInter
 }
 
 func main() {
-	chaincode, err := contractapi.NewChaincode(new(SmartContract))
+	sc := new(SmartContract)
+	sc.testMode = false
+	chaincode, err := contractapi.NewChaincode(sc)
 
 	if err != nil {
 		fmt.Printf("Error creating Interop chaincode: %s", err.Error())