Changes adding a third-party node and list of issuers mocked for REAR integration

Author: educanovas93

Makefile

@@ -313,9 +313,11 @@ clean-build:
 clean-fixtures:
 	@rm -Rf ./test/bdd/fixtures/keys/tls
 	@rm -Rf ./test/bdd/fixtures/demo/openapi/specs
-	@cd test/bdd/fixtures/demo/openapi && docker-compose down 2> /dev/null
 	@cd test/bdd/fixtures/sidetree-mock && docker-compose down 2> /dev/null
+	@cd test/bdd/fixtures/demo/openapi && docker-compose down 2> /dev/null
 	@cd test/bdd/fixtures/agent-rest && docker-compose down 2> /dev/null
+	
+	
 
 .PHONY: clean-fixtures-no-build
 clean-fixtures-no-build:

deploy/agent-rest/.env

@@ -27,6 +27,15 @@ DEFAULT_MEDIA_TYPE_PROFILES=didcomm/v2,didcomm/aip2;env=rfc19,didcomm/aip2;env=r
 DEFAULT_KEY_TYPE=ED25519
 DEFAULT_KEY_AGREEMENT_TYPE=X25519ECDHKW
 
+
+
+# Third agent configurations
+THIRD_HOST=0.0.0.0
+THIRD_INBOUND_PORT=7081
+THIRD_API_PORT=7082
+THIRD_DEBUG_PORT=3000
+
+
 # Holder agent configurations
 HOLDER_HOST=0.0.0.0
 HOLDER_INBOUND_PORT=8081
@@ -40,6 +49,10 @@ ISSUER_API_PORT=9082
 ISSUER_DEBUG_PORT=5000
 
 
+# Third webhook configurations
+THIRD_WEBHOOK_CONTAINER_NAME=third
+THIRD_WEBHOOK_HOST=0.0.0.0
+THIRD_WEBHOOK_PORT=7083
 
 # Holder webhook configurations
 HOLDER_WEBHOOK_CONTAINER_NAME=holder

deploy/demo/openapi/.env

@@ -12,3 +12,4 @@
 # Demo Agent API hosts
 DEVICE_API_HOST=localhost:8082
 ISSUER_API_HOST=localhost:9082
+THIRD_API_HOST=localhost:7082

deploy/demo/openapi/docker-compose.yml

@@ -33,6 +33,19 @@ services:
     networks:
       - test
 
+  third:
+    container_name: third-swagger
+    image: swaggerapi/swagger-ui
+    environment:
+      - SWAGGER_JSON=/specs/openapi-${THIRD_API_HOST}.yml
+      - BASE_URL=/openapi
+    ports:
+      - 7089:8080
+    volumes:
+      - ./specs:/specs
+    networks:
+      - test
+
 
 networks:
   test:

pkg/controller/command/poc/command.go

@@ -44,6 +44,7 @@ const (
 	VerifyCredentialRequestErrorCode
 	AcceptEnrolmentRequestErrorCode
 	TestingCallRequestErrorCode
+	GetTrustedIssuerListrRequestErrorCode
 )
 
 // constants for the VDR controller's methods.
@@ -56,8 +57,9 @@ const (
 	DoDeviceEnrolmentCommandMethod = "DoDeviceEnrolment"
 	GenerateVPCommandMethod        = "GenerateVP"
 	AcceptEnrolmentCommandMethod   = "AcceptEnrolment"
-	VerifyCredentialCommandMethod  = "ValidateVP" // TODO UMU: remove TESTING
+	VerifyCredentialCommandMethod  = "ValidateVP" 
 	TestingCallMethod		       = "TestingCall"
+	GetTrustedIssuerListMethod     = "GetTrustedIssuerList"
 	// error messages.
 	errEmptyNewDID   = "keys is mandatory"
 	errEmptyUrl      = "url is mandatory"
@@ -149,6 +151,8 @@ func (o *Command) GetHandlers() []command.Handler {
 		cmdutil.NewCommandHandler(CommandName, GenerateVPCommandMethod, o.GenerateVP),
 		cmdutil.NewCommandHandler(CommandName, AcceptEnrolmentCommandMethod, o.AcceptEnrolment),
 		cmdutil.NewCommandHandler(CommandName, TestingCallMethod, o.TestingCall),
+		cmdutil.NewCommandHandler(CommandName, VerifyCredentialCommandMethod, o.VerifyCredential),
+		cmdutil.NewCommandHandler(CommandName, GetTrustedIssuerListMethod, o.GetTrustedIssuerList),
 	}
 }
 
@@ -353,65 +357,7 @@ func (o *Command) NewDID(rw io.Writer, req io.Reader) command.Error {
 
 
 
-
-func (o * Command) getSignedProof()(string) {
-	randomString , err := generateRandomString(15)
-	if err != nil {
-		fmt.Println("Error generating random string:", err)
-		return ""
-	}
-
-	//Get DID/DIDDoc for specifying key, issuer...
-	// reader, err := getReader(&vdrc.IDArg{
-	// 	ID: o.currentDID,
-	// })
-	// var getResponse bytes.Buffer
-	// err = o.vdrcommand.GetDID(&getResponse, reader)
-	// if err != nil {
-	// 	logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "failed to get DID: "+err.Error())
-	// }
-	// var parsedDoc vdrc.Document
-	// err = json.NewDecoder(&getResponse).Decode(&parsedDoc)
-	// if err != nil {
-	// 	logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "failed to decode DID Document: "+err.Error())
-	// }
-	// didDoc, err := did.ParseDocument(parsedDoc.DID)
-	// if err != nil {
-	// 	logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "failed to parse DID Document: "+err.Error())
-	// }
-	// fmt.Println("DID:", didDoc.ID)
-
-
-	message := []byte(randomString)
-
-	cryptoService := o.ctx.Crypto()
-	// Sign a random string
-	logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "keypairKEYID "+o.currentKeyPair.KeyID)
-	signature, err := cryptoService.Sign(message, o.currentKeyPair.KeyID)
-	if err != nil {
-		logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "failed to sign message: "+err.Error())
-	}
-
-	fmt.Println("Signature:", signature)
-
-	// Verify the signature
-	valid := cryptoService.Verify(signature,message, o.currentKeyPair.PublicKey)
-	if valid == nil {
-		fmt.Println("Signature verification successful!")
-		logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "Signature verification successful!")
-	} else {
-		fmt.Println("Signature verification failed.")
-		logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "Signature verification failed.")
-	}
-	return randomString
-}
-
-func (o * Command) signJWT(token string)(string) {
-	randomString , err := generateRandomString(15)
-	if err != nil {
-		fmt.Println("Error generating random string:", err)
-		return ""
-	}
+func (o * Command) signJWT(token string) {
 
 	request := vcwalletc.SignJWTRequest{
         WalletAuth: vcwalletc.WalletAuth{UserID: o.walletuid, Auth: token},
@@ -425,23 +371,23 @@ func (o * Command) signJWT(token string)(string) {
 
 	reqData, err := json.Marshal(request)
     if err != nil {
-        logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "failed to marshal request: "+err.Error())
+        logutil.LogInfo(logger, CommandName, "SignJWT", "failed to marshal request: "+err.Error())
     }
     req := bytes.NewReader(reqData)
 	// Capture the output
     var signBuf bytes.Buffer
 
     // Sign the JWT
     if err := o.vcwalletcommand.SignJWT(&signBuf, req); err != nil {
-        logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "failed to sign JWT: "+err.Error())
+        logutil.LogInfo(logger, CommandName, "SignJWT", "failed to sign JWT: "+err.Error())
     }
 
 
 	var jwtResponse vcwalletc.SignJWTResponse
 
 	err = json.Unmarshal(signBuf.Bytes(), &jwtResponse)
 	if err != nil {
-		logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "failed to unmarshal JWT: "+err.Error())
+		logutil.LogInfo(logger, CommandName, "SignJWT", "failed to unmarshal JWT: "+err.Error())
 	}
 
 
@@ -463,11 +409,9 @@ func (o * Command) signJWT(token string)(string) {
 
     err = o.vcwalletcommand.VerifyJWT(&verifyBuf, verifyReqReader)
     if err != nil {
-        logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "failed to verify JWT: "+err.Error())
+        logutil.LogInfo(logger, CommandName, "SignJWT", "failed to verify JWT: "+err.Error())
     }
     fmt.Println("Verification result:", verifyBuf.String())
-
-	return randomString
 }
 
 // DoDeviceEnrolment Device completes an enrolment process against an issuer
@@ -928,3 +872,22 @@ func (o *Command) AcceptEnrolment(rw io.Writer, req io.Reader) command.Error {
 	logutil.LogInfo(logger, CommandName, AcceptEnrolmentCommandMethod, "success")
 	return nil
 }
+
+// GetTrustedIssuerList returns the list of trusted issuers, mocked for nowq
+func (o *Command) GetTrustedIssuerList(rw io.Writer, req io.Reader) command.Error {
+	//TODO UMU: Implement
+	trustedIssuer := TrustedIssuer{
+		DID : "did:fabric:zxdkpwDnu7ixBidF_I8sgMI6Q4St0t90HY-_JmlHZFI",
+		IssuerUrl : "https://issuer:9082",
+	}
+	var trustedIssuerList []TrustedIssuer
+	trustedIssuerList = append(trustedIssuerList, trustedIssuer)
+
+	var trustedIssuerListResponse = GetTrustedIssuerListResult{
+		TrustedIssuers: trustedIssuerList,
+
+	}
+
+	command.WriteNillableResponse(rw, &trustedIssuerListResponse, logger)
+	return nil
+}

pkg/controller/command/poc/models.go

@@ -138,3 +138,12 @@ type VerifyCredentialResult struct {
 
 	Error string `json:"error,omitempty"`
 }
+
+type GetTrustedIssuerListResult struct	{
+	TrustedIssuers []TrustedIssuer `json:"trustedIssuers,omitempty"`
+}
+
+type TrustedIssuer struct {
+	DID string `json:"did,omitempty"`
+	IssuerUrl string `json:"issuerUrl,omitempty"`
+}

pkg/controller/command/vdr/command.go

@@ -39,6 +39,9 @@ const (
 
 	// CreateDIDErrorCode for create did error.
 	CreateDIDErrorCode
+
+	//GetTrustedIssuerListCode
+	GetTrustedIssuerListCode
 )
 
 // constants for the VDR controller's methods.
@@ -52,6 +55,7 @@ const (
 	GetDIDCommandMethod     = "GetDID"
 	ResolveDIDCommandMethod = "ResolveDID"
 	CreateDIDCommandMethod  = "CreateDID"
+	GetTrustedIssuerList = "GetTrustedIssuerList"
 
 	// error messages.
 	errEmptyDIDName   = "name is mandatory"
@@ -96,6 +100,7 @@ func (o *Command) GetHandlers() []command.Handler {
 		cmdutil.NewCommandHandler(CommandName, GetDIDsCommandMethod, o.GetDIDRecords),
 		cmdutil.NewCommandHandler(CommandName, ResolveDIDCommandMethod, o.ResolveDID),
 		cmdutil.NewCommandHandler(CommandName, CreateDIDCommandMethod, o.CreateDID),
+		cmdutil.NewCommandHandler(CommandName, GetTrustedIssuerList, o.GetTrustedIssuerList),
 	}
 }
 
@@ -285,3 +290,8 @@ func (o *Command) GetDIDRecords(rw io.Writer, req io.Reader) command.Error {
 
 	return nil
 }
+
+// GetTrustedIssuerList retrieves the trusted issuer list.
+func (o *Command) GetTrustedIssuerList(rw io.Writer, req io.Reader) command.Error {
+	return nil
+}

pkg/controller/rest/poc/operation.go

@@ -26,6 +26,7 @@ const (
 	AcceptDeviceEnrolmentPath = PocOperationID + "/acceptEnrolment"
 	VerifyCredentialPath      = PocOperationID + "/verifyCredential"
 	TestingCallPath     	  = PocOperationID + "/testingCall"
+	GetTrustedIssuerListPath  = PocOperationID + "/trustedIssuers"
 )
 
 
@@ -66,6 +67,7 @@ func (o *Operation) registerHandler() {
 		cmdutil.NewHTTPHandler(AcceptDeviceEnrolmentPath, http.MethodPost, o.AcceptDeviceEnrolment),
 		cmdutil.NewHTTPHandler(VerifyCredentialPath, http.MethodPost, o.VerifyCredential),
 		cmdutil.NewHTTPHandler(TestingCallPath, http.MethodPost, o.TestingCall),
+		cmdutil.NewHTTPHandler(GetTrustedIssuerListPath, http.MethodGet, o.GetTrustedIssuerList),
 	}
 }
 
@@ -130,3 +132,14 @@ func (o *Operation) VerifyCredential(rw http.ResponseWriter, req *http.Request)
 func (o *Operation) TestingCall(rw http.ResponseWriter, req *http.Request) {
 	rest.Execute(o.command.TestingCall, rw, req.Body)
 }
+
+// GetTrustedIssuerList swagger:route GET /poc/trustedIssuers poc GetTrustedIssuerListReq
+//
+// Get the list of trusted issuers
+//
+// Responses:
+//    default: genericError
+//        200: documentRes
+func (o *Operation) GetTrustedIssuerList(rw http.ResponseWriter, req *http.Request) {
+	rest.Execute(o.command.GetTrustedIssuerList, rw, req.Body)
+}

pkg/doc/ldcontext/embed/third_party/umu/poc.jsonld

@@ -13,6 +13,8 @@
       "phone": "ex:phone",
       "holderRole": "ex:holderRole",
       "fluidosRole": "ex:fluidosRole",
+      "association": "ex:association",
+      "deviceType": "ex:deviceType",
       "fluidosID": "ex:fluidosID",
       "holderAddress": "ex:holderAddress",
       "holderEmail": "ex:holderEmail",  

runscript.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+export PROJECT_ROOT=github.com/hyperledger/aries-framework-go
+
+# Stop demo agent rest containers
+echo "Stopping demo agent rest containers ..."
+DEMO_COMPOSE_PATH=test/bdd/fixtures/demo/openapi SIDETREE_COMPOSE_PATH=test/bdd/fixtures/sidetree-mock AGENT_REST_COMPOSE_PATH=test/bdd/fixtures/agent-rest
+
+# Generate test keys
+mkdir -p -p test/bdd/fixtures/keys/tls
+docker run -i --rm \
+  -v $(pwd):/opt/go/src/$(PROJECT_ROOT) \
+  --entrypoint "/opt/go/src/$(PROJECT_ROOT)/scripts/generate_test_keys.sh" \
+  frapsoft/openssl
+
+# Generate dpabc clib
+docker build -f ./images/agent-rest/Dockerfile_base_image_with_compilation_tools \
+  --build-arg ALPINE_VER=$(ALPINE_VER) \
+  -t basecompilationcontainer .
+docker run -v $(pwd):/opt/go/src/$(PROJECT_ROOT)
+docker image rm basecompilationcontainer
+
+# Run Fabric
+echo "Launching Fabric deployment."
+FABRIC_PATH="$(FABRIC_PATH)" \
+FABRIC_VERSION="$(FABRIC_VERSION)" \
+CONNECTION_PROFILE_PATH="$(CONNECTION_PROFILE_PATH)" \
+./scripts/fabric/run_fabric.sh
+
+# Generate OpenAPI demo specs
+echo "Generate demo agent rest controller API specifications using Open API"
+SPEC_PATH=${OPENAPI_SPEC_PATH} OPENAPI_DEMO_PATH=test/bdd/fixtures/demo/openapi
+
+# Run OpenAPI demo script
+./scripts/run-openapi-demo.sh