fix(gateway/schema): require hello-ok auth · openclaw/openclaw@4f50921

Recent Commits to openclaw:main

martingarram · 2026-04-27 · via Recent Commits to openclaw:main

File tree

apps
- macos
  - Sources/OpenClawProtocol
  - Tests/OpenClawIPCTests
- shared/OpenClawKit/Sources
  - OpenClawKit
  - OpenClawProtocol
docs/gateway
src/gateway/protocol/schema
ui/src/ui
- controllers

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public struct HelloOk: Codable, Sendable {`
`82`	`82`	`public let features: [String: AnyCodable]`
`83`	`83`	`public let snapshot: Snapshot`
`84`	`84`	`public let canvashosturl: String?`
`85`		`-public let auth: [String: AnyCodable]?`
	`85`	`+public let auth: [String: AnyCodable]`
`86`	`86`	`public let policy: [String: AnyCodable]`
`87`	`87`
`88`	`88`	`public init(`
`@@ -92,7 +92,7 @@ public struct HelloOk: Codable, Sendable {`
`92`	`92`	`features: [String: AnyCodable],`
`93`	`93`	`snapshot: Snapshot,`
`94`	`94`	`canvashosturl: String?,`
`95`		`- auth: [String: AnyCodable]?,`
	`95`	`+ auth: [String: AnyCodable],`
`96`	`96`	`policy: [String: AnyCodable])`
`97`	`97`	`{`
`98`	`98`	`self.type = type`

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ enum GatewayWebSocketTestSupport {`
`45`	`45`	`"stateVersion": { "presence": 0, "health": 0 },`
`46`	`46`	`"uptimeMs": 0`
`47`	`47`	`},`
	`48`	`+ "auth": { "role": "operator", "scopes": [] },`
`48`	`49`	`"policy": { "maxPayload": 1, "maxBufferedBytes": 1, "tickIntervalMs": 30000 }`
`49`	`50`	`}`
`50`	`51`	`}`

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ struct MacGatewayChatTransportMappingTests {`
`23`	`23`	`features: [:],`
`24`	`24`	`snapshot: snapshot,`
`25`	`25`	`canvashosturl: nil,`
`26`		`- auth: nil,`
	`26`	`+ auth: [:],`
`27`	`27`	`policy: [:])`
`28`	`28`
`29`	`29`	`let mapped = MacGatewayChatTransport.mapPushToTransportEvent(.snapshot(hello))`

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,8 @@ public actor GatewayChannelActor {`
`663`	`663`	`} else if let tick = ok.policy["tickIntervalMs"]?.value as? Int {`
`664`	`664`	`self.tickIntervalMs = Double(tick)`
`665`	`665`	`}`
`666`		`-if let auth = ok.auth, let identity {`
	`666`	`+let auth = ok.auth`
	`667`	`+if let identity {`
`667`	`668`	`if let deviceToken = auth["deviceToken"]?.value as? String {`
`668`	`669`	`let authRole = auth["role"]?.value as? String ?? role`
`669`	`670`	`let scopes = (auth["scopes"]?.value as? [ProtoAnyCodable])?`

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public struct HelloOk: Codable, Sendable {`
`82`	`82`	`public let features: [String: AnyCodable]`
`83`	`83`	`public let snapshot: Snapshot`
`84`	`84`	`public let canvashosturl: String?`
`85`		`-public let auth: [String: AnyCodable]?`
	`85`	`+public let auth: [String: AnyCodable]`
`86`	`86`	`public let policy: [String: AnyCodable]`
`87`	`87`
`88`	`88`	`public init(`
`@@ -92,7 +92,7 @@ public struct HelloOk: Codable, Sendable {`
`92`	`92`	`features: [String: AnyCodable],`
`93`	`93`	`snapshot: Snapshot,`
`94`	`94`	`canvashosturl: String?,`
`95`		`- auth: [String: AnyCodable]?,`
	`95`	`+ auth: [String: AnyCodable],`
`96`	`96`	`policy: [String: AnyCodable])`
`97`	`97`	`{`
`98`	`98`	`self.type = type`

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,10 @@ Gateway → Client:`
`84`	`84`	`"server": { "version": "…", "connId": "…" },`
`85`	`85`	`"features": { "methods": ["…"], "events": ["…"] },`
`86`	`86`	`"snapshot": { "…": "…" },`
	`87`	`+"auth": {`
	`88`	`+"role": "operator",`
	`89`	`+"scopes": ["operator.read", "operator.write"]`
	`90`	`+ },`
`87`	`91`	`"policy": {`
`88`	`92`	`"maxPayload": 26214400,`
`89`	`93`	`"maxBufferedBytes": 52428800,`
`@@ -94,12 +98,11 @@ Gateway → Client:`
`94`	`98`	```
`95`	`99`
`96`	`100`	`server`, `features`, `snapshot`, and `policy` are all required by the schema
`97`		-(`src/gateway/protocol/schema/frames.ts`). `canvasHostUrl` is optional. `auth`
`98`		-reports the negotiated role/scopes when available, and includes `deviceToken`
`99`		`-when the gateway issues one.`
	`101`	+(`src/gateway/protocol/schema/frames.ts`). `auth` is also required and reports
	`102`	+the negotiated role/scopes. `canvasHostUrl` is optional.
`100`	`103`
`101`		-When no device token is issued, `hello-ok.auth` can still report the negotiated
`102`		`-permissions:`
	`104`	+When no device token is issued, `hello-ok.auth` reports the negotiated
	`105`	`+permissions without token fields:`
`103`	`106`
`104`	`107`	```json
`105`	`108`	`{`

Original file line number	Diff line number	Diff line change
`@@ -89,29 +89,27 @@ export const HelloOkSchema = Type.Object(`
`89`	`89`	`),`
`90`	`90`	`snapshot: SnapshotSchema,`
`91`	`91`	`canvasHostUrl: Type.Optional(NonEmptyString),`
`92`		`-auth: Type.Optional(`
`93`		`-Type.Object(`
`94`		`-{`
`95`		`-deviceToken: Type.Optional(NonEmptyString),`
`96`		`-role: NonEmptyString,`
`97`		`-scopes: Type.Array(NonEmptyString),`
`98`		`-issuedAtMs: Type.Optional(Type.Integer({ minimum: 0 })),`
`99`		`-deviceTokens: Type.Optional(`
`100`		`-Type.Array(`
`101`		`-Type.Object(`
`102`		`-{`
`103`		`-deviceToken: NonEmptyString,`
`104`		`-role: NonEmptyString,`
`105`		`-scopes: Type.Array(NonEmptyString),`
`106`		`-issuedAtMs: Type.Integer({ minimum: 0 }),`
`107`		`-},`
`108`		`-{ additionalProperties: false },`
`109`		`-),`
	`92`	`+auth: Type.Object(`
	`93`	`+{`
	`94`	`+deviceToken: Type.Optional(NonEmptyString),`
	`95`	`+role: NonEmptyString,`
	`96`	`+scopes: Type.Array(NonEmptyString),`
	`97`	`+issuedAtMs: Type.Optional(Type.Integer({ minimum: 0 })),`
	`98`	`+deviceTokens: Type.Optional(`
	`99`	`+Type.Array(`
	`100`	`+Type.Object(`
	`101`	`+{`
	`102`	`+deviceToken: NonEmptyString,`
	`103`	`+role: NonEmptyString,`
	`104`	`+scopes: Type.Array(NonEmptyString),`
	`105`	`+issuedAtMs: Type.Integer({ minimum: 0 }),`
	`106`	`+},`
	`107`	`+{ additionalProperties: false },`
`110`	`108`	`),`
`111`	`109`	`),`
`112`		`-},`
`113`		`- { additionalProperties: false },`
`114`		`-),`
	`110`	`+),`
	`111`	`+},`
	`112`	`+{ additionalProperties: false },`
`115`	`113`	`),`
`116`	`114`	`policy: Type.Object(`
`117`	`115`	`{`

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ vi.mock("./gateway.ts", async (importOriginal) => {`
`76`	`76`	`type: "hello-ok",`
`77`	`77`	`protocol: 3,`
`78`	`78`	`snapshot: {},`
	`79`	`+auth: { role: "operator", scopes: [] },`
`79`	`80`	`},`
`80`	`81`	`);`
`81`	`82`	`},`
`@@ -314,6 +315,7 @@ describe("connectGateway", () => {`
`314`	`315`	`type: "hello-ok",`
`315`	`316`	`protocol: 3,`
`316`	`317`	`server: { version: "2.0.0" },`
	`318`	`+auth: { role: "operator", scopes: [] },`
`317`	`319`	`snapshot: {},`
`318`	`320`	`});`
`319`	`321`
`@@ -349,6 +351,7 @@ describe("connectGateway", () => {`
`349`	`351`	`type: "hello-ok",`
`350`	`352`	`protocol: 3,`
`351`	`353`	`server: { version: "1.0.0" },`
	`354`	`+auth: { role: "operator", scopes: [] },`
`352`	`355`	`snapshot: {},`
`353`	`356`	`});`
`354`	`357`
`@@ -387,6 +390,7 @@ describe("connectGateway", () => {`
`387`	`390`	`type: "hello-ok",`
`388`	`391`	`protocol: 3,`
`389`	`392`	`server: { version: "1.0.0" },`
	`393`	`+auth: { role: "operator", scopes: [] },`
`390`	`394`	`snapshot: {},`
`391`	`395`	`});`
`392`	`396`

Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,7 @@ describe("dreaming controller", () => {`
`231`	`231`	`state.hello = {`
`232`	`232`	`type: "hello-ok",`
`233`	`233`	`protocol: 3,`
	`234`	`+auth: { role: "operator", scopes: [] },`
`234`	`235`	`features: { methods: ["wiki.importInsights"] },`
`235`	`236`	`};`
`236`	`237`	`state.configSnapshot = {`
`@@ -366,6 +367,7 @@ describe("dreaming controller", () => {`
`366`	`367`	`state.hello = {`
`367`	`368`	`type: "hello-ok",`
`368`	`369`	`protocol: 3,`
	`370`	`+auth: { role: "operator", scopes: [] },`
`369`	`371`	`features: { methods: ["doctor.memory.status"] },`
`370`	`372`	`};`
`371`	`373`	`state.configSnapshot = {`
`@@ -401,6 +403,7 @@ describe("dreaming controller", () => {`
`401`	`403`	`state.hello = {`
`402`	`404`	`type: "hello-ok",`
`403`	`405`	`protocol: 3,`
	`406`	`+auth: { role: "operator", scopes: [] },`
`404`	`407`	`features: { methods: ["wiki.palace"] },`
`405`	`408`	`};`
`406`	`409`	`state.configSnapshot = {`
`@@ -536,6 +539,7 @@ describe("dreaming controller", () => {`
`536`	`539`	`state.hello = {`
`537`	`540`	`type: "hello-ok",`
`538`	`541`	`protocol: 3,`
	`542`	`+auth: { role: "operator", scopes: [] },`
`539`	`543`	`features: { methods: ["doctor.memory.status"] },`
`540`	`544`	`};`
`541`	`545`	`state.configSnapshot = {`

Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,10 @@ export type GatewayHelloOk = {`
`118`	`118`	`};`
`119`	`119`	`features?: { methods?: string[]; events?: string[] };`
`120`	`120`	`snapshot?: unknown;`
`121`		`-auth?: {`
	`121`	`+auth: {`
`122`	`122`	`deviceToken?: string;`
`123`		`-role?: string;`
`124`		`-scopes?: string[];`
	`123`	`+role: string;`
	`124`	`+scopes: string[];`
`125`	`125`	`issuedAtMs?: number;`
`126`	`126`	`};`
`127`	`127`	`canvasHostUrl?: string;`

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

推荐订阅源

Recent Commits to openclaw:main

File tree