惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

WordPress大学
WordPress大学
腾讯CDC
阮一峰的网络日志
阮一峰的网络日志
GbyAI
GbyAI
B
Blog RSS Feed
Engineering at Meta
Engineering at Meta
Google DeepMind News
Google DeepMind News
MyScale Blog
MyScale Blog
Last Week in AI
Last Week in AI
F
Fortinet All Blogs
云风的 BLOG
云风的 BLOG
N
Netflix TechBlog - Medium
G
Google Developers Blog
博客园_首页
有赞技术团队
有赞技术团队
V
V2EX
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
MongoDB | Blog
MongoDB | Blog
H
Help Net Security
aimingoo的专栏
aimingoo的专栏
月光博客
月光博客
Hugging Face - Blog
Hugging Face - Blog
The GitHub Blog
The GitHub Blog
S
SegmentFault 最新的问题

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix: repair Google Meet media permission grants · opencla...
steipete · 2026-05-04 · via Recent Commits to openclaw:main

@@ -1,6 +1,9 @@

1+

import type { SsrFPolicy } from "../../infra/net/ssrf.js";

12

import { withCdpSocket } from "../cdp.helpers.js";

23

import { getChromeWebSocketUrl } from "../chrome.js";

4+

import { getPwAiModule } from "../pw-ai-module.js";

35

import type { BrowserRouteContext } from "../server-context.js";

6+

import type { ProfileContext } from "../server-context.js";

47

import type { BrowserRouteRegistrar } from "./types.js";

58

import {

69

asyncBrowserRoute,

@@ -10,11 +13,22 @@ import {

1013

toStringOrEmpty,

1114

} from "./utils.js";

121516+

const permissionRouteDeps = {

17+

getPwAiModule,

18+

};

19+20+

export const __testing = {

21+

setDepsForTest(deps: { getPwAiModule?: typeof getPwAiModule } | null) {

22+

permissionRouteDeps.getPwAiModule = deps?.getPwAiModule ?? getPwAiModule;

23+

},

24+

};

25+1326

type GrantPermissionsBody = {

1427

origin?: unknown;

1528

permissions?: unknown;

1629

optionalPermissions?: unknown;

1730

timeoutMs?: unknown;

31+

targetId?: unknown;

1832

};

19332034

function readOrigin(raw: unknown): string | null {

@@ -47,15 +61,45 @@ function readPermissions(raw: unknown): string[] | null {

4761

}

48624963

async function grantPermissions(params: {

64+

profileCtx: ProfileContext;

65+

targetId?: string;

5066

wsUrl: string;

5167

origin: string;

5268

requiredPermissions: string[];

5369

optionalPermissions: string[];

5470

timeoutMs: number;

71+

ssrfPolicy?: SsrFPolicy;

5572

}) {

5673

const allPermissions = [

5774

...new Set([...params.requiredPermissions, ...params.optionalPermissions]),

5875

];

76+

const playwrightRequiredPermissions = params.requiredPermissions.map(toPlaywrightPermission);

77+

const canUsePlaywright =

78+

playwrightRequiredPermissions.every((value): value is string => Boolean(value)) &&

79+

params.requiredPermissions.length > 0;

80+

if (canUsePlaywright) {

81+

const pw = await permissionRouteDeps.getPwAiModule({ mode: "soft" });

82+

if (pw) {

83+

try {

84+

const page = await pw.getPageForTargetId({

85+

cdpUrl: params.profileCtx.profile.cdpUrl,

86+

targetId: params.targetId,

87+

ssrfPolicy: params.ssrfPolicy,

88+

});

89+

await page.context().grantPermissions(playwrightRequiredPermissions, {

90+

origin: params.origin,

91+

});

92+

return {

93+

grantedPermissions: params.requiredPermissions,

94+

unsupportedPermissions: params.optionalPermissions,

95+

grantMethod: "playwright",

96+

};

97+

} catch {

98+

// Fall back to the raw CDP browser command below. Some routes call this

99+

// before a page exists, while attached browser profiles need Playwright.

100+

}

101+

}

102+

}

59103

let unsupportedPermissions: string[] = [];

60104

await withCdpSocket(

61105

params.wsUrl,

@@ -82,9 +126,21 @@ async function grantPermissions(params: {

82126

return {

83127

grantedPermissions: allPermissions.filter((value) => !unsupportedPermissions.includes(value)),

84128

unsupportedPermissions,

129+

grantMethod: "cdp",

85130

};

86131

}

87132133+

function toPlaywrightPermission(permission: string): string | undefined {

134+

switch (permission) {

135+

case "audioCapture":

136+

return "microphone";

137+

case "videoCapture":

138+

return "camera";

139+

default:

140+

return undefined;

141+

}

142+

}

143+88144

export function registerBrowserPermissionRoutes(

89145

app: BrowserRouteRegistrar,

90146

ctx: BrowserRouteContext,

@@ -107,6 +163,7 @@ export function registerBrowserPermissionRoutes(

107163

return jsonError(res, 400, "permissions must be a non-empty string array");

108164

}

109165

const optionalPermissions = readPermissions(body.optionalPermissions ?? []) ?? [];

166+

const targetId = toStringOrEmpty(body.targetId) || undefined;

110167

const timeoutMs = Math.max(1_000, toNumber(body.timeoutMs) ?? 5_000);

111168112169

try {

@@ -120,11 +177,14 @@ export function registerBrowserPermissionRoutes(

120177

return jsonError(res, 409, "browser CDP WebSocket unavailable");

121178

}

122179

const granted = await grantPermissions({

180+

profileCtx,

181+

targetId,

123182

wsUrl,

124183

origin,

125184

requiredPermissions,

126185

optionalPermissions,

127186

timeoutMs,

187+

ssrfPolicy: ctx.state().resolved.ssrfPolicy,

128188

});

129189

return res.json({ ok: true, origin, ...granted });

130190

} catch (error) {