Skip to content

Commit

Permalink
feat(prismagent): prism did creation and use updated protocol state (#…
Browse files Browse the repository at this point in the history 
…291)
  • Loading branch information
@mineme0110
mineme0110 authored Jan 6, 2023
1 parent dd83190 commit cc7c533
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 52 deletions.
4 changes: 2 additions & 2 deletions prism-agent/service/project/Dependencies.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ object Dependencies {
val akka = "2.6.20"
val akkaHttp = "10.2.9"
val castor = "0.5.1"
val pollux = "0.14.0"
val pollux = "0.15.0"
val connect = "0.6.0"
val bouncyCastle = "1.70"
val logback = "1.4.5"
Expand Down Expand Up @@ -104,7 +104,7 @@ object Dependencies {
lazy val keyManagementDependencies: Seq[ModuleID] =
baseDependencies ++
castorDependencies ++
mercuryDependencies ++
mercuryDependencies ++
bouncyDependencies

lazy val serverDependencies: Seq[ModuleID] =
Expand Down
6 changes: 4 additions & 2 deletions prism-agent/service/server/src/main/scala/io/iohk/atala/agent/server/Modules.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,10 @@ object Modules {
.repeat(Schedule.spaced(10.seconds))
.unit

val presentProofExchangeJob
: RIO[DIDResolver & JwtDidResolver & HttpClient & PresentationService & ManagedDIDService, Unit] =
val presentProofExchangeJob: RIO[
DIDResolver & JwtDidResolver & HttpClient & PresentationService & ManagedDIDService & DIDSecretStorage,
Unit
] =
BackgroundJobs.presentProofExchanges
.repeat(Schedule.spaced(10.seconds))
.unit
Expand Down
25 changes: 1 addition & 24 deletions ...r/src/main/scala/io/iohk/atala/agent/server/http/service/PresentProofApiServiceImpl.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,34 +120,11 @@ class PresentProofApiServiceImpl(
val result = requestPresentationAction.action match {

case "request-accept" =>
// TODO IMPORTANT: ATL-2702
// this function is used as a temporary replacement
// eventually, prism-agent should use castor library to get the issuer (issuance key and did)
def createHolder: Issuer = {
import java.security.KeyPairGenerator
import java.security.spec.ECGenParameterSpec
import java.security.KeyPairGenerator
import java.security.SecureRandom
val keyGen = KeyPairGenerator.getInstance("EC")
val ecSpec = ECGenParameterSpec("secp256r1")
keyGen.initialize(ecSpec, SecureRandom())
val keyPair = keyGen.generateKeyPair()
val privateKey = keyPair.getPrivate
val publicKey = keyPair.getPublic
val uuid = UUID.randomUUID().toString
Issuer(
did = io.iohk.atala.pollux.vc.jwt.DID(s"did:prism:$uuid"),
signer = io.iohk.atala.pollux.vc.jwt.ES256Signer(privateKey),
publicKey = publicKey
)
}

for {
record <- presentationService
.acceptRequestPresentation(
recordId = UUID.fromString(id),
crecentialsToUse = requestPresentationAction.proofId.getOrElse(Seq.empty),
prover = createHolder
crecentialsToUse = requestPresentationAction.proofId.getOrElse(Seq.empty)
)
.mapError(HttpServiceError.DomainError[PresentationError].apply)
} yield record
Expand Down
116 changes: 92 additions & 24 deletions ...-agent/service/server/src/main/scala/io/iohk/atala/agent/server/jobs/BackgroundJobs.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import io.iohk.atala.mercury.HttpClient
import io.iohk.atala.mercury.model._
import io.iohk.atala.mercury.model.error._
import io.iohk.atala.mercury.protocol.issuecredential._
import io.iohk.atala.mercury.protocol.presentproof.RequestPresentation
import io.iohk.atala.mercury.protocol.presentproof._
import io.iohk.atala.resolvers.DIDResolver
import io.iohk.atala.resolvers.UniversalDidResolver
import java.io.IOException
Expand Down Expand Up @@ -73,7 +73,7 @@ object BackgroundJobs {
presentationService <- ZIO.service[PresentationService]
records <- presentationService
.getPresentationRecords()
.mapError(err => Throwable(s"Error occured while getting issue credential records: $err"))
.mapError(err => Throwable(s"Error occured while getting Presentation records: $err"))
_ <- ZIO.foreach(records)(performPresentation)
} yield ()
}
Expand Down Expand Up @@ -127,7 +127,24 @@ object BackgroundJobs {
} yield ()

// 'automaticIssuance' is TRUE. Issuer automatically accepts the Request
case IssueCredentialRecord(id, _, _, _, _, Role.Issuer, _, _, Some(true), _, RequestReceived, _, _, _, _, _) =>
case IssueCredentialRecord(
id,
_,
_,
_,
_,
Role.Issuer,
_,
_,
Some(true),
_,
RequestReceived,
_,
_,
_,
_,
_,
) =>
for {
credentialService <- ZIO.service[CredentialService]
_ <- credentialService.acceptCredentialRequest(id)
Expand Down Expand Up @@ -297,7 +314,10 @@ object BackgroundJobs {

private[this] def performPresentation(
record: PresentationRecord
): URIO[DIDResolver & JwtDidResolver & HttpClient & PresentationService & ManagedDIDService, Unit] = {
): URIO[
DIDResolver & JwtDidResolver & HttpClient & PresentationService & ManagedDIDService & DIDSecretStorage,
Unit
] = {
import io.iohk.atala.pollux.core.model.PresentationRecord.ProtocolState._

val aux = for {
Expand All @@ -306,12 +326,12 @@ object BackgroundJobs {
// ##########################
// ### PresentationRecord ###
// ##########################
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalPending, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalSent, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalReceived, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalRejected, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalPending, _, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalSent, _, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalReceived, _, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProposalRejected, _, _, _, _) => ZIO.fail(NotImplemented)

case PresentationRecord(id, _, _, _, _, _, _, _, RequestPending, oRecord, _, _) => // Verifier
case PresentationRecord(id, _, _, _, _, _, _, _, RequestPending, oRecord, _, _, _) => // Verifier
oRecord match
case None => ZIO.fail(InvalidState("PresentationRecord 'RequestPending' with no Record"))
case Some(record) =>
Expand All @@ -323,29 +343,77 @@ object BackgroundJobs {
_ <- service.markRequestPresentationSent(id)
} yield ()

case PresentationRecord(id, _, _, _, _, _, _, _, RequestSent, _, _, _) => // Verifier
case PresentationRecord(id, _, _, _, _, _, _, _, RequestSent, _, _, _, _) => // Verifier
ZIO.logDebug("PresentationRecord: RequestSent") *> ZIO.unit
case PresentationRecord(id, _, _, _, _, _, _, _, RequestReceived, _, _, _) => // Prover
case PresentationRecord(id, _, _, _, _, _, _, _, RequestReceived, _, _, _, _) => // Prover
ZIO.logDebug("PresentationRecord: RequestReceived") *> ZIO.unit
case PresentationRecord(id, _, _, _, _, _, _, _, RequestRejected, _, _, _) => // Prover
case PresentationRecord(id, _, _, _, _, _, _, _, RequestRejected, _, _, _, _) => // Prover
ZIO.logDebug("PresentationRecord: RequestRejected") *> ZIO.unit
case PresentationRecord(id, _, _, _, _, _, _, _, ProblemReportPending, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProblemReportSent, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProblemReportReceived, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationPending, _, _, presentation) => // Prover
case PresentationRecord(id, _, _, _, _, _, _, _, ProblemReportPending, _, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProblemReportSent, _, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(id, _, _, _, _, _, _, _, ProblemReportReceived, _, _, _, _) => ZIO.fail(NotImplemented)
case PresentationRecord(
id,
_,
_,
_,
_,
_,
_,
_,
PresentationPending,
oRequestPresentation,
_,
_,
credentialsToUse
) => // Prover
for {

presentationService <- ZIO.service[PresentationService]
prover <- createPrismDIDIssuer()
w3cPresentationPayload <- presentationService.createPresentationPayloadFromRecord(
id,
prover,
Instant.now()
)
signedJwtPresentation = JwtPresentation.toEncodedJwt(w3cPresentationPayload, prover)
presentation <- oRequestPresentation match
case None => ZIO.fail(InvalidState("PresentationRecord 'RequestPending' with no Record"))
case Some(requestPresentation) => { // TODO create build in mercury for Presentation
ZIO.succeed(
Presentation(
body = Presentation.Body(
goal_code = requestPresentation.body.goal_code,
comment = requestPresentation.body.comment
),
attachments = Seq(
AttachmentDescriptor
.buildAttachment(payload = signedJwtPresentation.value, mediaType = Some("prism/jwt"))
),
thid = requestPresentation.thid.orElse(Some(requestPresentation.id)),
from = requestPresentation.to,
to = requestPresentation.from
)
)
}
_ <- presentationService.markPresentationGenerated(id, presentation)

} yield ()
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationGenerated, _, _, presentation, _) =>
ZIO.logDebug("PresentationRecord: PresentationGenerated") *> ZIO.unit
presentation match
case None => ZIO.fail(InvalidState("PresentationRecord in 'PresentationPending' with no Presentation"))
case Some(p) =>
for {
_ <- ZIO.log(s"PresentationRecord: PresentationPending (Send Massage)")
_ <- ZIO.log(s"PresentationRecord: PresentationPending (Send Message)")
didCommAgent <- buildDIDCommAgent(p.from)
_ <- MessagingService.send(p.makeMessage).provideSomeLayer(didCommAgent)
service <- ZIO.service[PresentationService]
_ <- service.markPresentationSent(id)
} yield ()
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationSent, _, _, _) =>
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationSent, _, _, _, _) =>
ZIO.logDebug("PresentationRecord: PresentationSent") *> ZIO.unit
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationReceived, _, _, presentation) => // Verifier
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationReceived, _, _, presentation, _) => // Verifier
ZIO.logDebug("PresentationRecord: PresentationReceived") *> ZIO.unit
val clock = java.time.Clock.system(ZoneId.systemDefault)
presentation match
Expand All @@ -363,8 +431,8 @@ object BackgroundJobs {
JWT(base64Decoded),
JwtPresentation.PresentationVerificationOptions(
maybeProofPurpose = Some(VerificationRelationship.Authentication),
verifySignature = false,
verifyDates = true,
verifySignature = true,
verifyDates = false,
leeway = Duration.Zero,
maybeCredentialOptions = Some(
CredentialVerification.CredentialVerificationOptions(
Expand All @@ -383,11 +451,11 @@ object BackgroundJobs {
_ <- service.markPresentationVerified(id)
} yield ()
// TODO move the state to PresentationVerified
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationVerified, _, _, _) =>
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationVerified, _, _, _, _) =>
ZIO.logDebug("PresentationRecord: PresentationVerified") *> ZIO.unit
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationAccepted, _, _, _) =>
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationAccepted, _, _, _, _) =>
ZIO.logDebug("PresentationRecord: PresentationVerifiedAccepted") *> ZIO.unit
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationRejected, _, _, _) =>
case PresentationRecord(id, _, _, _, _, _, _, _, PresentationRejected, _, _, _, _) =>
ZIO.logDebug("PresentationRecord: PresentationRejected") *> ZIO.unit
}
} yield ()
Expand Down

0 comments on commit cc7c533

Please sign in to comment.