Skip to content

Commit

Permalink
feat: remove references to signatures (International-Data-Spaces-Asso…
Browse files Browse the repository at this point in the history
…ciation#181)

* Remove references to signatures

* Update PNG
  • Loading branch information
jimmarino authored Dec 7, 2023
1 parent 0c9e509 commit 529746f
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 37 deletions.
5 changes: 0 additions & 5 deletions negotiation/contract.negotiation.binding.https.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,6 @@ Authorization: ...
"@type": "dspace:ContractAgreementVerificationMessage",
"dspace:providerPid": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3",
"dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
"dspace:consumerSignature": {
"timestamp": 121212,
"hash": "...",
"signature": ""
}
}
```
Expand Down
24 changes: 4 additions & 20 deletions negotiation/contract.negotiation.protocol.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ will be created on consumer side and the consumer selects an appropriate `consum

#### Description

The `ContractAgreementMessage` is sent by a provider when it agrees to a contract. It contains the complete contract agreement with the provider's signature.
The `ContractAgreementMessage` is sent by a provider when it agrees to a contract. It contains the complete contract agreement.

A `ContractAgreementMessage` must contain a `consumerPid` and a `providerPid`.

Expand Down Expand Up @@ -155,7 +155,7 @@ contract (i.e. the "connectors").

#### Description

The `ContractAgreementVerificationMessage` is sent by a consumer to verify the acceptance of a contract agreement. A provider responds with an error if the signature can't be
The `ContractAgreementVerificationMessage` is sent by a consumer to verify the acceptance of a contract agreement. A provider responds with an error if the contract cannot be
validated or is incorrect.

A `ContractAgreementVerificationMessage` must contain a `consumerPid` and a `providerPid`.
Expand All @@ -178,8 +178,8 @@ A `ContractAgreementVerificationMessage` must contain a `consumerPid` and a `pro
#### Description

When the `ContractNegotiationEventMessage` is sent by a provider with an `eventType` property set to `FINALIZED`, a contract agreement has been finalized and the associated asset
is accessible. The state machine is transitioned to the `FINALIZED` state. Other event types may be defined in the future. A consumer responds with an error if the signature
can't be validated or is incorrect.
is accessible. The state machine is transitioned to the `FINALIZED` state. Other event types may be defined in the future. A consumer responds with an error if the contract
cannot be validated or is incorrect.

It is an error for a consumer to send a `ContractNegotiationEventMessage` with an eventType `FINALIZED` to the provider.

Expand Down Expand Up @@ -255,19 +255,3 @@ The `ContractNegotiation` is an object returned by a consumer or provider indica

The `ContractNegotiationError` is an object returned by a consumer or provider indicating an error has occurred. It does not cause a state transition.

## Hash and Signature Calculations

Hash and Signatures are calculated as defined in the [[JWS/CT]](#references) of ...

## References

- [[JCS] JSON Canonicalization Scheme](https://www.ietf.org/archive/id/draft-jordan-jws-ct-08.html)
- [[JWS/CT] JWS Clear Text JSON Signature Option](https://www.ietf.org/archive/id/draft-jordan-jws-ct-08.html)
- [[JWS] JSON Web Signature](https://www.rfc-editor.org/rfc/rfc7797.html)

## JWS Clear Text JSON Signature Option

- Adopt JWS/CT, an extension to the JSON Web Signature (JWS) standard.
- Combines the detached mode of JWS with the JSON Canonicalization Scheme (JCS). Detached mode is when the payload section of the JWS is replaced
by an empty string: `XXXX.PAYLOAD.YYYY` becomes `XXXX..YYYY`. Detached mode is described in the JWS spec.
- Maintains Signed JSON data in JSON format.
1 change: 0 additions & 1 deletion negotiation/message/contract-agreement-message.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
}]
}]
},
"dspace:signature": {},
"dspace:callbackAddress": "https://......"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
"dspace:hashedMessage": {
"dspace:digest": "some-hash",
"dspace:algorithm": "SHA-384"
},
"dspace:signature": {}
}
}
Binary file modified negotiation/message/diagram/contract-agreement-message.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class "dspace:ContractAgreementMessage" {
dspace:providerPid : String
dspace:consumerPid : String
dspace:agreement : odrl:Agreement
dspace:signature: Object
dspace:callbackAddress : xsd:anyURI
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
"dspace:agreement": {
"$ref": "https://w3id.org/dspace/schemas/v0.8/contract-schema.json#/definitions/Agreement"
},
"dspace:signature": {
"type": "object"
},
"dspace:callbackAddress": {
"type" : "string"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ dspace_shapes:ContractAgreementMessageShape
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-agreement-message-shape.ttl> (ContractAgreementMessageShape): An dspace:agreement property must point to exactly one odrl:Agreement class."@en ;
] ;
sh:property [
a sh:PropertyShape ;
sh:path dspace:signature ;
] ;
sh:property [
a sh:PropertyShape ;
sh:path dspace:callbackAddress ;
Expand All @@ -70,4 +66,4 @@ dspace_shapes:ContractAgreementMessageShape
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-agreement-message-shape.ttl> (ContractAgreementMessageShape): An dspace:callbackAddress property must point to exactly one xsd:string value."@en ;
]
.
.

0 comments on commit 529746f

Please sign in to comment.