diff --git a/packages/core/src/config/plugin/policy.ts b/packages/core/src/config/plugin/policy.ts index 5f7e734a0f6..9e179d116e1 100644 --- a/packages/core/src/config/plugin/policy.ts +++ b/packages/core/src/config/plugin/policy.ts @@ -12,16 +12,34 @@ export const Plugin = define({ effect: Effect.fn(function* (ctx) { const config = yield* Config.Service const loaded = yield* ConfigEntryObserver.observe(config, ctx.event, ctx.provider.reload()) - yield* ctx.provider.transform((providers) => { - // User-global policy takes priority over policy authored by a repository. - const policies = loaded.entries + const policies = () => + loaded.entries .filter((entry): entry is Document => entry.type === "document") .toReversed() .flatMap((entry) => entry.info.experimental?.policies ?? []) + yield* ctx.provider.transform((providers) => { + // User-global policy takes priority over policy authored by a repository. for (const record of providers.list()) { - const policy = policies.findLast((policy) => Wildcard.match(record.provider.id, policy.resource)) + const policy = policies().findLast( + (policy) => policy.action === "provider.use" && Wildcard.match(record.provider.id, policy.resource), + ) if (policy?.effect === "deny") providers.remove(record.provider.id) } }) + yield* ctx.permission.hook("evaluate", (event) => + Effect.sync(() => { + const current = policies() + const denied = event.resources.some((resource) => { + const policy = current.findLast( + (policy) => + policy.action === "permission" && Wildcard.match(`${event.action}:${resource}`, policy.resource), + ) + return policy?.effect === "deny" + }) + if (!denied) return + event.effect = "deny" + event.message = "Blocked by configuration policy" + }), + ) }), }) diff --git a/packages/schema/src/config/policy.ts b/packages/schema/src/config/policy.ts index 2c3e2707072..beeaaa613ba 100644 --- a/packages/schema/src/config/policy.ts +++ b/packages/schema/src/config/policy.ts @@ -6,7 +6,7 @@ export const Effect = Schema.Literals(["allow", "deny"]) export type Effect = typeof Effect.Type export const Info = Schema.Struct({ - action: Schema.Literal("provider.use"), + action: Schema.Literals(["provider.use", "permission"]), resource: Schema.String, effect: Effect, })