tmp

Author: thiagoromanos

aries_cloudagent/protocols/revocation_notification/v1_0/models/rev_notification_record.py

@@ -47,6 +47,7 @@ def __init__(
         comment: str = None,
         version: str = None,
         unrevoke: Optional[bool] = None,
+        revocation_format: str = None,
         **kwargs,
     ):
         """Construct record."""
@@ -58,6 +59,7 @@ def __init__(
         self.comment = comment
         self.version = version
         self.unrevoke = unrevoke
+        self.revocation_format = revocation_format
 
     @property
     def revocation_notification_id(self) -> Optional[str]:

aries_cloudagent/protocols/revocation_notification/v2_0/handlers/revoke_handler.py

@@ -1,12 +1,10 @@
 """Handler for revoke message."""
 
-from aries_cloudagent.protocols.didcomm_prefix import DIDCommPrefix
-
 from .....messaging.base_handler import BaseHandler
 from .....messaging.request_context import RequestContext
 from .....messaging.responder import BaseResponder
+
 from ..messages.revoke import Revoke
-from ..messages.unrevoke import Unrevoke
 
 
 class RevokeHandler(BaseHandler):
@@ -17,22 +15,18 @@ class RevokeHandler(BaseHandler):
 
     async def handle(self, context: RequestContext, responder: BaseResponder):
         """Handle revoke message."""
-        assert isinstance(context.message, (Revoke, Unrevoke))
+        assert isinstance(context.message, Revoke)
         self._logger.debug(
             "Received notification of revocation for %s cred %s with comment: %s",
             context.message.revocation_format,
             context.message.credential_id,
             context.message.comment,
         )
-
-        message_type = f"{DIDCommPrefix.NEW}/{context.message.Meta.message_type}"
-
         # Emit a webhook
         if context.settings.get("revocation.monitor_notification"):
             await context.profile.notify(
                 self.WEBHOOK_TOPIC,
                 {
-                    "@type": message_type,
                     "revocation_format": context.message.revocation_format,
                     "credential_id": context.message.credential_id,
                     "comment": context.message.comment,
@@ -43,7 +37,6 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
         await context.profile.notify(
             self.RECEIVED_TOPIC,
             {
-                "@type": message_type,
                 "revocation_format": context.message.revocation_format,
                 "credential_id": context.message.credential_id,
                 "comment": context.message.comment,

aries_cloudagent/protocols/revocation_notification/v2_0/message_types.py

@@ -2,6 +2,7 @@
 
 from ...didcomm_prefix import DIDCommPrefix
 
+
 SPEC_URI = (
     "https://github.com/hyperledger/aries-rfcs/blob/main/features/"
     "0721-revocation-notification-v2/README.md"
@@ -12,12 +13,8 @@
 
 # Message types
 REVOKE = f"{BASE}/revoke"
-UNREVOKE = f"{BASE}/unrevoke"
 
 PROTOCOL_PACKAGE = "aries_cloudagent.protocols.revocation_notification.v2_0"
 MESSAGE_TYPES = DIDCommPrefix.qualify_all(
-    {
-        REVOKE: f"{PROTOCOL_PACKAGE}.messages.revoke.Revoke",
-        UNREVOKE: f"{PROTOCOL_PACKAGE}.messages.unrevoke.Unrevoke",
-    }
+    {REVOKE: f"{PROTOCOL_PACKAGE}.messages.revoke.Revoke"}
 )

aries_cloudagent/protocols/revocation_notification/v2_0/models/rev_notification_record.py

@@ -5,10 +5,6 @@
 from marshmallow import fields
 from marshmallow.utils import EXCLUDE
 
-from aries_cloudagent.protocols.revocation_notification.v2_0.messages.unrevoke import (
-    Unrevoke,
-)
-
 from .....core.profile import ProfileSession
 from .....messaging.models.base_record import BaseRecord, BaseRecordSchema
 from .....messaging.valid import (
@@ -50,7 +46,7 @@ def __init__(
         thread_id: str = None,
         comment: str = None,
         version: str = None,
-        unrevoke: bool = None,
+        revocation_format: str = "indy-anoncreds",
         **kwargs,
     ):
         """Construct record."""
@@ -61,7 +57,7 @@ def __init__(
         self.thread_id = thread_id
         self.comment = comment
         self.version = version
-        self.unrevoke = unrevoke
+        self.revocation_format = revocation_format
 
     @property
     def revocation_notification_id(self) -> Optional[str]:
@@ -71,9 +67,7 @@ def revocation_notification_id(self) -> Optional[str]:
     @property
     def record_value(self) -> dict:
         """Return record value."""
-        return {
-            prop: getattr(self, prop) for prop in ("thread_id", "comment", "unrevoke")
-        }
+        return {prop: getattr(self, prop) for prop in ("thread_id", "comment")}
 
     @classmethod
     async def query_by_ids(
@@ -132,18 +126,11 @@ def to_message(self):
                 "No thread ID set on revocation notification record, "
                 "cannot create message"
             )
-        if self.unrevoke:
-            return Unrevoke(
-                revocation_format="indy-anoncreds",
-                credential_id=f"{self.rev_reg_id}::{self.cred_rev_id}",
-                comment=self.comment,
-            )
-        else:
-            return Revoke(
-                revocation_format="indy-anoncreds",
-                credential_id=f"{self.rev_reg_id}::{self.cred_rev_id}",
-                comment=self.comment,
-            )
+        return Revoke(
+            revocation_format=self.revocation_format,
+            credential_id=f"{self.rev_reg_id}::{self.cred_rev_id}",
+            comment=self.comment,
+        )
 
 
 class RevNotificationRecordSchema(BaseRecordSchema):
@@ -201,7 +188,3 @@ class Meta:
         required=False,
         metadata={"description": "Version of Revocation Notification to send out"},
     )
-    unrevoke = fields.Bool(
-        required=False,
-        metadata={"description": "If it is Unrevoked"},
-    )

aries_cloudagent/protocols/revocation_notification/v2_1/__init__.py

@@ -0,0 +1,51 @@
+"""Handler for revoke message."""
+
+from aries_cloudagent.protocols.didcomm_prefix import DIDCommPrefix
+
+from .....messaging.base_handler import BaseHandler
+from .....messaging.request_context import RequestContext
+from .....messaging.responder import BaseResponder
+from ..messages.revoke import Revoke
+from ..messages.unrevoke import Unrevoke
+
+
+class RevokeHandler(BaseHandler):
+    """Handler for revoke message."""
+
+    RECEIVED_TOPIC = "acapy::revocation-notification-v2::received"
+    WEBHOOK_TOPIC = "acapy::webhook::revocation-notification-v2"
+
+    async def handle(self, context: RequestContext, responder: BaseResponder):
+        """Handle revoke message."""
+        assert isinstance(context.message, (Revoke, Unrevoke))
+        self._logger.debug(
+            "Received notification of revocation for %s cred %s with comment: %s",
+            context.message.revocation_format,
+            context.message.credential_id,
+            context.message.comment,
+        )
+
+        message_type = f"{DIDCommPrefix.NEW}/{context.message.Meta.message_type}"
+
+        # Emit a webhook
+        if context.settings.get("revocation.monitor_notification"):
+            await context.profile.notify(
+                self.WEBHOOK_TOPIC,
+                {
+                    "@type": message_type,
+                    "revocation_format": context.message.revocation_format,
+                    "credential_id": context.message.credential_id,
+                    "comment": context.message.comment,
+                },
+            )
+
+        # Emit an event
+        await context.profile.notify(
+            self.RECEIVED_TOPIC,
+            {
+                "@type": message_type,
+                "revocation_format": context.message.revocation_format,
+                "credential_id": context.message.credential_id,
+                "comment": context.message.comment,
+            },
+        )

aries_cloudagent/protocols/revocation_notification/v2_1/handlers/__init__.py

@@ -0,0 +1,74 @@
+"""Test RevokeHandler."""
+
+import pytest
+
+from ......core.event_bus import EventBus, MockEventBus
+from ......core.in_memory import InMemoryProfile
+from ......core.profile import Profile
+from ......messaging.request_context import RequestContext
+from ......messaging.responder import MockResponder, BaseResponder
+from ...messages.revoke import Revoke
+from ..revoke_handler import RevokeHandler
+
+
+@pytest.fixture
+def event_bus():
+    yield MockEventBus()
+
+
+@pytest.fixture
+def responder():
+    yield MockResponder()
+
+
+@pytest.fixture
+def profile(event_bus):
+    yield InMemoryProfile.test_profile(bind={EventBus: event_bus})
+
+
+@pytest.fixture
+def message():
+    yield Revoke(
+        revocation_format="indy-anoncreds",
+        credential_id="mock_cred_revocation_id",
+        comment="mock_comment",
+    )
+
+
+@pytest.fixture
+def context(profile: Profile, message: Revoke):
+    request_context = RequestContext(profile)
+    request_context.message = message
+    yield request_context
+
+
+@pytest.mark.asyncio
+async def test_handle(
+    context: RequestContext, responder: BaseResponder, event_bus: MockEventBus
+):
+    await RevokeHandler().handle(context, responder)
+    assert event_bus.events
+    [(_, received)] = event_bus.events
+    assert received.topic == RevokeHandler.RECEIVED_TOPIC
+    assert "revocation_format" in received.payload
+    assert "credential_id" in received.payload
+    assert "comment" in received.payload
+
+
+@pytest.mark.asyncio
+async def test_handle_monitor(
+    context: RequestContext, responder: BaseResponder, event_bus: MockEventBus
+):
+    context.settings["revocation.monitor_notification"] = True
+    await RevokeHandler().handle(context, responder)
+    [(_, webhook), (_, received)] = event_bus.events
+
+    assert webhook.topic == RevokeHandler.WEBHOOK_TOPIC
+    assert "revocation_format" in received.payload
+    assert "credential_id" in received.payload
+    assert "comment" in webhook.payload
+
+    assert received.topic == RevokeHandler.RECEIVED_TOPIC
+    assert "revocation_format" in received.payload
+    assert "credential_id" in received.payload
+    assert "comment" in received.payload

aries_cloudagent/protocols/revocation_notification/v2_1/handlers/revoke_handler.py

@@ -0,0 +1,23 @@
+"""Message type identifiers for Revocation Notification protocol."""
+
+from ...didcomm_prefix import DIDCommPrefix
+
+SPEC_URI = (
+    "https://github.com/hyperledger/aries-rfcs/blob/main/features/"
+    "0721-revocation-notification-v2/README.md"
+)
+PROTOCOL = "revocation_notification"
+VERSION = "2.0"
+BASE = f"{PROTOCOL}/{VERSION}"
+
+# Message types
+REVOKE = f"{BASE}/revoke"
+UNREVOKE = f"{BASE}/unrevoke"
+
+PROTOCOL_PACKAGE = "aries_cloudagent.protocols.revocation_notification.v2_0"
+MESSAGE_TYPES = DIDCommPrefix.qualify_all(
+    {
+        REVOKE: f"{PROTOCOL_PACKAGE}.messages.revoke.Revoke",
+        UNREVOKE: f"{PROTOCOL_PACKAGE}.messages.unrevoke.Unrevoke",
+    }
+)