From 3440003ba1afe10cb7843181885c7402972fff6d Mon Sep 17 00:00:00 2001 From: Ivan Herman Date: Tue, 19 Nov 2024 08:59:20 +0100 Subject: [PATCH] Added the new domain for the controller property, and modified the diagram --- vocab/security/template.html | 13 +- vocab/security/vocabulary.drawio | 56 +- vocab/security/vocabulary.svg | 1907 ++++++++++++++++-------------- vocab/security/vocabulary.yml | 4 +- 4 files changed, 1033 insertions(+), 947 deletions(-) diff --git a/vocab/security/template.html b/vocab/security/template.html index d678e9f..2a1013c 100644 --- a/vocab/security/template.html +++ b/vocab/security/template.html @@ -270,7 +270,9 @@

Diagram description

Each of these sections has an ellipse at the top, labeled as "Proof", "VerificationMethod", - and "VerificationRelationship", respectively. + and "VerificationRelationship", respectively. Additionally, the Verification Method section also + includes an additional ellipse, labeled as "ControllerDocument", side-by-side with the ellipse + labeled as "VerificationMethod".

Proof Section

@@ -304,16 +306,17 @@

Verification Method Section

The left side of this section contains a column of three labeled boxes, all styled as "Property". - The labels, from top to bottom, are "expires", "controller", and "revoked". + The labels, from top to bottom, are "controller", "expires", and "revoked". Each of these is connected to the "VerificationMethod" ellipse, with a line styled as "Domain Of". - The "expires" "Property" box is also connected to the "Proof" ellipse (in the Proof section), - with a line styled as "Domain Of". + The "controller" "Property" box is also connected to the "ControllerDocument" ellipse, while + the "expires" "Property" box is also connected to the "Proof" ellipse (in the Proof section); + both these extra connections are also with a line styled as "Domain Of".

There is also a distinct box, styled as "Property" and labeled as "verificationMethod". This "verificationMethod" box is connected to the "VerificationMethod" -ellipse, with a connecting line styled as "Range". + ellipse, with a connecting line styled as "Range".

diff --git a/vocab/security/vocabulary.drawio b/vocab/security/vocabulary.drawio index f1f211a..5318301 100644 --- a/vocab/security/vocabulary.drawio +++ b/vocab/security/vocabulary.drawio @@ -1,6 +1,6 @@ - + - + @@ -105,7 +105,7 @@ - + @@ -113,12 +113,12 @@ - + - + - + @@ -127,7 +127,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -263,12 +263,12 @@ - + - + @@ -462,7 +462,7 @@ - + @@ -522,7 +522,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -564,7 +564,7 @@ - + @@ -573,7 +573,7 @@ - + @@ -582,7 +582,7 @@ - + @@ -591,7 +591,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -622,16 +622,30 @@ - - + + - + + + + + + + + + + + + + + + diff --git a/vocab/security/vocabulary.svg b/vocab/security/vocabulary.svg index 6a2332b..b9d13e8 100644 --- a/vocab/security/vocabulary.svg +++ b/vocab/security/vocabulary.svg @@ -1,925 +1,992 @@ - - - - - - - - -
-
-
- - Graph containment - -
-
-
-
- Graph con... -
- - - - -
-
-
- Class -
-
-
-
- Class -
- - - - -
-
-
- Property -
-
-
-
- Property -
- - - - - - - -
-
-
- Superclass -
-
-
-
- Superclass -
- - - - - - - -
-
-
- Domain -
-
-
-
- Domain -
- - - - - - - -
-
-
- Range -
-
-
-
- Range -
- - - - -
-
-
- - Datatype - -
-
-
-
- Datatype -
- - - - - - - -
-
-
- Type -
-
-
-
- Type -
- - - - -
-
-
- - controller - -
-
-
-
- controller -
-
- - - - -
-
-
- - revoked - -
-
-
-
- revoked -
-
- - - - - - - - - - - - -
-
-
- - Ed25519VerificationKey2020 - -
-
-
-
- Ed25519VerificationKey2020 -
-
- - - - - - - - - - - - - - - - -
-
-
- - ProofGraph - -
-
-
-
- ProofGraph -
-
- - - - - - - - -
-
-
- - proof - -
-
-
-
- proof -
-
- - - - - - - - -
-
-
- - domain - -
-
-
-
- domain -
-
- - - - -
-
-
- - challenge - -
-
-
-
- challenge -
-
- - - - -
-
-
- - previousProof - -
-
-
-
- previousProof -
-
- - - - -
-
-
- - proofPurpose -
-
-
-
-
-
- proofPurpose + + + + + + + + + + + + + +
+
+
+ + Graph containment + +
+
+
+
+ Graph con... +
+
+
+ + + + + + +
+
+
+ Class +
+
+
+
+ Class +
+
+
+ + + + + + +
+
+
+ Property +
+
+
+
+ Property +
+
+
+ + + + + + + + + +
+
+
+ Superclass +
+
+
+
+ Superclass +
+
+
+ + + + + + + + + +
+
+
+ Domain +
+
+
+
+ Domain +
+
+
+ + + + + + + + + +
+
+
+ Range +
+
+
+
+ Range +
+
+
+ + + + + + +
+
+
+ + Datatype + +
+
+
+
+ Datatype +
+
+
+ + + + + + + + + +
+
+
+ Type +
+
+
+
+ Type +
+
+
+
+ + + + +
+
+
+ + controller + +
+
+
+
+ controller +
+
+ + + + +
+
+
+ + revoked + +
+
+
+
+ revoked +
+
+ + + + + + + + + + + + +
+
+
+ + Ed25519VerificationKey2020 + +
+
+
+
+ Ed25519VerificationKey2020 +
+
+ + + + + + + + + + + + + + + + +
+
+
+ + ProofGraph + +
+
+
+
+ ProofGraph +
+
+ + + + + + + + +
+
+
+ + proof + +
+
+
+
+ proof +
+
+ + + + + + + + +
+
+
+ + domain + +
+
+
+
+ domain +
+
+ + + + +
+
+
+ + challenge + +
+
+
+
+ challenge +
+
+ + + + +
+
+
+ + previousProof + +
+
+
+
+ previousProof +
+
+ + + + +
+
+
+ + proofPurpose +
+
+
+
+
+
+ proofPurpose -
-
- - - - -
-
-
- - proofValue - -
-
-
-
- proofValue -
-
- - - - -
-
-
- - expiration - -
-
-
-
- expiration -
-
- - - - -
-
-
- - nonce - -
-
-
-
- nonce -
-
- - - - -
-
-
- - created - -
-
-
-
- created -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - DataIntegrityProof - -
-
-
-
- DataIntegrityProof -
-
- - - - -
-
-
- - Ed25519Signature2020 - -
-
-
-
- Ed25519Signature2020 -
-
- - - - - - - - - - - - -
-
-
- - cryptosuite - -
-
-
-
- cryptosuite -
-
- - - - -
-
-
- cryptosuiteString -
-
-
-
- cryptosuiteString -
-
- - - - - - - - - - - - -
-
-
- multibase -
-
-
-
- multibase -
-
- - - - - - - - -
-
-
- - Multikey - -
-
-
-
- Multikey -
-
- - - - - -
-
-
- - publicKeyMultibase - -
-
-
-
- publicKeyMultibase -
-
- - - - -
-
-
- - secretKeyMultibase - -
-
-
-
- secretKeyMultibase -
-
- - - - - - - - - - - - -
-
-
- - JsonWebKey - -
-
-
-
- JsonWebKey -
-
- - - -
-
-
- rdf:JSON -
-
-
-
- rdf:JSON -
- - - - - -
-
-
- - secretKeyJwk - -
-
-
-
- secretKeyJwk -
-
- - - - -
-
-
- - publicKeyJwk - -
-
-
-
- publicKeyJwk -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - digestMultibase - -
-
-
-
- digestMultibase -
-
- - - - - - - - - - - - -
-
-
- - VerificationRelationship - -
-
-
-
- VerificationRelationship -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - verificationMethod - -
-
-
-
- verificationMethod -
-
- - - - -
-
-
- - authentication - -
-
-
-
- authentication -
-
- - - - -
-
-
- - assertionMethod - -
-
-
-
- assertionMethod -
-
- - - - -
-
-
- - capabilityDelegationMethod - -
-
-
-
- capabilityDelegationMethod -
-
- - - - -
-
-
- - capabilityInvocationMethod -
-
-
-
-
-
- capabilityInvocationMethod +
+
+ + + + +
+
+
+ + proofValue + +
+
+
+
+ proofValue +
+
+ + + + +
+
+
+ + expiration + +
+
+
+
+ expiration +
+
+ + + + +
+
+
+ + nonce + +
+
+
+
+ nonce +
+
+ + + + +
+
+
+ + created + +
+
+
+
+ created +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + DataIntegrityProof + +
+
+
+
+ DataIntegrityProof +
+
+ + + + +
+
+
+ + Ed25519Signature2020 + +
+
+
+
+ Ed25519Signature2020 +
+
+ + + + + + + + + + + + +
+
+
+ + cryptosuite + +
+
+
+
+ cryptosuite +
+
+ + + + +
+
+
+ cryptosuiteString +
+
+
+
+ cryptosuiteString +
+
+ + + + + + + + + + + + +
+
+
+ multibase +
+
+
+
+ multibase +
+
+ + + + + + + + +
+
+
+ + Multikey + +
+
+
+
+ Multikey +
+
+ + + + + + +
+
+
+ + publicKeyMultibase + +
+
+
+
+ publicKeyMultibase +
+
+ + + + +
+
+
+ + secretKeyMultibase + +
+
+
+
+ secretKeyMultibase +
+
+
+ + + + + + + + + + + + +
+
+
+ + JsonWebKey + +
+
+
+
+ JsonWebKey +
+
+ + + + +
+
+
+ rdf:JSON +
+
+
+
+ rdf:JSON +
+
+ + + + + + +
+
+
+ + secretKeyJwk + +
+
+
+
+ secretKeyJwk +
+
+ + + + +
+
+
+ + publicKeyJwk + +
+
+
+
+ publicKeyJwk +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + digestMultibase + +
+
+
+
+ digestMultibase +
+
+ + + + + + + + + + + + +
+
+
+ + VerificationRelationship + +
+
+
+
+ VerificationRelationship +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + verificationMethod + +
+
+
+
+ verificationMethod +
+
+ + + + +
+
+
+ + authentication + +
+
+
+
+ authentication +
+
+ + + + +
+
+
+ + assertionMethod + +
+
+
+
+ assertionMethod +
+
+ + + + +
+
+
+ + capabilityDelegationMethod + +
+
+
+
+ capabilityDelegationMethod +
+
+ + + + +
+
+
+ + capabilityInvocationMethod +
+
+
+
+
+
+ capabilityInvocationMethod -
-
- - - - -
-
-
- - keyAgreementMethod - -
-
-
-
- keyAgreementMethod -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - VerificationMethod - -
-
-
-
- VerificationMethod -
-
- - - - -
-
-
- - Proof - -
-
-
-
- Proof -
-
- - - - -
-
-
- - verificationMethod - -
-
-
-
- verificationMethod -
-
- - - +
+
+ + + + +
+
+
+ + keyAgreementMethod + +
+
+
+
+ keyAgreementMethod +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + VerificationMethod + +
+
+
+
+ VerificationMethod +
+
+ + + + +
+
+
+ + Proof + +
+
+
+
+ Proof +
+
+ + + + +
+
+
+ + verificationMethod + +
+
+
+
+ verificationMethod +
+
+ + + + + + + + +
+
+
+ + ControllerDocument + +
+
+
+
+ ControllerDocument +
+
+ + + + +
diff --git a/vocab/security/vocabulary.yml b/vocab/security/vocabulary.yml index eb5361e..1ea3048 100644 --- a/vocab/security/vocabulary.yml +++ b/vocab/security/vocabulary.yml @@ -198,7 +198,9 @@ property: - id: controller label: Controller - domain: sec:VerificationMethod + domain: + - sec:VerificationMethod + - sec:ControllerDocument range: IRI defined_by: https://www.w3.org/TR/controller-document/#defn-controller context: [https://w3id.org/security/multikey/v1, https://w3id.org/security/jwk/v1, https://www.w3.org/ns/did/v1]