Skip to content

Commit

Permalink
Merge pull request openwallet-foundation#2476 from dbluhm/fix/service…
Browse files Browse the repository at this point in the history 
…-endpoint-unique-ids

fix: unique ids for services in legacy peer
  • Loading branch information
@swcurran
swcurran authored Sep 7, 2023
2 parents 56cd983 + 594d9e7 commit f189bd0
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 7 deletions.
6 changes: 3 additions & 3 deletions aries_cloudagent/resolver/default/legacy_peer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@ def authentication_is_list_of_verification_methods_and_refs(value: dict) -> dict
def didcomm_services_use_updated_conventions(value: dict) -> dict:
"""Update DIDComm services to use updated conventions."""
if "service" in value:
for service in value["service"]:
for index, service in enumerate(value["service"]):
if "type" in service and service["type"] == "IndyAgent":
service["type"] = "did-communication"
if ";" in service["id"]:
service["id"] = value["id"] + "#didcomm"
service["id"] = value["id"] + f"#didcomm-{index}"
if "#" not in service["id"]:
service["id"] += "#didcomm"
service["id"] += f"#didcomm-{index}"
if "priority" in service and service["priority"] is None:
service.pop("priority")
return value
Expand Down
89 changes: 85 additions & 4 deletions aries_cloudagent/resolver/default/tests/test_legacy_peer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ async def test_resolve_x_not_found(
"authentication": ["did:sov:JNKL9kJxQi5pNCfA8QBXdJ#1"],
"service": [
{
"id": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ#didcomm",
"id": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ#didcomm-0",
"type": "did-communication",
"priority": 0,
"recipientKeys": ["did:sov:JNKL9kJxQi5pNCfA8QBXdJ#1"],
Expand Down Expand Up @@ -229,7 +229,7 @@ async def test_resolve_x_not_found(
"authentication": ["did:sov:5qXMeLdyWEQhieFUBNw5ux#1"],
"service": [
{
"id": "did:sov:5qXMeLdyWEQhieFUBNw5ux#didcomm",
"id": "did:sov:5qXMeLdyWEQhieFUBNw5ux#didcomm-0",
"type": "did-communication",
"recipientKeys": ["did:sov:5qXMeLdyWEQhieFUBNw5ux#1"],
"serviceEndpoint": "http://172.17.0.1:9031/a2a/5b6dyY6PndLaCnWxZbeEYW/5b6dyY6PndLaCnWxZbeEYW/2f6aae0c-6b04-40ff-a25e-faecaea39f83",
Expand Down Expand Up @@ -276,7 +276,7 @@ async def test_resolve_x_not_found(
"authentication": [],
"service": [
{
"id": "did:sov:1H6d1WS29Bcfr7Bb9tZxA#didcomm",
"id": "did:sov:1H6d1WS29Bcfr7Bb9tZxA#didcomm-0",
"type": "did-communication",
"priority": 0,
"recipientKeys": ["did:sov:1H6d1WS29Bcfr7Bb9tZxA#cSwsDbSW"],
Expand Down Expand Up @@ -338,7 +338,7 @@ async def test_resolve_x_not_found(
"authentication": ["did:sov:PkWfCgY4SSAYeSoaWx3RFP#1"],
"service": [
{
"id": "did:sov:PkWfCgY4SSAYeSoaWx3RFP#didcomm",
"id": "did:sov:PkWfCgY4SSAYeSoaWx3RFP#didcomm-0",
"type": "did-communication",
"priority": 0,
"recipientKeys": ["did:sov:PkWfCgY4SSAYeSoaWx3RFP#1"],
Expand Down Expand Up @@ -409,6 +409,87 @@ async def test_resolve_x_not_found(
],
},
),
( # Doc with multiple services
{
"@context": "https://w3id.org/did/v1",
"id": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ",
"publicKey": [
{
"id": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ#1",
"type": "Ed25519VerificationKey2018",
"controller": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ",
"publicKeyBase58": "AU2FFjtkVzjFuirgWieqGGqtNrAZWS9LDuB8TDp6EUrG",
}
],
"authentication": [
{
"type": "Ed25519SignatureAuthentication2018",
"publicKey": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ#1",
}
],
"service": [
{
"id": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ;indy",
"type": "IndyAgent",
"priority": 0,
"recipientKeys": [
"AU2FFjtkVzjFuirgWieqGGqtNrAZWS9LDuB8TDp6EUrG"
],
"routingKeys": [
"9NnKFUZoYcCqYC2PcaXH3cnaGsoRfyGgyEHbvbLJYh8j"
],
"serviceEndpoint": "http://bob:3000",
},
{
"id": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ;indy-ws",
"type": "IndyAgent",
"priority": 1,
"recipientKeys": [
"AU2FFjtkVzjFuirgWieqGGqtNrAZWS9LDuB8TDp6EUrG"
],
"routingKeys": [
"9NnKFUZoYcCqYC2PcaXH3cnaGsoRfyGgyEHbvbLJYh8j"
],
"serviceEndpoint": "ws://bob:3000",
},
],
},
{
"@context": "https://w3id.org/did/v1",
"id": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ",
"verificationMethod": [
{
"id": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ#1",
"type": "Ed25519VerificationKey2018",
"controller": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ",
"publicKeyBase58": "AU2FFjtkVzjFuirgWieqGGqtNrAZWS9LDuB8TDp6EUrG",
}
],
"authentication": ["did:sov:JNKL9kJxQi5pNCfA8QBXdJ#1"],
"service": [
{
"id": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ#didcomm-0",
"type": "did-communication",
"priority": 0,
"recipientKeys": ["did:sov:JNKL9kJxQi5pNCfA8QBXdJ#1"],
"routingKeys": [
"did:key:z6Mknq3MqipEt9hJegs6J9V7tiLa6T5H5rX3fFCXksJKTuv7#z6Mknq3MqipEt9hJegs6J9V7tiLa6T5H5rX3fFCXksJKTuv7"
],
"serviceEndpoint": "http://bob:3000",
},
{
"id": "did:sov:JNKL9kJxQi5pNCfA8QBXdJ#didcomm-1",
"type": "did-communication",
"priority": 1,
"recipientKeys": ["did:sov:JNKL9kJxQi5pNCfA8QBXdJ#1"],
"routingKeys": [
"did:key:z6Mknq3MqipEt9hJegs6J9V7tiLa6T5H5rX3fFCXksJKTuv7#z6Mknq3MqipEt9hJegs6J9V7tiLa6T5H5rX3fFCXksJKTuv7"
],
"serviceEndpoint": "ws://bob:3000",
},
],
},
),
],
)
def test_corrections(self, input_doc: dict, expected: dict):
Expand Down

0 comments on commit f189bd0

Please sign in to comment.