Skip to content

Commit

Permalink
chore: merge branch 'main' into feat/ucp-decision
Browse files Browse the repository at this point in the history
  • Loading branch information
termontwouter committed Feb 2, 2024
2 parents 358e119 + d7e0310 commit 0a22a50
Show file tree
Hide file tree
Showing 139 changed files with 1,458 additions and 1,354 deletions.
1 change: 1 addition & 0 deletions packages/ucp-enforcement/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
},
"devDependencies": {
"@solid/community-server": "7.0.3",
"@types/node": "^20.11.16",
"ts-node": "^10.9.1",
"typescript": "^5.3.3"
}
Expand Down
1 change: 1 addition & 0 deletions packages/uma/.componentsignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"Authorization",
"Error",
"EventEmitter",
"NodeJS.Dict",
"Permission",
"Principal",
"ResourceDescription",
Expand Down
27 changes: 27 additions & 0 deletions packages/uma/config/credentials/verifiers/default.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"@context": [
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
],
"@graph": [
{
"@id": "urn:uma:default:Verifier",
"@type": "TypedVerifier",
"verifiers": [
{
"TypedVerifier:_verifiers_key": "urn:solidlab:uma:claims:formats:webid",
"TypedVerifier:_verifiers_value": {
"@id": "urn:uma:default:UnsecureVerifier",
"@type": "UnsecureVerifier"
}
},
{
"TypedVerifier:_verifiers_key": "http://openid.net/specs/openid-connect-core-1_0.html#IDToken",
"TypedVerifier:_verifiers_value": {
"@id": "urn:uma:default:SolidOidcVerifier",
"@type": "SolidOidcVerifier"
}
}
]
}
]
}
51 changes: 22 additions & 29 deletions packages/uma/config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
],
"import": [
"sai-uma:config/authz/public-ns.json",
"sai-uma:config/discovery/default.json",
"sai-uma:config/introspection/default.json",
"sai-uma:config/keys/default.json",
"sai-uma:config/resource/default.json",
"sai-uma:config/ticket/default.json",
"sai-uma:config/token/default.json",
"sai-uma:config/credentials/verifiers/default.json",
"sai-uma:config/dialog/negotiators/default.json",
"sai-uma:config/policies/authorizers/public-ns.json",
"sai-uma:config/resources/storage/default.json",
"sai-uma:config/routes/discovery.json",
"sai-uma:config/routes/introspection.json",
"sai-uma:config/routes/keys.json",
"sai-uma:config/routes/resources.json",
"sai-uma:config/routes/tickets.json",
"sai-uma:config/routes/tokens.json",
"sai-uma:config/tickets/storage/default.json",
"sai-uma:config/tickets/strategy/claim-elimination.json",
"sai-uma:config/tokens/factory/default.json",
"sai-uma:config/tokens/storage/default.json",
"sai-uma:config/variables/default.json"
],
"@graph": [
Expand All @@ -34,32 +41,18 @@
"@type": "HttpHandlerController",
"label": "ControllerList",
"routes": [
{
"@id": "urn:uma:default:UmaConfigRoute"
},
{
"@id": "urn:uma:default:JwksRoute"
},
{
"@id": "urn:uma:default:TokenRoute"
},
{
"@id": "urn:uma:default:PermissionRegistrationRoute"
},
{
"@id": "urn:uma:default:ResourceRegistrationRoute"
},
{
"@id": "urn:uma:default:ResourceRegistrationOpsRoute"
},
{
"@id": "urn:uma:default:IntrospectionRoute"
}
{ "@id": "urn:uma:default:UmaConfigRoute" },
{ "@id": "urn:uma:default:JwksRoute" },
{ "@id": "urn:uma:default:TokenRoute" },
{ "@id": "urn:uma:default:PermissionRegistrationRoute" },
{ "@id": "urn:uma:default:ResourceRegistrationRoute" },
{ "@id": "urn:uma:default:ResourceRegistrationOpsRoute" },
{ "@id": "urn:uma:default:IntrospectionRoute" }
]
}
],
"defaultHandler": {
"@type": "DefaultRouteHandler"
"@type": "DefaultRequestHandler"
}
}
}
Expand Down
15 changes: 15 additions & 0 deletions packages/uma/config/dialog/negotiators/default.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"@context": [
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
],
"@graph": [
{
"@id": "urn:uma:default:Negotiator",
"@type": "BaseNegotiator",
"verifier": { "@id": "urn:uma:default:Verifier" },
"ticketStore": { "@id": "urn:uma:default:TicketStore" },
"ticketingStrategy": { "@id": "urn:uma:default:TicketingStrategy" },
"tokenFactory": { "@id": "urn:uma:default:TokenFactory" }
}
]
}
23 changes: 0 additions & 23 deletions packages/uma/config/discovery/default.json

This file was deleted.

30 changes: 0 additions & 30 deletions packages/uma/config/keys/default.json

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
"@id": "urn:uma:default:Authorizer",
"@type": "PublicNamespaceAuthorizer",
"authorizer": {
"@type": "NoneAuthorizer"
"@type": "WebIdAuthorizer",
"webids": [
"https://woslabbi.pod.knows.idlab.ugent.be/profile/card#me"
],
"authorizer": {
"@type": "NoneAuthorizer"
}
}
}
]
Expand Down
11 changes: 11 additions & 0 deletions packages/uma/config/resources/storage/default.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"@context": [
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
],
"@graph": [
{
"@id": "urn:uma:default:ResourceRegistrationStore",
"@type": "MemoryStore"
}
]
}
23 changes: 23 additions & 0 deletions packages/uma/config/routes/discovery.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"@context": [
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
],
"@graph": [
{
"@id": "urn:uma:default:UmaConfigRoute",
"@type": "HttpHandlerRoute",
"operations": [
{
"@type": "HttpHandlerOperation",
"method": "GET",
"publish": true
}
],
"handler": {
"@type": "ConfigRequestHandler",
"baseUrl": { "@id": "urn:uma:variables:baseUrl" }
},
"path": "/uma/.well-known/uma2-configuration"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,8 @@
"@type": "JsonHttpErrorHandler",
"nestedHandler": {
"@type": "IntrospectionHandler",
"tokenStore": {
"@id": "urn:uma:TokenStore",
"@type": "MemoryStore"
},
"jwtTokenFactory": {
"@id": "urn:uma:IntrospectionFactory",
"@type": "JwtTokenFactory",
"params_expirationTime": "5m",
"params_aud": "solid",
"issuer": {
"@id": "urn:uma:variables:baseUrl"
},
"keyholder": {
"@id": "urn:uma:default:DefaultKeyholder"
}
}
"tokenStore": { "@id": "urn:uma:default:TokenStore" },
"jwtTokenFactory": { "@id": "urn:uma:default:TokenFactory" }
}
},
"path": "/uma/introspect"
Expand Down
28 changes: 28 additions & 0 deletions packages/uma/config/routes/keys.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"@context": [
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
],
"@graph": [
{
"@id": "urn:uma:default:DefaultKeyholder",
"@type": "InMemoryJwksKeyHolder",
"alg": "ES256"
},
{
"@id": "urn:uma:default:JwksRoute",
"@type": "HttpHandlerRoute",
"operations": [
{
"@type": "HttpHandlerOperation",
"method": "GET",
"publish": true
}
],
"handler": {
"@type": "JwksRequestHandler",
"keyholder": { "@id": "urn:uma:default:DefaultKeyholder" }
},
"path": "/uma/keys"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@
"@graph": [
{
"@id": "urn:uma:default:ResourceRegistrationHandler",
"@type": "ResourceRegistrationHandler",
"@type": "ResourceRegistrationRequestHandler",
"baseUrl": "urn:uma:variables:baseUrl",
"resourceStore": {
"@id": "urn:uma:default:ResourceRegistrationStore",
"@type": "MemoryStore"
}
"resourceStore": { "@id": "urn:uma:default:ResourceRegistrationStore" }
},
{
"@id": "urn:uma:default:ResourceRegistrationRoute",
Expand All @@ -22,9 +19,7 @@
"publish": true
}
],
"handler": {
"@id": "urn:uma:default:ResourceRegistrationHandler"
},
"handler": { "@id": "urn:uma:default:ResourceRegistrationHandler" },
"path": "/uma/resources"
},
{
Expand All @@ -37,9 +32,7 @@
"publish": true
}
],
"handler": {
"@id": "urn:uma:default:ResourceRegistrationHandler"
},
"handler": { "@id": "urn:uma:default:ResourceRegistrationHandler" },
"path": "/uma/resources/:id"
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,18 @@
"handler": {
"@type": "JsonHttpErrorHandler",
"nestedHandler": {
"@type": "PermissionRegistrationHandler",
"@type": "TicketRequestHandler",
"baseUrl": { "@id": "urn:uma:variables:baseUrl" },
"ticketingStrategy": { "@id": "urn:uma:default:TicketingStrategy" },
"ticketStore": { "@id": "urn:uma:default:TicketStore" },
"resourceServers": [
{
"@type": "RequestingPartyRegistration",
"baseUrl": "urn:uma:variables:baseUrl",
"ecPublicKey": "-----BEGIN PUBLIC KEY-----MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEGJkzO34pMnTx4uxoTD0+dvB4gVaXs9X+qkguzUCNT9ZzbZ/onTZrvQDLVAdH++c7sS/vmfrNuACUeNhLr9aYFA==-----END PUBLIC KEY-----",
"ecAlgorithm": "ES256"
}
],
"ticketStore": {
"@id": "urn:uma:TicketStore"
},
"baseUrl": {
"@id": "urn:uma:variables:baseUrl"
}
]
}
},
"path": "/uma/ticket"
Expand Down
26 changes: 26 additions & 0 deletions packages/uma/config/routes/tokens.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"@context": [
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
],
"@graph": [
{
"@id": "urn:uma:default:TokenRoute",
"@type": "HttpHandlerRoute",
"operations": [
{
"@type": "HttpHandlerOperation",
"method": "POST",
"publish": true
}
],
"handler": {
"@type": "JsonHttpErrorHandler",
"nestedHandler": {
"@type": "TokenRequestHandler",
"negotiator": { "@id": "urn:uma:default:Negotiator" }
}
},
"path": "/uma/token"
}
]
}
Loading

0 comments on commit 0a22a50

Please sign in to comment.