Merge branch 'hyperledger:main' into feature/create-all-registered-dids

Author: chumbert

.github/workflows/blackformat.yml

@@ -10,7 +10,9 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
       - name: Black Code Formatter Check
         uses: psf/black@stable

.github/workflows/codeql.yml

@@ -12,15 +12,18 @@ jobs:
     runs-on: ubuntu-latest
     if: (github.event_name == 'pull_request' && github.repository == 'hyperledger/aries-cloudagent-python') || (github.event_name != 'pull_request')
 
+    permissions:
+      security-events: write
+
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/integrationtests.yml

@@ -13,7 +13,7 @@ jobs:
     if: (github.event_name == 'pull_request' && github.repository == 'hyperledger/aries-cloudagent-python') || (github.event_name != 'pull_request')
     steps:
       - name: checkout-acapy
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: acapy
       #- name: run-von-network

.github/workflows/pythonpublish.yml

@@ -8,19 +8,19 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python
-      uses: actions/setup-python@v1
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.x"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install setuptools wheel twine
+      - name: Build and publish
+        env:
+          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        run: |
+          python setup.py sdist bdist_wheel
+          twine upload dist/*

.github/workflows/tests-indy.yml

@@ -29,7 +29,7 @@ jobs:
             ${{ runner.os }}-buildx-test-
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build test image
         uses: docker/build-push-action@v3

Mediation.md

@@ -15,6 +15,7 @@
 
 * `--open-mediation` - Instructs mediators to automatically grant all incoming mediation requests.
 * `--mediator-invitation` - Receive invitation, send mediation request and set as default mediator.
+* `--mediator-connections-invite` - Connect to mediator through a connection invitation. If not specified, connect using an OOB invitation.
 * `--default-mediator-id` - Set pre-existing mediator as default mediator.
 * `--clear-default-mediator` - Clear the stored default mediator.
 
@@ -72,4 +73,4 @@ See [Aries RFC 0211: Coordinate Mediation Protocol](https://github.com/hyperledg
 ## Using a Mediator
 
 After establishing a connection with a mediator also having mediation granted, you can use that mediator id for future did_comm connections.
- When creating, receiving or accepting a invitation intended to be Mediated, you provide `mediation_id` with the desired mediator id. if using a single mediator for all future connections, You can set a default mediation id. If no mediation_id is provided the default mediation id will be used instead.
+ When creating, receiving or accepting a invitation intended to be Mediated, you provide `mediation_id` with the desired mediator id. if using a single mediator for all future connections, You can set a default mediation id. If no mediation_id is provided the default mediation id will be used instead.

aries_cloudagent/connections/base_manager.py

@@ -269,16 +269,18 @@ async def resolve_invitation(
 
         endpoint = first_didcomm_service.service_endpoint
         recipient_keys: List[VerificationMethod] = [
-            doc.dereference(url) for url in first_didcomm_service.recipient_keys
+            await resolver.dereference(self._profile, url, document=doc)
+            for url in first_didcomm_service.recipient_keys
         ]
         routing_keys: List[VerificationMethod] = [
-            doc.dereference(url) for url in first_didcomm_service.routing_keys
+            await resolver.dereference(self._profile, url, document=doc)
+            for url in first_didcomm_service.routing_keys
         ]
 
         for key in [*recipient_keys, *routing_keys]:
             if not isinstance(key, self.SUPPORTED_KEY_TYPES):
                 raise BaseConnectionManagerError(
-                    f"Key type {key.type} is not supported"
+                    f"Key type {type(key).__name__} is not supported"
                 )
 
         return (

aries_cloudagent/messaging/jsonld/routes.py

@@ -5,7 +5,6 @@
 from marshmallow import INCLUDE, Schema, fields
 from pydid.verification_method import (
     Ed25519VerificationKey2018,
-    KnownVerificationMethods,
 )
 
 from ...admin.request_context import AdminRequestContext
@@ -148,7 +147,6 @@ async def verify(request: web.BaseRequest):
                 vmethod = await resolver.dereference(
                     profile,
                     doc["proof"]["verificationMethod"],
-                    cls=KnownVerificationMethods,
                 )
 
                 if not isinstance(vmethod, SUPPORTED_VERIFICATION_METHOD_TYPES):

aries_cloudagent/messaging/jsonld/tests/test_routes.py

@@ -234,22 +234,22 @@ async def test_verify_bad_ver_meth_deref_req_error(
     assert "error" in mock_response.call_args[0][0]
 
 
-@pytest.mark.asyncio
-async def test_verify_bad_ver_meth_not_ver_meth(
-    mock_resolver, mock_verify_request, mock_response, request_body
-):
-    request_body["doc"]["proof"][
-        "verificationMethod"
-    ] = "did:example:1234abcd#did-communication"
-    await test_module.verify(mock_verify_request(request_body))
-    assert "error" in mock_response.call_args[0][0]
-
-
+@pytest.mark.parametrize(
+    "vmethod",
+    [
+        "did:example:1234abcd#key-2",
+        "did:example:1234abcd#did-communication",
+    ],
+)
 @pytest.mark.asyncio
 async def test_verify_bad_vmethod_unsupported(
-    mock_resolver, mock_verify_request, mock_response, request_body
+    mock_resolver,
+    mock_verify_request,
+    mock_response,
+    request_body,
+    vmethod,
 ):
-    request_body["doc"]["proof"]["verificationMethod"] = "did:example:1234abcd#key-2"
+    request_body["doc"]["proof"]["verificationMethod"] = vmethod
     with pytest.raises(web.HTTPBadRequest):
         await test_module.verify(mock_verify_request(request_body))
 

aries_cloudagent/messaging/valid.py

@@ -23,60 +23,41 @@
 class StrOrDictField(Field):
     """URI or Dict field for Marshmallow."""
 
-    def _serialize(self, value, attr, obj, **kwargs):
-        return value
-
     def _deserialize(self, value, attr, data, **kwargs):
-        if isinstance(value, (str, dict)):
-            return value
-        else:
+        if not isinstance(value, (str, dict)):
             raise ValidationError("Field should be str or dict")
+        return super()._deserialize(value, attr, data, **kwargs)
 
 
 class StrOrNumberField(Field):
     """String or Number field for Marshmallow."""
 
-    def _serialize(self, value, attr, obj, **kwargs):
-        return value
-
     def _deserialize(self, value, attr, data, **kwargs):
-        if isinstance(value, (str, float, int)):
-            return value
-        else:
+        if not isinstance(value, (str, float, int)):
             raise ValidationError("Field should be str or int or float")
+        return super()._deserialize(value, attr, data, **kwargs)
 
 
 class DictOrDictListField(Field):
     """Dict or Dict List field for Marshmallow."""
 
-    def _serialize(self, value, attr, obj, **kwargs):
-        return value
-
     def _deserialize(self, value, attr, data, **kwargs):
-        # dict
-        if isinstance(value, dict):
-            return value
-        # list of dicts
-        elif isinstance(value, list) and all(isinstance(item, dict) for item in value):
-            return value
-        else:
-            raise ValidationError("Field should be dict or list of dicts")
+        if not isinstance(value, dict):
+            if not isinstance(value, list) or not all(
+                isinstance(item, dict) for item in value
+            ):
+                raise ValidationError("Field should be dict or list of dicts")
+        return super()._deserialize(value, attr, data, **kwargs)
 
 
 class UriOrDictField(StrOrDictField):
     """URI or Dict field for Marshmallow."""
 
-    def __init__(self, *args, **kwargs):
-        """Initialize new UriOrDictField instance."""
-        super().__init__(*args, **kwargs)
-
-        # Insert validation into self.validators so that multiple errors can be stored.
-        self.validators.insert(0, self._uri_validator)
-
-    def _uri_validator(self, value):
-        # Check if URI when
+    def _deserialize(self, value, attr, data, **kwargs):
         if isinstance(value, str):
-            return Uri()(value)
+            # Check regex
+            Uri()(value)
+        return super()._deserialize(value, attr, data, **kwargs)
 
 
 class IntEpoch(Range):
@@ -775,7 +756,7 @@ def __call__(self, value):
                 except ValidationError:
                     raise ValidationError(
                         f"credential subject id {value[0]} must be URI"
-                    )
+                    ) from None
 
         return value