refactor: Move WAC-Allow configs to ACL-specific config

This commit is contained in:
Joachim Van Herwegen 2022-08-19 15:55:37 +02:00
parent fa1dee573e
commit b3dd50a593
4 changed files with 20 additions and 3 deletions

View File

@ -1,6 +1,7 @@
{ {
"@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^5.0.0/components/context.jsonld", "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^5.0.0/components/context.jsonld",
"import": [ "import": [
"css:config/ldp/authorization/acl/wac-allow.json",
"css:config/ldp/authorization/readers/acl.json", "css:config/ldp/authorization/readers/acl.json",
"css:config/ldp/authorization/readers/ownership.json" "css:config/ldp/authorization/readers/ownership.json"
], ],
@ -37,6 +38,22 @@
"@type": "SubfolderResourcesGenerator", "@type": "SubfolderResourcesGenerator",
"subfolders": [ "wac" ] "subfolders": [ "wac" ]
}, },
{
"comment": "Collects the metadata necessary for the WAC-Allow header.",
"@id": "urn:solid-server:default:OperationMetadataCollector",
"@type": "SequenceHandler",
"handlers": [
{ "@type": "WebAclMetadataCollector" }
]
},
{
"comment": "WAC-Allow header indicates available permissions.",
"@id": "urn:solid-server:default:MetadataWriter",
"@type": "ParallelHandler",
"handlers": [
{ "@id": "urn:solid-server:default:MetadataWriter_WacAllow" }
]
},
{ {
"comment": "In case of WebACL authorization the ACL resources determine authorization.", "comment": "In case of WebACL authorization the ACL resources determine authorization.",
"@id": "urn:solid-server:default:AuthResourceHttpHandler", "@id": "urn:solid-server:default:AuthResourceHttpHandler",

View File

@ -2,8 +2,10 @@
"@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^5.0.0/components/context.jsonld", "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^5.0.0/components/context.jsonld",
"@graph": [ "@graph": [
{ {
"comment": "Contains the necessary metadata collectors. Contents depend on authorization scheme.",
"@id": "urn:solid-server:default:OperationMetadataCollector", "@id": "urn:solid-server:default:OperationMetadataCollector",
"@type": "WebAclMetadataCollector" "@type": "SequenceHandler",
"handlers": []
} }
] ]
} }

View File

@ -7,7 +7,6 @@
"css:config/ldp/metadata-writer/writers/link-rel-metadata.json", "css:config/ldp/metadata-writer/writers/link-rel-metadata.json",
"css:config/ldp/metadata-writer/writers/mapped.json", "css:config/ldp/metadata-writer/writers/mapped.json",
"css:config/ldp/metadata-writer/writers/modified.json", "css:config/ldp/metadata-writer/writers/modified.json",
"css:config/ldp/metadata-writer/writers/wac-allow.json",
"css:config/ldp/metadata-writer/writers/www-auth.json" "css:config/ldp/metadata-writer/writers/www-auth.json"
], ],
"@graph": [ "@graph": [
@ -22,7 +21,6 @@
{ "@id": "urn:solid-server:default:MetadataWriter_LinkRelMetadata" }, { "@id": "urn:solid-server:default:MetadataWriter_LinkRelMetadata" },
{ "@id": "urn:solid-server:default:MetadataWriter_Mapped" }, { "@id": "urn:solid-server:default:MetadataWriter_Mapped" },
{ "@id": "urn:solid-server:default:MetadataWriter_Modified" }, { "@id": "urn:solid-server:default:MetadataWriter_Modified" },
{ "@id": "urn:solid-server:default:MetadataWriter_WacAllow" },
{ "@id": "urn:solid-server:default:MetadataWriter_WwwAuth" } { "@id": "urn:solid-server:default:MetadataWriter_WwwAuth" }
] ]
} }