Add support for policy engine in extensions (#20049)

Co-authored-by: Jerop Kipruto <jerop@google.com>
This commit is contained in:
christine betts
2026-02-26 22:29:33 -05:00
committed by GitHub
parent b1befee8fb
commit e17f927a69
18 changed files with 657 additions and 89 deletions

View File

@@ -14,6 +14,7 @@ import {
type MockInstance,
} from 'vitest';
import { SimpleExtensionLoader } from './extensionLoader.js';
import { PolicyDecision } from '../policy/types.js';
import type { Config, GeminiCLIExtension } from '../config/config.js';
import { type McpClientManager } from '../tools/mcp-client-manager.js';
import type { GeminiClient } from '../core/client.js';
@@ -38,6 +39,12 @@ describe('SimpleExtensionLoader', () => {
let mockHookSystemInit: MockInstance;
let mockAgentRegistryReload: MockInstance;
let mockSkillsReload: MockInstance;
let mockPolicyEngine: {
addRule: MockInstance;
addChecker: MockInstance;
removeRulesBySource: MockInstance;
removeCheckersBySource: MockInstance;
};
const activeExtension: GeminiCLIExtension = {
name: 'test-extension',
@@ -47,7 +54,22 @@ describe('SimpleExtensionLoader', () => {
contextFiles: [],
excludeTools: ['some-tool'],
id: '123',
rules: [
{
toolName: 'test-tool',
decision: PolicyDecision.ALLOW,
source: 'Extension (test-extension): policies.toml',
},
],
checkers: [
{
toolName: 'test-tool',
checker: { type: 'external', name: 'test-checker' },
source: 'Extension (test-extension): policies.toml',
},
],
};
const inactiveExtension: GeminiCLIExtension = {
name: 'test-extension',
isActive: false,
@@ -67,6 +89,12 @@ describe('SimpleExtensionLoader', () => {
mockHookSystemInit = vi.fn();
mockAgentRegistryReload = vi.fn();
mockSkillsReload = vi.fn();
mockPolicyEngine = {
addRule: vi.fn(),
addChecker: vi.fn(),
removeRulesBySource: vi.fn(),
removeCheckersBySource: vi.fn(),
};
mockConfig = {
getMcpClientManager: () => mockMcpClientManager,
getEnableExtensionReloading: () => extensionReloadingEnabled,
@@ -81,6 +109,7 @@ describe('SimpleExtensionLoader', () => {
reload: mockAgentRegistryReload,
}),
reloadSkills: mockSkillsReload,
getPolicyEngine: () => mockPolicyEngine,
} as unknown as Config;
});
@@ -88,6 +117,29 @@ describe('SimpleExtensionLoader', () => {
vi.restoreAllMocks();
});
it('should register policies when an extension starts', async () => {
const loader = new SimpleExtensionLoader([activeExtension]);
await loader.start(mockConfig);
expect(mockPolicyEngine.addRule).toHaveBeenCalledWith(
activeExtension.rules![0],
);
expect(mockPolicyEngine.addChecker).toHaveBeenCalledWith(
activeExtension.checkers![0],
);
});
it('should unregister policies when an extension stops', async () => {
const loader = new TestingSimpleExtensionLoader([activeExtension]);
await loader.start(mockConfig);
await loader.stopExtension(activeExtension);
expect(mockPolicyEngine.removeRulesBySource).toHaveBeenCalledWith(
'Extension (test-extension): policies.toml',
);
expect(mockPolicyEngine.removeCheckersBySource).toHaveBeenCalledWith(
'Extension (test-extension): policies.toml',
);
});
it('should start active extensions', async () => {
const loader = new SimpleExtensionLoader([activeExtension]);
await loader.start(mockConfig);

View File

@@ -75,6 +75,21 @@ export abstract class ExtensionLoader {
await this.config.getMcpClientManager()!.startExtension(extension);
await this.maybeRefreshGeminiTools(extension);
// Register policy rules and checkers
if (extension.rules || extension.checkers) {
const policyEngine = this.config.getPolicyEngine();
if (extension.rules) {
for (const rule of extension.rules) {
policyEngine.addRule(rule);
}
}
if (extension.checkers) {
for (const checker of extension.checkers) {
policyEngine.addChecker(checker);
}
}
}
// Note: Context files are loaded only once all extensions are done
// loading/unloading to reduce churn, see the `maybeRefreshMemories` call
// below.
@@ -168,6 +183,27 @@ export abstract class ExtensionLoader {
await this.config.getMcpClientManager()!.stopExtension(extension);
await this.maybeRefreshGeminiTools(extension);
// Unregister policy rules and checkers
if (extension.rules || extension.checkers) {
const policyEngine = this.config.getPolicyEngine();
const sources = new Set<string>();
if (extension.rules) {
for (const rule of extension.rules) {
if (rule.source) sources.add(rule.source);
}
}
if (extension.checkers) {
for (const checker of extension.checkers) {
if (checker.source) sources.add(checker.source);
}
}
for (const source of sources) {
policyEngine.removeRulesBySource(source);
policyEngine.removeCheckersBySource(source);
}
}
// Note: Context files are loaded only once all extensions are done
// loading/unloading to reduce churn, see the `maybeRefreshMemories` call
// below.