fix(google-meet): bound google api error bodies · opencla...

Recent Commits to openclaw:main

vincentkoc · 2026-06-19 · via Recent Commits to openclaw:main

File tree

extensions/google-meet/src

Original file line number	Diff line number	Diff line change
`@@ -191,10 +191,8 @@ async function fetchGoogleCalendarEvents(params: {`
`191`	`191`	`});`
`192`	`192`	`try {`
`193`	`193`	`if (!response.ok) {`
`194`		`-const detail = await response.text();`
`195`	`194`	`throw await googleApiError({`
`196`	`195`	`response,`
`197`		`- detail,`
`198`	`196`	`prefix: "Google Calendar events.list",`
`199`	`197`	`scopes: [GOOGLE_CALENDAR_EVENTS_SCOPE],`
`200`	`198`	`});`

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,8 @@ export async function exportGoogleDriveDocumentText(params: {`
`58`	`58`	`});`
`59`	`59`	`try {`
`60`	`60`	`if (!response.ok) {`
`61`		`-const detail = await response.text();`
`62`	`61`	`throw await googleApiError({`
`63`	`62`	`response,`
`64`		`- detail,`
`65`	`63`	`prefix: "Google Drive files.export",`
`66`	`64`	`scopes: [GOOGLE_DRIVE_MEET_SCOPE],`
`67`	`65`	`});`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,47 @@`
	`1`	`+// Google Meet tests cover bounded Google API error handling.`
	`2`	`+import { describe, expect, it, vi } from "vitest";`
	`3`	`+import { googleApiError } from "./google-api-errors.js";`
	`4`	`+`
	`5`	`+function cancelTrackedResponse(`
	`6`	`+text: string,`
	`7`	`+init: ResponseInit,`
	`8`	`+): {`
	`9`	`+response: Response;`
	`10`	`+wasCanceled: () => boolean;`
	`11`	`+} {`
	`12`	`+let canceled = false;`
	`13`	`+const stream = new ReadableStream<Uint8Array>({`
	`14`	`+start(controller) {`
	`15`	`+controller.enqueue(new TextEncoder().encode(text));`
	`16`	`+},`
	`17`	`+cancel() {`
	`18`	`+canceled = true;`
	`19`	`+},`
	`20`	`+});`
	`21`	`+return {`
	`22`	`+response: new Response(stream, init),`
	`23`	`+wasCanceled: () => canceled,`
	`24`	`+};`
	`25`	`+}`
	`26`	`+`
	`27`	`+describe("googleApiError", () => {`
	`28`	`+it("bounds Google API error bodies without using response.text()", async () => {`
	`29`	+const tracked = cancelTrackedResponse(`${"access denied ".repeat(1024)}tail`, {
	`30`	`+status: 403,`
	`31`	`+headers: { "content-type": "text/plain" },`
	`32`	`+});`
	`33`	`+const textSpy = vi.spyOn(tracked.response, "text").mockRejectedValue(new Error("unbounded"));`
	`34`	`+`
	`35`	`+const error = await googleApiError({`
	`36`	`+response: tracked.response,`
	`37`	`+prefix: "Google Meet spaces.get",`
	`38`	`+scopes: ["https://www.googleapis.com/auth/meetings.space.readonly"],`
	`39`	`+});`
	`40`	`+`
	`41`	`+expect(error.message).toContain("Google Meet spaces.get failed (403): access denied");`
	`42`	`+expect(error.message).not.toContain("tail");`
	`43`	`+expect(error.message.length).toBeLessThan(8_400);`
	`44`	`+expect(tracked.wasCanceled()).toBe(true);`
	`45`	`+expect(textSpy).not.toHaveBeenCalled();`
	`46`	`+});`
	`47`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,26 @@`
`1`	`1`	`// Google Meet plugin module implements google api errors behavior.`
	`2`	`+import { readResponseTextLimited } from "openclaw/plugin-sdk/provider-http";`
	`3`	`+`
`2`	`4`	const REAUTH_HINT = "Re-run `openclaw googlemeet auth login` and store the refreshed oauth block.";
	`5`	`+const GOOGLE_API_ERROR_BODY_LIMIT_BYTES = 8 * 1024;`
`3`	`6`
`4`	`7`	`function scopeText(scopes: readonly string[]): string {`
`5`	`8`	return scopes.map((scope) => `\`${scope}\``).join(", ");
`6`	`9`	`}`
`7`	`10`
	`11`	`+export async function readGoogleApiErrorDetail(response: Response): Promise<string> {`
	`12`	`+return await readResponseTextLimited(response, GOOGLE_API_ERROR_BODY_LIMIT_BYTES);`
	`13`	`+}`
	`14`	`+`
`8`	`15`	`export async function googleApiError(params: {`
`9`	`16`	`response: Response;`
`10`		`-detail: string;`
`11`	`17`	`prefix: string;`
`12`	`18`	`scopes?: readonly string[];`
`13`	`19`	`}): Promise<Error> {`
	`20`	`+const detail = await readGoogleApiErrorDetail(params.response);`
`14`	`21`	`const scopeHint =`
`15`	`22`	`params.scopes && params.scopes.length > 0`
`16`	`23`	? ` Required OAuth scope: ${scopeText(params.scopes)}. ${REAUTH_HINT}`
`17`	`24`	`: "";`
`18`		`-return new Error(`
`19`		-`${params.prefix} failed (${params.response.status}): ${params.detail}${scopeHint}`,
`20`		`-);`
	`25`	+return new Error(`${params.prefix} failed (${params.response.status}): ${detail}${scopeHint}`);
`21`	`26`	`}`

Original file line number	Diff line number	Diff line change
`@@ -283,10 +283,8 @@ async function fetchGoogleMeetJson<T>(params: {`
`283`	`283`	`});`
`284`	`284`	`try {`
`285`	`285`	`if (!response.ok) {`
`286`		`-const detail = await response.text();`
`287`	`286`	`throw await googleApiError({`
`288`	`287`	`response,`
`289`		`- detail,`
`290`	`288`	`prefix: params.errorPrefix,`
`291`	`289`	`scopes: [GOOGLE_MEET_MEDIA_SCOPE],`
`292`	`290`	`});`
`@@ -350,10 +348,8 @@ export async function fetchGoogleMeetSpace(params: {`
`350`	`348`	`});`
`351`	`349`	`try {`
`352`	`350`	`if (!response.ok) {`
`353`		`-const detail = await response.text();`
`354`	`351`	`throw await googleApiError({`
`355`	`352`	`response,`
`356`		`- detail,`
`357`	`353`	`prefix: "Google Meet spaces.get",`
`358`	`354`	`scopes: [GOOGLE_MEET_SPACE_SCOPE],`
`359`	`355`	`});`
`@@ -392,10 +388,8 @@ export async function createGoogleMeetSpace(params: {`
`392`	`388`	`});`
`393`	`389`	`try {`
`394`	`390`	`if (!response.ok) {`
`395`		`-const detail = await response.text();`
`396`	`391`	`throw await googleApiError({`
`397`	`392`	`response,`
`398`		`- detail,`
`399`	`393`	`prefix: "Google Meet spaces.create",`
`400`	`394`	`scopes:`
`401`	`395`	`params.config && Object.keys(params.config).length > 0`
`@@ -442,10 +436,8 @@ export async function endGoogleMeetActiveConference(params: {`
`442`	`436`	`});`
`443`	`437`	`try {`
`444`	`438`	`if (!response.ok) {`
`445`		`-const detail = await response.text();`
`446`	`439`	`throw await googleApiError({`
`447`	`440`	`response,`
`448`		`- detail,`
`449`	`441`	`prefix: "Google Meet spaces.endActiveConference",`
`450`	`442`	`scopes: [GOOGLE_MEET_SPACE_CREATED_SCOPE],`
`451`	`443`	`});`

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import {`
`11`	`11`	`waitForLocalOAuthCallback,`
`12`	`12`	`} from "openclaw/plugin-sdk/provider-auth-runtime";`
`13`	`13`	`import { fetchWithSsrFGuard } from "openclaw/plugin-sdk/ssrf-runtime";`
	`14`	`+import { readGoogleApiErrorDetail } from "./google-api-errors.js";`
`14`	`15`
`15`	`16`	`const GOOGLE_MEET_REDIRECT_URI = "http://localhost:8085/oauth2callback";`
`16`	`17`	`const GOOGLE_MEET_AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";`
`@@ -85,7 +86,7 @@ async function executeGoogleTokenRequest(body: URLSearchParams): Promise<GoogleM`
`85`	`86`	`});`
`86`	`87`	`try {`
`87`	`88`	`if (!response.ok) {`
`88`		`-const detail = await response.text();`
	`89`	`+const detail = await readGoogleApiErrorDetail(response);`
`89`	`90`	throw new Error(`Google OAuth token request failed (${response.status}): ${detail}`);
`90`	`91`	`}`
`91`	`92`	`const payload = (await response.json()) as {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main

File tree