mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-09 02:28:27 +00:00
refactor: share provider group-policy warning collectors
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import {
|
||||
collectOpenGroupPolicyConfiguredRouteWarnings,
|
||||
collectAllowlistProviderGroupPolicyWarnings,
|
||||
collectAllowlistProviderRestrictSendersWarnings,
|
||||
collectOpenGroupPolicyConfiguredRouteWarnings,
|
||||
collectOpenProviderGroupPolicyWarnings,
|
||||
collectOpenGroupPolicyRestrictSendersWarnings,
|
||||
collectOpenGroupPolicyRouteAllowlistWarnings,
|
||||
buildOpenGroupPolicyConfigureRouteAllowlistWarning,
|
||||
@@ -126,6 +128,67 @@ describe("group policy warning builders", () => {
|
||||
]);
|
||||
});
|
||||
|
||||
it("passes resolved allowlist-provider policy into the warning collector", () => {
|
||||
expect(
|
||||
collectAllowlistProviderGroupPolicyWarnings({
|
||||
cfg: {
|
||||
channels: {
|
||||
defaults: { groupPolicy: "open" },
|
||||
},
|
||||
},
|
||||
providerConfigPresent: false,
|
||||
configuredGroupPolicy: undefined,
|
||||
collect: (groupPolicy) => [groupPolicy],
|
||||
}),
|
||||
).toEqual(["allowlist"]);
|
||||
|
||||
expect(
|
||||
collectAllowlistProviderGroupPolicyWarnings({
|
||||
cfg: {
|
||||
channels: {
|
||||
defaults: { groupPolicy: "disabled" },
|
||||
},
|
||||
},
|
||||
providerConfigPresent: true,
|
||||
configuredGroupPolicy: "open",
|
||||
collect: (groupPolicy) => [groupPolicy],
|
||||
}),
|
||||
).toEqual(["open"]);
|
||||
});
|
||||
|
||||
it("passes resolved open-provider policy into the warning collector", () => {
|
||||
expect(
|
||||
collectOpenProviderGroupPolicyWarnings({
|
||||
cfg: {
|
||||
channels: {
|
||||
defaults: { groupPolicy: "allowlist" },
|
||||
},
|
||||
},
|
||||
providerConfigPresent: false,
|
||||
configuredGroupPolicy: undefined,
|
||||
collect: (groupPolicy) => [groupPolicy],
|
||||
}),
|
||||
).toEqual(["allowlist"]);
|
||||
|
||||
expect(
|
||||
collectOpenProviderGroupPolicyWarnings({
|
||||
cfg: {},
|
||||
providerConfigPresent: true,
|
||||
configuredGroupPolicy: undefined,
|
||||
collect: (groupPolicy) => [groupPolicy],
|
||||
}),
|
||||
).toEqual(["open"]);
|
||||
|
||||
expect(
|
||||
collectOpenProviderGroupPolicyWarnings({
|
||||
cfg: {},
|
||||
providerConfigPresent: true,
|
||||
configuredGroupPolicy: "disabled",
|
||||
collect: (groupPolicy) => [groupPolicy],
|
||||
}),
|
||||
).toEqual(["disabled"]);
|
||||
});
|
||||
|
||||
it("collects route allowlist warning variants", () => {
|
||||
const params = {
|
||||
groupPolicy: "open" as const,
|
||||
|
||||
@@ -2,9 +2,12 @@ import type { OpenClawConfig } from "../../config/config.js";
|
||||
import {
|
||||
resolveAllowlistProviderRuntimeGroupPolicy,
|
||||
resolveDefaultGroupPolicy,
|
||||
resolveOpenProviderRuntimeGroupPolicy,
|
||||
} from "../../config/runtime-group-policy.js";
|
||||
import type { GroupPolicy } from "../../config/types.base.js";
|
||||
|
||||
type GroupPolicyWarningCollector = (groupPolicy: GroupPolicy) => string[];
|
||||
|
||||
export function buildOpenGroupPolicyWarning(params: {
|
||||
surface: string;
|
||||
openBehavior: string;
|
||||
@@ -77,20 +80,50 @@ export function collectAllowlistProviderRestrictSendersWarnings(
|
||||
configuredGroupPolicy?: GroupPolicy | null;
|
||||
} & Omit<Parameters<typeof collectOpenGroupPolicyRestrictSendersWarnings>[0], "groupPolicy">,
|
||||
): string[] {
|
||||
return collectAllowlistProviderGroupPolicyWarnings({
|
||||
cfg: params.cfg,
|
||||
providerConfigPresent: params.providerConfigPresent,
|
||||
configuredGroupPolicy: params.configuredGroupPolicy,
|
||||
collect: (groupPolicy) =>
|
||||
collectOpenGroupPolicyRestrictSendersWarnings({
|
||||
groupPolicy,
|
||||
surface: params.surface,
|
||||
openScope: params.openScope,
|
||||
groupPolicyPath: params.groupPolicyPath,
|
||||
groupAllowFromPath: params.groupAllowFromPath,
|
||||
mentionGated: params.mentionGated,
|
||||
}),
|
||||
});
|
||||
}
|
||||
|
||||
export function collectAllowlistProviderGroupPolicyWarnings(params: {
|
||||
cfg: OpenClawConfig;
|
||||
providerConfigPresent: boolean;
|
||||
configuredGroupPolicy?: GroupPolicy | null;
|
||||
collect: GroupPolicyWarningCollector;
|
||||
}): 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,
|
||||
return params.collect(groupPolicy);
|
||||
}
|
||||
|
||||
export function collectOpenProviderGroupPolicyWarnings(params: {
|
||||
cfg: OpenClawConfig;
|
||||
providerConfigPresent: boolean;
|
||||
configuredGroupPolicy?: GroupPolicy | null;
|
||||
collect: GroupPolicyWarningCollector;
|
||||
}): string[] {
|
||||
const defaultGroupPolicy = resolveDefaultGroupPolicy(params.cfg);
|
||||
const { groupPolicy } = resolveOpenProviderRuntimeGroupPolicy({
|
||||
providerConfigPresent: params.providerConfigPresent,
|
||||
groupPolicy: params.configuredGroupPolicy ?? undefined,
|
||||
defaultGroupPolicy,
|
||||
});
|
||||
return params.collect(groupPolicy);
|
||||
}
|
||||
|
||||
export function collectOpenGroupPolicyRouteAllowlistWarnings(params: {
|
||||
|
||||
@@ -547,7 +547,9 @@ export {
|
||||
buildOpenGroupPolicyNoRouteAllowlistWarning,
|
||||
buildOpenGroupPolicyRestrictSendersWarning,
|
||||
buildOpenGroupPolicyWarning,
|
||||
collectAllowlistProviderGroupPolicyWarnings,
|
||||
collectAllowlistProviderRestrictSendersWarnings,
|
||||
collectOpenProviderGroupPolicyWarnings,
|
||||
collectOpenGroupPolicyConfiguredRouteWarnings,
|
||||
collectOpenGroupPolicyRestrictSendersWarnings,
|
||||
collectOpenGroupPolicyRouteAllowlistWarnings,
|
||||
|
||||
Reference in New Issue
Block a user