refactor: share allowlist provider warning resolution

This commit is contained in:
Peter Steinberger
2026-03-07 23:47:32 +00:00
parent 846ec320e2
commit 2b54070526
9 changed files with 97 additions and 60 deletions

View File

@@ -1,6 +1,7 @@
import { describe, expect, it } from "vitest";
import {
collectOpenGroupPolicyConfiguredRouteWarnings,
collectAllowlistProviderRestrictSendersWarnings,
collectOpenGroupPolicyRestrictSendersWarnings,
collectOpenGroupPolicyRouteAllowlistWarnings,
buildOpenGroupPolicyConfigureRouteAllowlistWarning,
@@ -84,6 +85,47 @@ describe("group policy warning builders", () => {
).toHaveLength(1);
});
it("resolves allowlist-provider runtime policy before collecting restrict-senders warnings", () => {
expect(
collectAllowlistProviderRestrictSendersWarnings({
cfg: {
channels: {
defaults: { groupPolicy: "open" },
},
},
providerConfigPresent: false,
configuredGroupPolicy: undefined,
surface: "Example groups",
openScope: "any member",
groupPolicyPath: "channels.example.groupPolicy",
groupAllowFromPath: "channels.example.groupAllowFrom",
}),
).toEqual([]);
expect(
collectAllowlistProviderRestrictSendersWarnings({
cfg: {
channels: {
defaults: { groupPolicy: "open" },
},
},
providerConfigPresent: true,
configuredGroupPolicy: "open",
surface: "Example groups",
openScope: "any member",
groupPolicyPath: "channels.example.groupPolicy",
groupAllowFromPath: "channels.example.groupAllowFrom",
}),
).toEqual([
buildOpenGroupPolicyRestrictSendersWarning({
surface: "Example groups",
openScope: "any member",
groupPolicyPath: "channels.example.groupPolicy",
groupAllowFromPath: "channels.example.groupAllowFrom",
}),
]);
});
it("collects route allowlist warning variants", () => {
const params = {
groupPolicy: "open" as const,

View File

@@ -1,3 +1,10 @@
import type { OpenClawConfig } from "../../config/config.js";
import {
resolveAllowlistProviderRuntimeGroupPolicy,
resolveDefaultGroupPolicy,
} from "../../config/runtime-group-policy.js";
import type { GroupPolicy } from "../../config/types.base.js";
export function buildOpenGroupPolicyWarning(params: {
surface: string;
openBehavior: string;
@@ -63,6 +70,29 @@ export function collectOpenGroupPolicyRestrictSendersWarnings(
return [buildOpenGroupPolicyRestrictSendersWarning(params)];
}
export function collectAllowlistProviderRestrictSendersWarnings(
params: {
cfg: OpenClawConfig;
providerConfigPresent: boolean;
configuredGroupPolicy?: GroupPolicy | null;
} & Omit<Parameters<typeof collectOpenGroupPolicyRestrictSendersWarnings>[0], "groupPolicy">,
): string[] {
const defaultGroupPolicy = resolveDefaultGroupPolicy(params.cfg);
const { groupPolicy } = resolveAllowlistProviderRuntimeGroupPolicy({
providerConfigPresent: params.providerConfigPresent,
groupPolicy: params.configuredGroupPolicy ?? undefined,
defaultGroupPolicy,
});
return collectOpenGroupPolicyRestrictSendersWarnings({
groupPolicy,
surface: params.surface,
openScope: params.openScope,
groupPolicyPath: params.groupPolicyPath,
groupAllowFromPath: params.groupAllowFromPath,
mentionGated: params.mentionGated,
});
}
export function collectOpenGroupPolicyRouteAllowlistWarnings(params: {
groupPolicy: "open" | "allowlist" | "disabled";
routeAllowlistConfigured: boolean;

View File

@@ -547,6 +547,7 @@ export {
buildOpenGroupPolicyNoRouteAllowlistWarning,
buildOpenGroupPolicyRestrictSendersWarning,
buildOpenGroupPolicyWarning,
collectAllowlistProviderRestrictSendersWarnings,
collectOpenGroupPolicyConfiguredRouteWarnings,
collectOpenGroupPolicyRestrictSendersWarnings,
collectOpenGroupPolicyRouteAllowlistWarnings,