fix(prism-agent): infinite loop in proof presentation execution (#540)

* feat(prism-agent): add unique constraint to 'presentation_records.thid' * feat(prism-agent): handle DIDComm error responses appropriately and decrease retry counter * chore(prism-agent): run scalafmt
hyperledger-identus · May 31, 2023 · 6a26bb7 · 6a26bb7
1 parent 6129baf
commit 6a26bb7
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 18 deletions.
diff --git a/...ie/src/main/resources/sql/pollux/V10__presentation_records_add_thid_unique_constraint.sql b/...ie/src/main/resources/sql/pollux/V10__presentation_records_add_thid_unique_constraint.sql
@@ -0,0 +1 @@
+ALTER TABLE public.presentation_records ADD CONSTRAINT presentation_records_unique_thid UNIQUE (thid);
diff --git a/...nt/service/server/src/main/scala/io/iohk/atala/agent/server/http/model/InvalidState.scala b/...nt/service/server/src/main/scala/io/iohk/atala/agent/server/http/model/InvalidState.scala
diff --git a/...nt/service/server/src/main/scala/io/iohk/atala/agent/server/jobs/BackgroundJobError.scala b/...nt/service/server/src/main/scala/io/iohk/atala/agent/server/jobs/BackgroundJobError.scala
@@ -0,0 +1,13 @@
+package io.iohk.atala.agent.server.jobs
+
+import io.iohk.atala.mercury.HttpResponse
+
+sealed trait BackgroundJobError
+
+object BackgroundJobError {
+  final case class InvalidState(cause: String) extends BackgroundJobError
+  case object NotImplemented extends BackgroundJobError
+  final case class ErrorResponseReceivedFromPeerAgent(response: HttpResponse) extends BackgroundJobError {
+    override def toString: String = s"DIDComm sending error: [${response.status}] - ${response.bodyAsString}"
+  }
+}
diff --git a/...-agent/service/server/src/main/scala/io/iohk/atala/agent/server/jobs/BackgroundJobs.scala b/...-agent/service/server/src/main/scala/io/iohk/atala/agent/server/jobs/BackgroundJobs.scala
@@ -6,7 +6,11 @@ import io.circe.Json
 import io.circe.parser.*
 import io.circe.syntax.*
 import io.iohk.atala.agent.server.config.AppConfig
-import io.iohk.atala.agent.server.http.model.{InvalidState, NotImplemented}
+import io.iohk.atala.agent.server.jobs.BackgroundJobError.{
+  ErrorResponseReceivedFromPeerAgent,
+  InvalidState,
+  NotImplemented
+}
 import io.iohk.atala.agent.walletapi.model.*
 import io.iohk.atala.agent.walletapi.model.error.*
 import io.iohk.atala.agent.walletapi.model.error.DIDSecretStorageError.KeyNotFoundError
@@ -131,7 +135,7 @@ object BackgroundJobs {
             credentialService <- ZIO.service[CredentialService]
             _ <- {
               if (resp.status >= 200 && resp.status < 300) credentialService.markOfferSent(id)
-              else ZIO.logWarning(s"DIDComm sending error: [${resp.status}] - ${resp.bodyAsString}")
+              else ZIO.fail(ErrorResponseReceivedFromPeerAgent(resp))
             }
           } yield ()
 
@@ -201,7 +205,7 @@ object BackgroundJobs {
             credentialService <- ZIO.service[CredentialService]
             _ <- {
               if (resp.status >= 200 && resp.status < 300) credentialService.markRequestSent(id)
-              else ZIO.logWarning(s"DIDComm sending error: [${resp.status}] - ${resp.bodyAsString}")
+              else ZIO.fail(ErrorResponseReceivedFromPeerAgent(resp))
             }
           } yield ()
 
@@ -310,7 +314,7 @@ object BackgroundJobs {
             credentialService <- ZIO.service[CredentialService]
             _ <- {
               if (resp.status >= 200 && resp.status < 300) credentialService.markCredentialSent(id)
-              else ZIO.logWarning(s"DIDComm sending error: [${resp.status}] - ${resp.bodyAsString}")
+              else ZIO.fail(ErrorResponseReceivedFromPeerAgent(resp))
             }
           } yield ()
 
@@ -343,7 +347,7 @@ object BackgroundJobs {
             credentialService <- ZIO.service[CredentialService]
             _ <- {
               if (resp.status >= 200 && resp.status < 300) credentialService.markCredentialSent(id)
-              else ZIO.logWarning(s"DIDComm sending error: [${resp.status}] - ${resp.bodyAsString}")
+              else ZIO.fail(ErrorResponseReceivedFromPeerAgent(resp))
             }
           } yield ()
 
@@ -489,7 +493,7 @@ object BackgroundJobs {
                 service <- ZIO.service[PresentationService]
                 _ <- {
                   if (resp.status >= 200 && resp.status < 300) service.markRequestPresentationSent(id)
-                  else ZIO.logWarning(s"DIDComm sending error: [${resp.status}] - ${resp.bodyAsString}")
+                  else ZIO.fail(ErrorResponseReceivedFromPeerAgent(resp))
                 }
               } yield ()
 
@@ -575,7 +579,7 @@ object BackgroundJobs {
                 service <- ZIO.service[PresentationService]
                 _ <- {
                   if (resp.status >= 200 && resp.status < 300) service.markPresentationSent(id)
-                  else ZIO.logWarning(s"DIDComm sending error: [${resp.status}] - ${resp.bodyAsString}")
+                  else ZIO.fail(ErrorResponseReceivedFromPeerAgent(resp))
                 }
               } yield ()
         case PresentationRecord(id, _, _, _, _, _, _, _, PresentationSent, _, _, _, _, _, _, _) =>

diff --git a/...service/server/src/main/scala/io/iohk/atala/agent/server/jobs/ConnectBackgroundJobs.scala b/...service/server/src/main/scala/io/iohk/atala/agent/server/jobs/ConnectBackgroundJobs.scala
@@ -2,6 +2,7 @@ package io.iohk.atala.agent.server.jobs
 
 import com.nimbusds.jose.jwk.OctetKeyPair
 import io.iohk.atala.agent.server.config.AppConfig
+import io.iohk.atala.agent.server.jobs.BackgroundJobError.ErrorResponseReceivedFromPeerAgent
 import io.iohk.atala.agent.walletapi.model.error.DIDSecretStorageError
 import io.iohk.atala.agent.walletapi.model.error.DIDSecretStorageError.KeyNotFoundError
 import io.iohk.atala.agent.walletapi.service.ManagedDIDService
@@ -65,7 +66,7 @@ object ConnectBackgroundJobs {
           connectionService <- ZIO.service[ConnectionService]
           _ <- {
             if (resp.status >= 200 && resp.status < 300) connectionService.markConnectionRequestSent(id)
-            else ZIO.logWarning(s"DIDComm sending error: [${resp.status}] - ${resp.bodyAsString}")
+            else ZIO.fail(ErrorResponseReceivedFromPeerAgent(resp))
           }
         } yield ()
 
@@ -93,14 +94,10 @@ object ConnectBackgroundJobs {
           connectionService <- ZIO.service[ConnectionService]
           _ <- {
             if (resp.status >= 200 && resp.status < 300) connectionService.markConnectionResponseSent(id)
-            else ZIO.logWarning(s"DIDComm sending error: [${resp.status}] - ${resp.bodyAsString}")
+            else ZIO.fail(ErrorResponseReceivedFromPeerAgent(resp))
           }
         } yield ()
-      case e
-          if (e.protocolState == ConnectionRequestPending || e.protocolState == ConnectionResponsePending) && e.metaRetries == 0 =>
-        ZIO.logWarning( // TODO use logDebug
-          s"ConnectionRecord '${e.id}' has '${e.metaRetries}' retries and will NOT be processed"
-        )
+
       case _ => ZIO.unit
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE public.presentation_records ADD CONSTRAINT presentation_records_unique_thid UNIQUE (thid);