Repository navigation
Commit b66ec3d
committed
fix(responses): fail closed when a routed provider calls an undeclared tool
The bridged paths already refuse a tool call the request never declared —
`declaredToolNames` in src/bridge.ts turns it into a 502 naming the tool. The
native Responses passthrough had no equivalent, so the same call was relayed
verbatim.
Codex then received a top-level `function_call(name=apply_patch)` for which it
has no handler: under code mode `apply_patch` exists only as a nested
`tools.apply_patch(...)` helper declared inside the `exec` description, never as
a wire tool. The turn surfaced as a bare `aborted` with the target file
unchanged, no `custom_tool_call_output`, and no error anywhere to explain it.
Ground truth for the guard is the OUTBOUND body rather than the parsed internal
tool list. The passthrough forwards wire shapes the internal list flattens or
renames — namespaced MCP groups, `additional_tools` items carried inside `input`,
the routed custom-tool rewrite — so only the wire names can be compared against
what the provider echoes back. Namespaced tools are accepted under either
coordinate system, since Codex routes MCP calls by an explicit `namespace` field.
Scope:
- Only client-executed items are checked (`function_call`, `custom_tool_call`).
Hosted calls are run upstream or carry no name.
- Forward auth is the canonical ChatGPT backend speaking Codex's own protocol
rather than a routed provider, so it stays unguarded — the same line the
routed custom-tool and image-gen rewrites already draw.
- An unreadable or empty catalog disables the guard rather than failing every
turn.
- Both the streaming relay and the bounded-JSON answer are covered.
Fixes #17001 parent 9db1676 commit b66ec3d
4 files changed
Lines changed: 546 additions & 18 deletions
File tree
- src/server
- responses
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
237 | 237 | | |
238 | 238 | | |
239 | 239 | | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
240 | 246 | | |
241 | 247 | | |
242 | 248 | | |
| |||
2267 | 2273 | | |
2268 | 2274 | | |
2269 | 2275 | | |
| 2276 | + | |
| 2277 | + | |
| 2278 | + | |
| 2279 | + | |
| 2280 | + | |
| 2281 | + | |
| 2282 | + | |
| 2283 | + | |
| 2284 | + | |
| 2285 | + | |
| 2286 | + | |
| 2287 | + | |
| 2288 | + | |
| 2289 | + | |
| 2290 | + | |
| 2291 | + | |
| 2292 | + | |
| 2293 | + | |
| 2294 | + | |
2270 | 2295 | | |
2271 | 2296 | | |
2272 | 2297 | | |
| |||
2654 | 2679 | | |
2655 | 2680 | | |
2656 | 2681 | | |
2657 | | - | |
2658 | | - | |
2659 | | - | |
2660 | | - | |
2661 | | - | |
2662 | | - | |
2663 | | - | |
2664 | 2682 | | |
2665 | 2683 | | |
2666 | 2684 | | |
| |||
2672 | 2690 | | |
2673 | 2691 | | |
2674 | 2692 | | |
2675 | | - | |
| 2693 | + | |
| 2694 | + | |
| 2695 | + | |
| 2696 | + | |
| 2697 | + | |
| 2698 | + | |
2676 | 2699 | | |
2677 | 2700 | | |
2678 | 2701 | | |
| |||
2862 | 2885 | | |
2863 | 2886 | | |
2864 | 2887 | | |
2865 | | - | |
2866 | | - | |
2867 | | - | |
2868 | | - | |
2869 | | - | |
2870 | | - | |
2871 | | - | |
2872 | | - | |
2873 | | - | |
2874 | | - | |
| 2888 | + | |
| 2889 | + | |
| 2890 | + | |
2875 | 2891 | | |
2876 | 2892 | | |
2877 | 2893 | | |
2878 | 2894 | | |
| 2895 | + | |
| 2896 | + | |
| 2897 | + | |
| 2898 | + | |
| 2899 | + | |
| 2900 | + | |
| 2901 | + | |
| 2902 | + | |
| 2903 | + | |
| 2904 | + | |
| 2905 | + | |
| 2906 | + | |
| 2907 | + | |
| 2908 | + | |
2879 | 2909 | | |
2880 | 2910 | | |
2881 | 2911 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
742 | 742 | | |
743 | 743 | | |
744 | 744 | | |
| 745 | + | |
| 746 | + | |
745 | 747 | | |
746 | 748 | | |
747 | 749 | | |
| |||
770 | 772 | | |
771 | 773 | | |
772 | 774 | | |
| 775 | + | |
773 | 776 | | |
774 | 777 | | |
775 | 778 | | |
| |||
823 | 826 | | |
824 | 827 | | |
825 | 828 | | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
| 836 | + | |
826 | 837 | | |
827 | 838 | | |
828 | 839 | | |
| |||
0 commit comments