@bitkyc08/opencodex 2.99.0 → 2.100.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS_INSTALL.md +19 -1
- package/README.md +37 -33
- package/SPONSORS.md +5 -1
- package/bin/ocx.mjs +1 -1
- package/gui/dist/assets/{App-C1hGwaN1.css → App-COo8Yopd.css} +1 -1
- package/gui/dist/assets/App-CitvEefy.js +59 -0
- package/gui/dist/assets/Tray-CeKVWQyB.js +1 -0
- package/gui/dist/assets/{brand-mark-wzPe3R-J.js → brand-mark-M92UnxX2.js} +1 -1
- package/gui/dist/assets/index-BP47do6-.js +94 -0
- package/gui/dist/assets/index-DmDooSAG.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-fYEMxBaW.js → segment-thumb-features-CcxZBnxv.js} +1 -1
- package/gui/dist/classic/assets/App-aYgIQMxI.js +58 -0
- package/gui/dist/classic/assets/{Tray-BqZueZOx.js → Tray-D8jfUXpQ.js} +1 -1
- package/gui/dist/classic/assets/index-CfGqHooN.js +94 -0
- package/gui/dist/classic/assets/quota-summary-R-ih7OlS.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +215 -0
- package/native/ocx-child/Cargo.toml +31 -0
- package/native/ocx-child/src/cli.rs +1901 -0
- package/native/ocx-child/src/codex_home.rs +429 -0
- package/native/ocx-child/src/codex_settings.rs +231 -0
- package/native/ocx-child/src/daemon.rs +363 -0
- package/native/ocx-child/src/http_wire.rs +619 -0
- package/native/ocx-child/src/journal.rs +977 -0
- package/native/ocx-child/src/lib.rs +22 -0
- package/native/ocx-child/src/main.rs +9 -0
- package/native/ocx-child/src/parity.rs +102 -0
- package/native/ocx-child/src/platform.rs +1487 -0
- package/native/ocx-child/src/relay.rs +1288 -0
- package/native/ocx-child/src/relay_auth.rs +166 -0
- package/native/ocx-child/src/routes.rs +236 -0
- package/native/ocx-child/src/state.rs +190 -0
- package/native/ocx-child/src/test_hooks.rs +58 -0
- package/native/ocx-child/src/toml_surgeon.rs +1156 -0
- package/package.json +8 -2
- package/src/adapters/anthropic.ts +28 -2
- package/src/adapters/claude-cli/adapter.ts +5 -25
- package/src/adapters/claude-cli/instruction-images.ts +31 -0
- package/src/adapters/claude-cli/stable-replay.ts +42 -14
- package/src/adapters/claude-cli/usage-admission.ts +53 -64
- package/src/adapters/coding-agent/protocol.ts +1 -1
- package/src/adapters/devin/live-models.ts +3 -0
- package/src/adapters/google-http.ts +3 -0
- package/src/adapters/google-vertex-key-project.ts +10 -2
- package/src/adapters/google.ts +40 -8
- package/src/adapters/kiro/usage.ts +3 -13
- package/src/adapters/openai-responses/passthrough.ts +5 -2
- package/src/adapters/openai-responses/request-strips.ts +32 -0
- package/src/adapters/openai-responses/tool-schema.ts +9 -4
- package/src/chat/inbound.ts +1 -1
- package/src/claude/auth-detect.ts +26 -8
- package/src/claude/inbound-content-options.ts +18 -3
- package/src/claude/inbound.ts +5 -2
- package/src/cli/bundled-bun-diagnostic.ts +91 -0
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +60 -0
- package/src/cli/combo-input.ts +6 -0
- package/src/cli/combo-result.ts +1 -1
- package/src/cli/combo.ts +4 -0
- package/src/cli/config-command.ts +16 -2
- package/src/cli/connect.ts +12 -10
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/doctor.ts +11 -0
- package/src/cli/help.ts +1 -0
- package/src/cli/init.ts +4 -0
- package/src/cli/link-enrollment.ts +152 -25
- package/src/cli/link-local-control.ts +49 -0
- package/src/cli/link.ts +37 -10
- package/src/cli/provider-lifecycle-runtime.ts +4 -2
- package/src/cli/registry.ts +13 -0
- package/src/cli/star-prompt.ts +2 -0
- package/src/cli/status.ts +1 -1
- package/src/cli/telemetry-profile.ts +206 -0
- package/src/cli/telemetry.ts +260 -0
- package/src/client/hub-relay.ts +26 -0
- package/src/client/machine-api.ts +3 -0
- package/src/clients/config-export/t3code.ts +44 -5
- package/src/clients/omo-role-models.ts +1 -1
- package/src/codex/catalog/bundled.ts +44 -2
- package/src/codex/runtime.ts +12 -0
- package/src/codex/shim-restore-lock.ts +67 -30
- package/src/combos/types.ts +21 -1
- package/src/config/atomic-write.ts +24 -1
- package/src/config/diagnostics.ts +15 -0
- package/src/config/live-reconcile.ts +17 -0
- package/src/config/load-degrade.ts +16 -0
- package/src/config/provider-validation.ts +29 -0
- package/src/config/schema/config-schema.ts +24 -0
- package/src/config/schema/leaf-validators.ts +17 -0
- package/src/config/telemetry-carry.ts +30 -0
- package/src/config.ts +13 -1
- package/src/generated/compatibility-version.json +405 -153
- package/src/generated/model-metadata.ts +3 -3
- package/src/integrations/aside-profiles.ts +7 -1
- package/src/integrations/owned-refresh.ts +9 -2
- package/src/lab/artifacts/secure-fs.ts +12 -11
- package/src/lab/fabric/scratch.ts +11 -9
- package/src/lab/public/community.ts +2 -3
- package/src/lab/public/file-safety.ts +18 -20
- package/src/lab/public/mutation-lock.ts +109 -337
- package/src/lab/public/private-file.ts +4 -3
- package/src/lib/bun-runtime-preflight.ts +1 -1
- package/src/lib/codex-catalog-read-only.ts +122 -0
- package/src/lib/config-ownership.ts +49 -18
- package/src/lib/errors.ts +11 -0
- package/src/lib/gcp-adc.ts +167 -48
- package/src/lib/jsonc.ts +4 -2
- package/src/lib/local-control-socket.ts +88 -0
- package/src/lib/privacy.ts +15 -0
- package/src/lib/provider-client-headers.ts +3 -0
- package/src/lib/token-estimate.ts +13 -2
- package/src/link/child-binary-source.ts +228 -0
- package/src/link/ephemeral-child.ts +45 -0
- package/src/link/remote-plant.ts +306 -0
- package/src/link/remote-windows.ts +59 -5
- package/src/link/ssh-argv.ts +71 -8
- package/src/link/status-projection.ts +2 -0
- package/src/link/store.ts +5 -1
- package/src/oauth/claude-keychain-read.ts +165 -0
- package/src/oauth/local-token-detect.ts +14 -17
- package/src/protocols/envelope.ts +20 -2
- package/src/providers/api-key-selection.ts +8 -2
- package/src/providers/claude-cli-usage-state.ts +93 -0
- package/src/providers/github-copilot-auto.ts +25 -5
- package/src/providers/meta-muse-plan-refusal.ts +94 -0
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/quota/vendor-probes-key.ts +23 -4
- package/src/providers/quota/vendor-probes-oauth.ts +59 -0
- package/src/providers/quota/workbuddy.ts +2 -2
- package/src/providers/quota.ts +25 -18
- package/src/providers/registry/entries-core.ts +7 -4
- package/src/providers/registry/entries-extended.ts +39 -7
- package/src/providers/registry/model-seeds.ts +10 -2
- package/src/providers/resolved-model-policy.ts +4 -0
- package/src/providers/routed-config.ts +30 -3
- package/src/providers/stale-no-vision-seed-migration.ts +7 -0
- package/src/providers/vertex-environment-authority.ts +50 -0
- package/src/providers/workbuddy-credit-balance.ts +38 -6
- package/src/quota-pool/assemble.ts +14 -6
- package/src/router.ts +1 -0
- package/src/server/adapter-resolve.ts +11 -6
- package/src/server/audio-dictation.ts +21 -7
- package/src/server/auth-cors.ts +19 -0
- package/src/server/background-lifecycle.ts +71 -0
- package/src/server/chat-completions.ts +2 -0
- package/src/server/claude-messages.ts +30 -3
- package/src/server/index/live-sideband.ts +15 -1
- package/src/server/index/local-control-listener.ts +515 -0
- package/src/server/index/optional-listeners.ts +21 -1
- package/src/server/index/serve-options.ts +4 -3
- package/src/server/index/websocket-handler.ts +2 -0
- package/src/server/index.ts +3 -0
- package/src/server/management/combo-routes.ts +6 -1
- package/src/server/management/context.ts +1 -0
- package/src/server/management/link-child-preflight.ts +74 -0
- package/src/server/management/link-enrollment.ts +190 -25
- package/src/server/management/link-route-state.ts +6 -1
- package/src/server/management/link-routes.ts +27 -9
- package/src/server/management/model-rows.ts +4 -0
- package/src/server/management/oauth-account-routes.ts +9 -4
- package/src/server/management/provider-overwrite-carry.ts +9 -2
- package/src/server/management/provider-routes.ts +14 -0
- package/src/server/management/provider-thinking-display-patch.ts +54 -0
- package/src/server/management/route-registry.ts +7 -0
- package/src/server/management/session-routes.ts +4 -1
- package/src/server/management/telemetry-routes.ts +37 -0
- package/src/server/management/usage-aggregate-cache.ts +290 -67
- package/src/server/management-api.ts +11 -2
- package/src/server/messages-native-preflight.ts +166 -0
- package/src/server/messages-native.ts +143 -43
- package/src/server/messages-shared.ts +14 -0
- package/src/server/proxy-liveness.ts +99 -6
- package/src/server/request-log-conversation.ts +18 -2
- package/src/server/request-log.ts +7 -2
- package/src/server/responses/adapter-continuation.ts +1 -0
- package/src/server/responses/adapter-dispatch.ts +11 -28
- package/src/server/responses/adapter-failure-message.ts +68 -0
- package/src/server/responses/combo-stream-preflight.ts +14 -2
- package/src/server/responses/core-auth.ts +26 -5
- package/src/server/responses/core-codex-account.ts +8 -1
- package/src/server/responses/core-combo-failure.ts +6 -1
- package/src/server/responses/core-combo-native.ts +150 -37
- package/src/server/responses/core-combo.ts +15 -9
- package/src/server/responses/core-normalize.ts +1 -0
- package/src/server/responses/core-options.ts +7 -1
- package/src/server/responses/core-pipeline.ts +21 -1
- package/src/server/responses/fetch-helpers.ts +5 -0
- package/src/server/responses/opengateway-completion-guard.ts +7 -3
- package/src/server/responses/passthrough-delivery.ts +8 -1
- package/src/server/responses/passthrough-error.ts +22 -0
- package/src/server/responses/request-prepare.ts +7 -1
- package/src/server/responses/request-transport.ts +28 -5
- package/src/server/responses/run-turn-execution.ts +13 -0
- package/src/server/sse-frame-buffer.ts +5 -0
- package/src/server/ws-bridge.ts +10 -0
- package/src/service/launchd.ts +78 -4
- package/src/telemetry/aggregate.ts +348 -0
- package/src/telemetry/consent.ts +128 -0
- package/src/telemetry/contract.ts +403 -0
- package/src/telemetry/disclosure.ts +19 -0
- package/src/telemetry/install-id.ts +226 -0
- package/src/telemetry/payload.ts +129 -0
- package/src/telemetry/profile/client.ts +150 -0
- package/src/telemetry/profile/contract.ts +288 -0
- package/src/telemetry/profile/disclosure.ts +14 -0
- package/src/telemetry/profile/paths.ts +13 -0
- package/src/telemetry/profile/routes.ts +99 -0
- package/src/telemetry/profile/service.ts +234 -0
- package/src/telemetry/profile/state.ts +189 -0
- package/src/telemetry/profile/sync.ts +276 -0
- package/src/telemetry/routes.ts +183 -0
- package/src/telemetry/scheduler.ts +386 -0
- package/src/telemetry/sender.ts +97 -0
- package/src/telemetry/state.ts +334 -0
- package/src/types/combo-jev-effort-mode.ts +11 -0
- package/src/types/config.ts +3 -0
- package/src/types/provider.ts +11 -1
- package/src/types/request.ts +2 -0
- package/src/types/telemetry.ts +15 -0
- package/src/types/wire.ts +10 -0
- package/src/types.ts +5 -0
- package/src/update/index.ts +7 -1
- package/src/update/minisign.d.mts +17 -0
- package/src/update/minisign.mjs +88 -0
- package/src/update/signed-supply.d.mts +59 -0
- package/src/update/signed-supply.mjs +289 -0
- package/src/update/trust-root.json +38 -0
- package/src/update/update-bounded-json.d.mts +4 -0
- package/src/update/update-bounded-json.mjs +113 -0
- package/src/update/update-bytes.d.mts +2 -0
- package/src/update/update-bytes.mjs +23 -0
- package/src/update/update-candidate-id.d.mts +2 -0
- package/src/update/update-candidate-id.mjs +23 -0
- package/src/update/update-checkpoint-codec.d.mts +33 -0
- package/src/update/update-checkpoint-codec.mjs +217 -0
- package/src/update/update-contracts.d.mts +24 -0
- package/src/update/update-contracts.mjs +207 -0
- package/src/update/update-signature-threshold.d.mts +12 -0
- package/src/update/update-signature-threshold.mjs +47 -0
- package/src/update/update-signed-version.d.mts +5 -0
- package/src/update/update-signed-version.mjs +25 -0
- package/src/update/update-trust-anchor.d.mts +2 -0
- package/src/update/update-trust-anchor.mjs +2 -0
- package/src/usage/cache-diagnostic.ts +195 -50
- package/src/usage/expected-prices.ts +20 -2
- package/src/usage/filter-index.ts +1469 -0
- package/src/usage/ledger-scanner.ts +245 -4
- package/src/usage/source-filter.ts +10 -2
- package/src/usage/summary.ts +16 -0
- package/src/web-search/parse.ts +244 -38
- package/gui/dist/assets/App-BepstgEN.js +0 -59
- package/gui/dist/assets/Tray-BinxbEZo.js +0 -1
- package/gui/dist/assets/index-C-9X2yaI.js +0 -94
- package/gui/dist/assets/index-bnUWypyz.css +0 -2
- package/gui/dist/classic/assets/App-DX88_GCW.js +0 -58
- package/gui/dist/classic/assets/index-fSP71pLB.js +0 -94
- package/gui/dist/classic/assets/quota-summary-y2fl0WBv.js +0 -1
|
@@ -0,0 +1,619 @@
|
|
|
1
|
+
use std::collections::HashSet;
|
|
2
|
+
use std::io::{self, BufRead, Write};
|
|
3
|
+
|
|
4
|
+
pub const HUB_RELAY_HEADER_MAX_BYTES: usize = 64 * 1024;
|
|
5
|
+
pub const LINK_RELAY_BODY_MAX_BYTES: u64 = 256 * 1024 * 1024;
|
|
6
|
+
pub const HUB_RELAY_RESPONSE_BODY_MAX_BYTES: u64 = 16 * 1024 * 1024;
|
|
7
|
+
|
|
8
|
+
pub const CALLER_CREDENTIAL_HEADERS: &[&str] = &[
|
|
9
|
+
"authorization",
|
|
10
|
+
"api-key",
|
|
11
|
+
"x-api-key",
|
|
12
|
+
"x-goog-api-key",
|
|
13
|
+
"x-opencodex-api-key",
|
|
14
|
+
"chatgpt-account-id",
|
|
15
|
+
"cookie",
|
|
16
|
+
];
|
|
17
|
+
|
|
18
|
+
pub const HOP_BY_HOP_HEADERS: &[&str] = &[
|
|
19
|
+
"connection",
|
|
20
|
+
"keep-alive",
|
|
21
|
+
"proxy-authenticate",
|
|
22
|
+
"proxy-authorization",
|
|
23
|
+
"te",
|
|
24
|
+
"trailer",
|
|
25
|
+
"transfer-encoding",
|
|
26
|
+
"upgrade",
|
|
27
|
+
];
|
|
28
|
+
|
|
29
|
+
const REQUEST_OMITTED_HEADERS: &[&str] = &["content-length", "host"];
|
|
30
|
+
const RESPONSE_OMITTED_HEADERS: &[&str] = &["content-encoding", "content-length"];
|
|
31
|
+
|
|
32
|
+
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
33
|
+
pub enum FramingError {
|
|
34
|
+
Invalid,
|
|
35
|
+
Smuggling,
|
|
36
|
+
HeadersTooLarge,
|
|
37
|
+
Eof,
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
41
|
+
pub enum BodyFraming {
|
|
42
|
+
None,
|
|
43
|
+
ContentLength(u64),
|
|
44
|
+
Chunked,
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
#[derive(Debug, Clone)]
|
|
48
|
+
pub struct HttpRequestHead {
|
|
49
|
+
pub method: String,
|
|
50
|
+
pub target: String,
|
|
51
|
+
pub path: String,
|
|
52
|
+
pub query: String,
|
|
53
|
+
pub headers: Vec<(String, String)>,
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
#[derive(Debug, Clone)]
|
|
57
|
+
pub struct HttpResponseHead {
|
|
58
|
+
pub status: u16,
|
|
59
|
+
pub reason: String,
|
|
60
|
+
pub headers: Vec<(String, String)>,
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
impl HttpRequestHead {
|
|
64
|
+
pub fn header(&self, name: &str) -> Option<&str> {
|
|
65
|
+
self.headers
|
|
66
|
+
.iter()
|
|
67
|
+
.find(|(k, _)| k.eq_ignore_ascii_case(name))
|
|
68
|
+
.map(|(_, v)| v.as_str())
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
impl HttpResponseHead {
|
|
73
|
+
pub fn header(&self, name: &str) -> Option<&str> {
|
|
74
|
+
self.headers
|
|
75
|
+
.iter()
|
|
76
|
+
.find(|(k, _)| k.eq_ignore_ascii_case(name))
|
|
77
|
+
.map(|(_, v)| v.as_str())
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
fn read_crlf_line_bounded<R: BufRead>(
|
|
82
|
+
reader: &mut R,
|
|
83
|
+
remaining: &mut usize,
|
|
84
|
+
) -> Result<Option<String>, FramingError> {
|
|
85
|
+
let mut buf = Vec::new();
|
|
86
|
+
loop {
|
|
87
|
+
let available = reader.fill_buf().map_err(|_| FramingError::Invalid)?;
|
|
88
|
+
if available.is_empty() {
|
|
89
|
+
if buf.is_empty() {
|
|
90
|
+
return Ok(None);
|
|
91
|
+
}
|
|
92
|
+
return Err(FramingError::Invalid);
|
|
93
|
+
}
|
|
94
|
+
if let Some(pos) = available.iter().position(|&b| b == b'\n') {
|
|
95
|
+
let take = pos + 1;
|
|
96
|
+
if take > *remaining {
|
|
97
|
+
return Err(FramingError::HeadersTooLarge);
|
|
98
|
+
}
|
|
99
|
+
buf.extend_from_slice(&available[..take]);
|
|
100
|
+
reader.consume(take);
|
|
101
|
+
*remaining -= take;
|
|
102
|
+
break;
|
|
103
|
+
}
|
|
104
|
+
let len = available.len();
|
|
105
|
+
if len > *remaining {
|
|
106
|
+
return Err(FramingError::HeadersTooLarge);
|
|
107
|
+
}
|
|
108
|
+
buf.extend_from_slice(available);
|
|
109
|
+
reader.consume(len);
|
|
110
|
+
*remaining -= len;
|
|
111
|
+
}
|
|
112
|
+
if buf.ends_with(b"\r\n") {
|
|
113
|
+
buf.truncate(buf.len() - 2);
|
|
114
|
+
} else if buf.ends_with(b"\n") {
|
|
115
|
+
buf.truncate(buf.len() - 1);
|
|
116
|
+
}
|
|
117
|
+
if buf.contains(&b'\r') || buf.contains(&b'\n') {
|
|
118
|
+
return Err(FramingError::Invalid);
|
|
119
|
+
}
|
|
120
|
+
String::from_utf8(buf)
|
|
121
|
+
.map(Some)
|
|
122
|
+
.map_err(|_| FramingError::Invalid)
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
pub fn read_request_head<R: BufRead>(reader: &mut R) -> Result<HttpRequestHead, FramingError> {
|
|
126
|
+
let mut budget = HUB_RELAY_HEADER_MAX_BYTES;
|
|
127
|
+
let Some(req_line) = read_crlf_line_bounded(reader, &mut budget)? else {
|
|
128
|
+
return Err(FramingError::Eof);
|
|
129
|
+
};
|
|
130
|
+
let mut parts = req_line.split(' ');
|
|
131
|
+
let method = parts
|
|
132
|
+
.next()
|
|
133
|
+
.filter(|s| !s.is_empty())
|
|
134
|
+
.ok_or(FramingError::Invalid)?;
|
|
135
|
+
let target = parts
|
|
136
|
+
.next()
|
|
137
|
+
.filter(|s| !s.is_empty())
|
|
138
|
+
.ok_or(FramingError::Invalid)?;
|
|
139
|
+
let version = parts.next().ok_or(FramingError::Invalid)?;
|
|
140
|
+
if parts.next().is_some()
|
|
141
|
+
|| (!version.eq_ignore_ascii_case("HTTP/1.1") && !version.eq_ignore_ascii_case("HTTP/1.0"))
|
|
142
|
+
{
|
|
143
|
+
return Err(FramingError::Invalid);
|
|
144
|
+
}
|
|
145
|
+
if !target.starts_with('/') {
|
|
146
|
+
return Err(FramingError::Invalid);
|
|
147
|
+
}
|
|
148
|
+
let (path, query) = match target.find('?') {
|
|
149
|
+
Some(idx) => (target[..idx].to_owned(), target[idx..].to_owned()),
|
|
150
|
+
None => (target.to_owned(), String::new()),
|
|
151
|
+
};
|
|
152
|
+
let mut headers = Vec::new();
|
|
153
|
+
let mut measured_header_bytes = 0usize;
|
|
154
|
+
loop {
|
|
155
|
+
let line = read_crlf_line_bounded(reader, &mut budget)?.ok_or(FramingError::Invalid)?;
|
|
156
|
+
if line.is_empty() {
|
|
157
|
+
break;
|
|
158
|
+
}
|
|
159
|
+
// Reject obs-fold leading whitespace
|
|
160
|
+
if line.starts_with(' ') || line.starts_with('\t') {
|
|
161
|
+
return Err(FramingError::Smuggling);
|
|
162
|
+
}
|
|
163
|
+
let (raw_name, raw_val) = line.split_once(':').ok_or(FramingError::Invalid)?;
|
|
164
|
+
if raw_name.is_empty()
|
|
165
|
+
|| raw_name
|
|
166
|
+
.bytes()
|
|
167
|
+
.any(|b| b.is_ascii_whitespace() || !(0x21..0x7f).contains(&b))
|
|
168
|
+
{
|
|
169
|
+
return Err(FramingError::Invalid);
|
|
170
|
+
}
|
|
171
|
+
let value = raw_val.trim().to_owned();
|
|
172
|
+
measured_header_bytes =
|
|
173
|
+
measured_header_bytes.saturating_add(raw_name.len() + value.len() + 4);
|
|
174
|
+
if measured_header_bytes > HUB_RELAY_HEADER_MAX_BYTES {
|
|
175
|
+
return Err(FramingError::HeadersTooLarge);
|
|
176
|
+
}
|
|
177
|
+
headers.push((raw_name.to_owned(), value));
|
|
178
|
+
}
|
|
179
|
+
Ok(HttpRequestHead {
|
|
180
|
+
method: method.to_owned(),
|
|
181
|
+
target: target.to_owned(),
|
|
182
|
+
path,
|
|
183
|
+
query,
|
|
184
|
+
headers,
|
|
185
|
+
})
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
pub fn read_response_head<R: BufRead>(reader: &mut R) -> Result<HttpResponseHead, FramingError> {
|
|
189
|
+
let mut budget = HUB_RELAY_HEADER_MAX_BYTES;
|
|
190
|
+
let Some(status_line) = read_crlf_line_bounded(reader, &mut budget)? else {
|
|
191
|
+
return Err(FramingError::Eof);
|
|
192
|
+
};
|
|
193
|
+
let mut parts = status_line.splitn(3, ' ');
|
|
194
|
+
let version = parts.next().ok_or(FramingError::Invalid)?;
|
|
195
|
+
if !version.starts_with("HTTP/1.") {
|
|
196
|
+
return Err(FramingError::Invalid);
|
|
197
|
+
}
|
|
198
|
+
let status_str = parts.next().ok_or(FramingError::Invalid)?;
|
|
199
|
+
let status: u16 = status_str.parse().map_err(|_| FramingError::Invalid)?;
|
|
200
|
+
let reason = parts.next().unwrap_or("").to_owned();
|
|
201
|
+
let mut headers = Vec::new();
|
|
202
|
+
let mut measured_header_bytes = 0usize;
|
|
203
|
+
loop {
|
|
204
|
+
let line = read_crlf_line_bounded(reader, &mut budget)?.ok_or(FramingError::Invalid)?;
|
|
205
|
+
if line.is_empty() {
|
|
206
|
+
break;
|
|
207
|
+
}
|
|
208
|
+
if line.starts_with(' ') || line.starts_with('\t') {
|
|
209
|
+
return Err(FramingError::Smuggling);
|
|
210
|
+
}
|
|
211
|
+
let (raw_name, raw_val) = line.split_once(':').ok_or(FramingError::Invalid)?;
|
|
212
|
+
if raw_name.is_empty() {
|
|
213
|
+
return Err(FramingError::Invalid);
|
|
214
|
+
}
|
|
215
|
+
let value = raw_val.trim().to_owned();
|
|
216
|
+
measured_header_bytes =
|
|
217
|
+
measured_header_bytes.saturating_add(raw_name.len() + value.len() + 4);
|
|
218
|
+
if measured_header_bytes > HUB_RELAY_HEADER_MAX_BYTES {
|
|
219
|
+
return Err(FramingError::HeadersTooLarge);
|
|
220
|
+
}
|
|
221
|
+
headers.push((raw_name.to_owned(), value));
|
|
222
|
+
}
|
|
223
|
+
Ok(HttpResponseHead {
|
|
224
|
+
status,
|
|
225
|
+
reason,
|
|
226
|
+
headers,
|
|
227
|
+
})
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
231
|
+
pub struct ValidatedRequestHeaders {
|
|
232
|
+
pub framing: BodyFraming,
|
|
233
|
+
pub sanitized: Vec<(String, String)>,
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
/// Validates framing (`linkFramingHeaders` + `validateHubRelayRequestHeaders`) and strips
|
|
237
|
+
/// hop-by-hop, `Connection`-nominated, `host`/`content-length`, and `CALLER_CREDENTIAL_HEADERS`.
|
|
238
|
+
pub fn validate_and_sanitize_request_headers(
|
|
239
|
+
raw_headers: &[(String, String)],
|
|
240
|
+
) -> Result<ValidatedRequestHeaders, FramingError> {
|
|
241
|
+
let mut measured_bytes = 0usize;
|
|
242
|
+
for (name, value) in raw_headers {
|
|
243
|
+
if name.is_empty()
|
|
244
|
+
|| name.contains('\r')
|
|
245
|
+
|| name.contains('\n')
|
|
246
|
+
|| value.contains('\r')
|
|
247
|
+
|| value.contains('\n')
|
|
248
|
+
{
|
|
249
|
+
return Err(FramingError::Invalid);
|
|
250
|
+
}
|
|
251
|
+
measured_bytes = measured_bytes.saturating_add(name.len() + value.len() + 4);
|
|
252
|
+
if measured_bytes > HUB_RELAY_HEADER_MAX_BYTES {
|
|
253
|
+
return Err(FramingError::HeadersTooLarge);
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
let mut content_lengths: Vec<&str> = Vec::new();
|
|
258
|
+
let mut transfer_encodings: Vec<&str> = Vec::new();
|
|
259
|
+
let mut connection_named: HashSet<String> = HashSet::new();
|
|
260
|
+
|
|
261
|
+
for (name, value) in raw_headers {
|
|
262
|
+
let lower = name.to_ascii_lowercase();
|
|
263
|
+
match lower.as_str() {
|
|
264
|
+
"upgrade" => return Err(FramingError::Smuggling),
|
|
265
|
+
"content-length" => {
|
|
266
|
+
let trimmed = value.trim();
|
|
267
|
+
if trimmed.is_empty() || !trimmed.bytes().all(|b| b.is_ascii_digit()) {
|
|
268
|
+
return Err(FramingError::Smuggling);
|
|
269
|
+
}
|
|
270
|
+
content_lengths.push(trimmed);
|
|
271
|
+
}
|
|
272
|
+
"transfer-encoding" => {
|
|
273
|
+
transfer_encodings.push(value.trim());
|
|
274
|
+
}
|
|
275
|
+
"connection" => {
|
|
276
|
+
for token in value.split(',') {
|
|
277
|
+
let t = token.trim().to_ascii_lowercase();
|
|
278
|
+
if !t.is_empty() {
|
|
279
|
+
connection_named.insert(t);
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
_ => {}
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
if content_lengths.len() > 1 {
|
|
288
|
+
return Err(FramingError::Smuggling);
|
|
289
|
+
}
|
|
290
|
+
let framing = if !transfer_encodings.is_empty() {
|
|
291
|
+
if !content_lengths.is_empty()
|
|
292
|
+
|| transfer_encodings.len() != 1
|
|
293
|
+
|| !transfer_encodings[0].eq_ignore_ascii_case("chunked")
|
|
294
|
+
{
|
|
295
|
+
return Err(FramingError::Smuggling);
|
|
296
|
+
}
|
|
297
|
+
BodyFraming::Chunked
|
|
298
|
+
} else if let Some(cl_str) = content_lengths.first() {
|
|
299
|
+
let len: u64 = cl_str.parse().map_err(|_| FramingError::Smuggling)?;
|
|
300
|
+
BodyFraming::ContentLength(len)
|
|
301
|
+
} else {
|
|
302
|
+
BodyFraming::None
|
|
303
|
+
};
|
|
304
|
+
|
|
305
|
+
let mut sanitized = Vec::new();
|
|
306
|
+
for (name, value) in raw_headers {
|
|
307
|
+
let lower = name.to_ascii_lowercase();
|
|
308
|
+
if HOP_BY_HOP_HEADERS.contains(&lower.as_str())
|
|
309
|
+
|| REQUEST_OMITTED_HEADERS.contains(&lower.as_str())
|
|
310
|
+
|| CALLER_CREDENTIAL_HEADERS.contains(&lower.as_str())
|
|
311
|
+
|| connection_named.contains(&lower)
|
|
312
|
+
{
|
|
313
|
+
continue;
|
|
314
|
+
}
|
|
315
|
+
sanitized.push((lower, value.clone()));
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
Ok(ValidatedRequestHeaders { framing, sanitized })
|
|
319
|
+
}
|
|
320
|
+
|
|
321
|
+
pub fn sanitize_response_headers(raw_headers: &[(String, String)]) -> Vec<(String, String)> {
|
|
322
|
+
let mut connection_named: HashSet<String> = HashSet::new();
|
|
323
|
+
for (name, value) in raw_headers {
|
|
324
|
+
if name.eq_ignore_ascii_case("connection") {
|
|
325
|
+
for token in value.split(',') {
|
|
326
|
+
let t = token.trim().to_ascii_lowercase();
|
|
327
|
+
if !t.is_empty() {
|
|
328
|
+
connection_named.insert(t);
|
|
329
|
+
}
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
let mut out = Vec::new();
|
|
334
|
+
for (name, value) in raw_headers {
|
|
335
|
+
let lower = name.to_ascii_lowercase();
|
|
336
|
+
if HOP_BY_HOP_HEADERS.contains(&lower.as_str())
|
|
337
|
+
|| RESPONSE_OMITTED_HEADERS.contains(&lower.as_str())
|
|
338
|
+
|| connection_named.contains(&lower)
|
|
339
|
+
{
|
|
340
|
+
continue;
|
|
341
|
+
}
|
|
342
|
+
out.push((name.clone(), value.clone()));
|
|
343
|
+
}
|
|
344
|
+
out
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
pub fn is_sse_headers(headers: &[(String, String)]) -> bool {
|
|
348
|
+
headers
|
|
349
|
+
.iter()
|
|
350
|
+
.find(|(k, _)| k.eq_ignore_ascii_case("content-type"))
|
|
351
|
+
.and_then(|(_, v)| v.split(';').next())
|
|
352
|
+
.is_some_and(|ct| ct.trim().eq_ignore_ascii_case("text/event-stream"))
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
pub fn response_framing(
|
|
356
|
+
status: u16,
|
|
357
|
+
method: &str,
|
|
358
|
+
headers: &[(String, String)],
|
|
359
|
+
) -> Result<BodyFraming, FramingError> {
|
|
360
|
+
if method.eq_ignore_ascii_case("HEAD")
|
|
361
|
+
|| (100..200).contains(&status)
|
|
362
|
+
|| status == 204
|
|
363
|
+
|| status == 304
|
|
364
|
+
{
|
|
365
|
+
return Ok(BodyFraming::None);
|
|
366
|
+
}
|
|
367
|
+
let mut cl: Option<u64> = None;
|
|
368
|
+
let mut chunked = false;
|
|
369
|
+
for (name, value) in headers {
|
|
370
|
+
if name.eq_ignore_ascii_case("transfer-encoding") {
|
|
371
|
+
if value.to_ascii_lowercase().contains("chunked") {
|
|
372
|
+
chunked = true;
|
|
373
|
+
} else {
|
|
374
|
+
return Err(FramingError::Smuggling);
|
|
375
|
+
}
|
|
376
|
+
} else if name.eq_ignore_ascii_case("content-length") {
|
|
377
|
+
let trimmed = value.trim();
|
|
378
|
+
if trimmed.is_empty() || !trimmed.bytes().all(|b| b.is_ascii_digit()) {
|
|
379
|
+
return Err(FramingError::Smuggling);
|
|
380
|
+
}
|
|
381
|
+
let parsed: u64 = trimmed.parse().map_err(|_| FramingError::Smuggling)?;
|
|
382
|
+
if cl.is_some() {
|
|
383
|
+
return Err(FramingError::Smuggling);
|
|
384
|
+
}
|
|
385
|
+
cl = Some(parsed);
|
|
386
|
+
}
|
|
387
|
+
}
|
|
388
|
+
if chunked {
|
|
389
|
+
Ok(BodyFraming::Chunked)
|
|
390
|
+
} else if let Some(len) = cl {
|
|
391
|
+
Ok(BodyFraming::ContentLength(len))
|
|
392
|
+
} else {
|
|
393
|
+
Ok(BodyFraming::None)
|
|
394
|
+
}
|
|
395
|
+
}
|
|
396
|
+
|
|
397
|
+
pub fn read_bounded_body<R: BufRead>(
|
|
398
|
+
reader: &mut R,
|
|
399
|
+
framing: BodyFraming,
|
|
400
|
+
max_bytes: u64,
|
|
401
|
+
) -> Result<Vec<u8>, io::Error> {
|
|
402
|
+
match framing {
|
|
403
|
+
BodyFraming::None => Ok(Vec::new()),
|
|
404
|
+
BodyFraming::ContentLength(len) => {
|
|
405
|
+
if len > max_bytes {
|
|
406
|
+
return Err(io::Error::new(io::ErrorKind::InvalidData, "body_too_large"));
|
|
407
|
+
}
|
|
408
|
+
let mut out = vec![0u8; len as usize];
|
|
409
|
+
reader.read_exact(&mut out)?;
|
|
410
|
+
Ok(out)
|
|
411
|
+
}
|
|
412
|
+
BodyFraming::Chunked => {
|
|
413
|
+
let mut out = Vec::new();
|
|
414
|
+
let mut meta_budget = HUB_RELAY_HEADER_MAX_BYTES;
|
|
415
|
+
loop {
|
|
416
|
+
let size_line = read_crlf_line_bounded(reader, &mut meta_budget)
|
|
417
|
+
.map_err(|_| {
|
|
418
|
+
io::Error::new(
|
|
419
|
+
io::ErrorKind::InvalidData,
|
|
420
|
+
"chunk metadata overflow or invalid",
|
|
421
|
+
)
|
|
422
|
+
})?
|
|
423
|
+
.ok_or_else(|| {
|
|
424
|
+
io::Error::new(io::ErrorKind::UnexpectedEof, "unexpected chunk eof")
|
|
425
|
+
})?;
|
|
426
|
+
let hex_part = size_line.trim().split(';').next().unwrap_or("").trim();
|
|
427
|
+
let chunk_len = u64::from_str_radix(hex_part, 16).map_err(|_| {
|
|
428
|
+
io::Error::new(io::ErrorKind::InvalidData, "invalid chunk size")
|
|
429
|
+
})?;
|
|
430
|
+
if chunk_len == 0 {
|
|
431
|
+
// Consume trailing headers up to blank CRLF within bounded metadata budget
|
|
432
|
+
loop {
|
|
433
|
+
let trailer = read_crlf_line_bounded(reader, &mut meta_budget)
|
|
434
|
+
.map_err(|_| {
|
|
435
|
+
io::Error::new(
|
|
436
|
+
io::ErrorKind::InvalidData,
|
|
437
|
+
"chunk trailer overflow or invalid",
|
|
438
|
+
)
|
|
439
|
+
})?
|
|
440
|
+
.ok_or_else(|| {
|
|
441
|
+
io::Error::new(
|
|
442
|
+
io::ErrorKind::UnexpectedEof,
|
|
443
|
+
"unexpected trailer eof",
|
|
444
|
+
)
|
|
445
|
+
})?;
|
|
446
|
+
if trailer.is_empty() {
|
|
447
|
+
break;
|
|
448
|
+
}
|
|
449
|
+
}
|
|
450
|
+
break;
|
|
451
|
+
}
|
|
452
|
+
if (out.len() as u64).saturating_add(chunk_len) > max_bytes {
|
|
453
|
+
return Err(io::Error::new(io::ErrorKind::InvalidData, "body_too_large"));
|
|
454
|
+
}
|
|
455
|
+
let prev = out.len();
|
|
456
|
+
out.resize(prev + chunk_len as usize, 0);
|
|
457
|
+
reader.read_exact(&mut out[prev..])?;
|
|
458
|
+
let mut crlf = [0u8; 2];
|
|
459
|
+
reader.read_exact(&mut crlf)?;
|
|
460
|
+
if &crlf != b"\r\n" {
|
|
461
|
+
return Err(io::Error::new(
|
|
462
|
+
io::ErrorKind::InvalidData,
|
|
463
|
+
"missing chunk crlf",
|
|
464
|
+
));
|
|
465
|
+
}
|
|
466
|
+
}
|
|
467
|
+
Ok(out)
|
|
468
|
+
}
|
|
469
|
+
}
|
|
470
|
+
}
|
|
471
|
+
|
|
472
|
+
/// Streams chunked or fixed-length upstream body to `client` as HTTP/1.1 chunked transfer.
|
|
473
|
+
pub fn stream_upstream_to_chunked_client<R: BufRead, W: Write>(
|
|
474
|
+
reader: &mut R,
|
|
475
|
+
client: &mut W,
|
|
476
|
+
framing: BodyFraming,
|
|
477
|
+
max_bytes: Option<u64>,
|
|
478
|
+
) -> io::Result<()> {
|
|
479
|
+
let mut total: u64 = 0;
|
|
480
|
+
match framing {
|
|
481
|
+
BodyFraming::None => {
|
|
482
|
+
// Read until EOF (connection-delimited stream)
|
|
483
|
+
let mut buf = [0u8; 16 * 1024];
|
|
484
|
+
loop {
|
|
485
|
+
let n = reader.read(&mut buf)?;
|
|
486
|
+
if n == 0 {
|
|
487
|
+
break;
|
|
488
|
+
}
|
|
489
|
+
total = total.saturating_add(n as u64);
|
|
490
|
+
if let Some(cap) = max_bytes
|
|
491
|
+
&& total > cap
|
|
492
|
+
{
|
|
493
|
+
return Err(io::Error::new(io::ErrorKind::InvalidData, "body_too_large"));
|
|
494
|
+
}
|
|
495
|
+
write!(client, "{n:x}\r\n")?;
|
|
496
|
+
client.write_all(&buf[..n])?;
|
|
497
|
+
client.write_all(b"\r\n")?;
|
|
498
|
+
client.flush()?;
|
|
499
|
+
}
|
|
500
|
+
}
|
|
501
|
+
BodyFraming::ContentLength(mut remaining) => {
|
|
502
|
+
if let Some(cap) = max_bytes
|
|
503
|
+
&& remaining > cap
|
|
504
|
+
{
|
|
505
|
+
return Err(io::Error::new(io::ErrorKind::InvalidData, "body_too_large"));
|
|
506
|
+
}
|
|
507
|
+
let mut buf = [0u8; 16 * 1024];
|
|
508
|
+
while remaining > 0 {
|
|
509
|
+
let want = (remaining as usize).min(buf.len());
|
|
510
|
+
let n = reader.read(&mut buf[..want])?;
|
|
511
|
+
if n == 0 {
|
|
512
|
+
return Err(io::Error::new(
|
|
513
|
+
io::ErrorKind::UnexpectedEof,
|
|
514
|
+
"upstream truncated",
|
|
515
|
+
));
|
|
516
|
+
}
|
|
517
|
+
remaining -= n as u64;
|
|
518
|
+
write!(client, "{n:x}\r\n")?;
|
|
519
|
+
client.write_all(&buf[..n])?;
|
|
520
|
+
client.write_all(b"\r\n")?;
|
|
521
|
+
client.flush()?;
|
|
522
|
+
}
|
|
523
|
+
}
|
|
524
|
+
BodyFraming::Chunked => {
|
|
525
|
+
let mut buf = [0u8; 16 * 1024];
|
|
526
|
+
let mut meta_budget = HUB_RELAY_HEADER_MAX_BYTES;
|
|
527
|
+
loop {
|
|
528
|
+
let size_line = read_crlf_line_bounded(reader, &mut meta_budget)
|
|
529
|
+
.map_err(|_| {
|
|
530
|
+
io::Error::new(
|
|
531
|
+
io::ErrorKind::InvalidData,
|
|
532
|
+
"upstream chunk metadata overflow or invalid",
|
|
533
|
+
)
|
|
534
|
+
})?
|
|
535
|
+
.ok_or_else(|| {
|
|
536
|
+
io::Error::new(
|
|
537
|
+
io::ErrorKind::UnexpectedEof,
|
|
538
|
+
"upstream eof before terminating chunk",
|
|
539
|
+
)
|
|
540
|
+
})?;
|
|
541
|
+
let hex_part = size_line.trim().split(';').next().unwrap_or("").trim();
|
|
542
|
+
let mut chunk_rem = u64::from_str_radix(hex_part, 16).map_err(|_| {
|
|
543
|
+
io::Error::new(io::ErrorKind::InvalidData, "invalid upstream chunk")
|
|
544
|
+
})?;
|
|
545
|
+
if chunk_rem == 0 {
|
|
546
|
+
loop {
|
|
547
|
+
let trailer = read_crlf_line_bounded(reader, &mut meta_budget)
|
|
548
|
+
.map_err(|_| {
|
|
549
|
+
io::Error::new(
|
|
550
|
+
io::ErrorKind::InvalidData,
|
|
551
|
+
"upstream trailer overflow or invalid",
|
|
552
|
+
)
|
|
553
|
+
})?
|
|
554
|
+
.ok_or_else(|| {
|
|
555
|
+
io::Error::new(
|
|
556
|
+
io::ErrorKind::UnexpectedEof,
|
|
557
|
+
"upstream eof in trailers",
|
|
558
|
+
)
|
|
559
|
+
})?;
|
|
560
|
+
if trailer.is_empty() {
|
|
561
|
+
break;
|
|
562
|
+
}
|
|
563
|
+
}
|
|
564
|
+
break;
|
|
565
|
+
}
|
|
566
|
+
total = total.saturating_add(chunk_rem);
|
|
567
|
+
if let Some(cap) = max_bytes
|
|
568
|
+
&& total > cap
|
|
569
|
+
{
|
|
570
|
+
return Err(io::Error::new(io::ErrorKind::InvalidData, "body_too_large"));
|
|
571
|
+
}
|
|
572
|
+
while chunk_rem > 0 {
|
|
573
|
+
let want = (chunk_rem as usize).min(buf.len());
|
|
574
|
+
let got = reader.read(&mut buf[..want])?;
|
|
575
|
+
if got == 0 {
|
|
576
|
+
return Err(io::Error::new(
|
|
577
|
+
io::ErrorKind::UnexpectedEof,
|
|
578
|
+
"truncated chunk",
|
|
579
|
+
));
|
|
580
|
+
}
|
|
581
|
+
chunk_rem -= got as u64;
|
|
582
|
+
write!(client, "{got:x}\r\n")?;
|
|
583
|
+
client.write_all(&buf[..got])?;
|
|
584
|
+
client.write_all(b"\r\n")?;
|
|
585
|
+
client.flush()?;
|
|
586
|
+
}
|
|
587
|
+
let mut crlf = [0u8; 2];
|
|
588
|
+
reader.read_exact(&mut crlf)?;
|
|
589
|
+
if &crlf != b"\r\n" {
|
|
590
|
+
return Err(io::Error::new(
|
|
591
|
+
io::ErrorKind::InvalidData,
|
|
592
|
+
"invalid upstream chunk crlf",
|
|
593
|
+
));
|
|
594
|
+
}
|
|
595
|
+
}
|
|
596
|
+
}
|
|
597
|
+
}
|
|
598
|
+
client.write_all(b"0\r\n\r\n")?;
|
|
599
|
+
client.flush()
|
|
600
|
+
}
|
|
601
|
+
|
|
602
|
+
pub fn write_json_response<W: Write>(
|
|
603
|
+
writer: &mut W,
|
|
604
|
+
status: u16,
|
|
605
|
+
reason: &str,
|
|
606
|
+
extra_headers: &[(&str, &str)],
|
|
607
|
+
body: &[u8],
|
|
608
|
+
) -> io::Result<()> {
|
|
609
|
+
write!(writer, "HTTP/1.1 {status} {reason}\r\n")?;
|
|
610
|
+
write!(writer, "Content-Type: application/json;charset=utf-8\r\n")?;
|
|
611
|
+
write!(writer, "Content-Length: {}\r\n", body.len())?;
|
|
612
|
+
write!(writer, "Connection: close\r\n")?;
|
|
613
|
+
for (k, v) in extra_headers {
|
|
614
|
+
write!(writer, "{k}: {v}\r\n")?;
|
|
615
|
+
}
|
|
616
|
+
writer.write_all(b"\r\n")?;
|
|
617
|
+
writer.write_all(body)?;
|
|
618
|
+
writer.flush()
|
|
619
|
+
}
|