Repository navigation
Commit bf09481
committed
fix(guarded-write): bind the allowlist decision to the retained publish target
The apply-diff save path validated only the caller's alias: the tool
layer ran validateAccess on relPath, while the guard resolved that alias
under the lock and published the resolved target without re-running the
access decision. A symlink retargeted after the tool's check - or a
hard-link alias whose new referent keeps the expected version token -
could therefore receive the approved bytes in an ignored or external
file. The guard also held only the referent lock, so a protocol writer
that swaps the link entry itself was not serialized against the publish.
replaceIfVersion and createIfAbsent now take an authorizeTarget
callback, run under the lock on the RETAINED publish target before the
version comparison and the publish, and take both identity locks - the
referent key and the alias-entry key (resolveLinkPathLockKey, the same
pair and folding safeWriteJson's dual-link path uses) - in the shared
sorted order when they differ. The guarded-write entry passes a callback
that re-runs rooIgnoreController.validateAccess on the retained target,
so the allowlist decision covers the exact file the publish acts on; the
retained target is what safeWriteText already receives, unchanged.
Tests: denial before the version comparison (no token read, no publish),
the decision running on the retained target rather than the alias, the
end-to-end alias-passes/referent-ignored rejection through guardedWrite,
and the sorted dual-key acquisition with the single-lock fold case.
Negative controls: removing either authorize call reddens its path's
tests, authorizing the alias instead of the retained target reddens
exactly the binding test, and dropping to a single referent lock reddens
exactly the sorted-order test. 62/62 guardedWrite, 239/239 with the
diff-view suites.1 parent 096abc2 commit bf09481
3 files changed
Lines changed: 190 additions & 8 deletions
File tree
- src
- core/tools
- __tests__
- integrations/editor/__tests__
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
39 | 43 | | |
40 | 44 | | |
41 | 45 | | |
| |||
75 | 79 | | |
76 | 80 | | |
77 | 81 | | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
78 | 86 | | |
79 | 87 | | |
80 | 88 | | |
| |||
87 | 95 | | |
88 | 96 | | |
89 | 97 | | |
| 98 | + | |
90 | 99 | | |
91 | 100 | | |
92 | 101 | | |
| |||
1022 | 1031 | | |
1023 | 1032 | | |
1024 | 1033 | | |
| 1034 | + | |
| 1035 | + | |
| 1036 | + | |
| 1037 | + | |
| 1038 | + | |
| 1039 | + | |
| 1040 | + | |
| 1041 | + | |
| 1042 | + | |
| 1043 | + | |
| 1044 | + | |
| 1045 | + | |
| 1046 | + | |
| 1047 | + | |
| 1048 | + | |
| 1049 | + | |
| 1050 | + | |
| 1051 | + | |
| 1052 | + | |
| 1053 | + | |
| 1054 | + | |
| 1055 | + | |
| 1056 | + | |
| 1057 | + | |
| 1058 | + | |
| 1059 | + | |
| 1060 | + | |
| 1061 | + | |
| 1062 | + | |
| 1063 | + | |
| 1064 | + | |
| 1065 | + | |
| 1066 | + | |
| 1067 | + | |
| 1068 | + | |
| 1069 | + | |
| 1070 | + | |
| 1071 | + | |
| 1072 | + | |
| 1073 | + | |
| 1074 | + | |
| 1075 | + | |
| 1076 | + | |
| 1077 | + | |
| 1078 | + | |
| 1079 | + | |
| 1080 | + | |
| 1081 | + | |
| 1082 | + | |
| 1083 | + | |
| 1084 | + | |
| 1085 | + | |
| 1086 | + | |
| 1087 | + | |
| 1088 | + | |
| 1089 | + | |
| 1090 | + | |
| 1091 | + | |
| 1092 | + | |
| 1093 | + | |
| 1094 | + | |
| 1095 | + | |
| 1096 | + | |
| 1097 | + | |
| 1098 | + | |
| 1099 | + | |
| 1100 | + | |
| 1101 | + | |
| 1102 | + | |
| 1103 | + | |
| 1104 | + | |
| 1105 | + | |
| 1106 | + | |
| 1107 | + | |
| 1108 | + | |
| 1109 | + | |
| 1110 | + | |
| 1111 | + | |
| 1112 | + | |
| 1113 | + | |
| 1114 | + | |
| 1115 | + | |
| 1116 | + | |
| 1117 | + | |
| 1118 | + | |
| 1119 | + | |
| 1120 | + | |
| 1121 | + | |
| 1122 | + | |
| 1123 | + | |
| 1124 | + | |
| 1125 | + | |
| 1126 | + | |
| 1127 | + | |
| 1128 | + | |
| 1129 | + | |
| 1130 | + | |
| 1131 | + | |
| 1132 | + | |
| 1133 | + | |
| 1134 | + | |
| 1135 | + | |
| 1136 | + | |
| 1137 | + | |
| 1138 | + | |
1025 | 1139 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
| |||
191 | 192 | | |
192 | 193 | | |
193 | 194 | | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
194 | 215 | | |
195 | 216 | | |
196 | 217 | | |
197 | 218 | | |
198 | 219 | | |
199 | 220 | | |
200 | 221 | | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
201 | 228 | | |
202 | | - | |
203 | | - | |
204 | | - | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
205 | 233 | | |
206 | 234 | | |
| 235 | + | |
207 | 236 | | |
208 | 237 | | |
209 | 238 | | |
| |||
263 | 292 | | |
264 | 293 | | |
265 | 294 | | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
266 | 301 | | |
267 | | - | |
268 | | - | |
269 | | - | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
270 | 306 | | |
271 | 307 | | |
272 | 308 | | |
273 | 309 | | |
274 | 310 | | |
275 | 311 | | |
| 312 | + | |
276 | 313 | | |
277 | 314 | | |
278 | 315 | | |
| |||
392 | 429 | | |
393 | 430 | | |
394 | 431 | | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
395 | 445 | | |
396 | 446 | | |
397 | 447 | | |
| |||
425 | 475 | | |
426 | 476 | | |
427 | 477 | | |
| 478 | + | |
428 | 479 | | |
429 | 480 | | |
430 | 481 | | |
| |||
448 | 499 | | |
449 | 500 | | |
450 | 501 | | |
451 | | - | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
452 | 509 | | |
453 | 510 | | |
454 | | - | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
455 | 518 | | |
456 | 519 | | |
457 | 520 | | |
| |||
461 | 524 | | |
462 | 525 | | |
463 | 526 | | |
| 527 | + | |
464 | 528 | | |
465 | 529 | | |
466 | 530 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
50 | 54 | | |
51 | 55 | | |
52 | 56 | | |
| |||
0 commit comments