Normalize interleaved denied inspections
ober
af95741f2f7052d96a73f082f47cb10bfc6d5ec6
--- a/src/jcode/core/verified-run.ss +++ b/src/jcode/core/verified-run.ss @@ -2084,6 +2084,7 @@ (reset-rejected-draft-state!) (reset-existing-ss-rewrite-state!) (reset-path-only-run-state!) + (reset-denied-read-scope-state!) (reset-failed-verify-inspections!) (current-pre-edit-run-alias-count 0) (current-successful-edit-count (+ (current-successful-edit-count) 1)) @@ -2706,11 +2707,15 @@ ((not (outside-scope-path? rel)) #f) ((read-root-allowed? cwd path) #f) ((absolute-path-string? path) - (string-append tool "|absolute-external")) + "read-list|absolute-external") ((string-prefix? "../" rel) - (string-append tool "|parent-external")) + "read-list|parent-external") (else - (string-append tool "|outside-external"))))) + "read-list|outside-external")))) + +(def (reset-denied-read-scope-state!) + (current-denied-read-scope-fingerprint #f) + (current-denied-read-scope-repeat-count 0)) (def (record-denied-read-scope! cwd tool path) (let ((sig (denied-read-scope-signature cwd tool path))) --- a/test/run.ss +++ b/test/run.ss @@ -4462,7 +4462,7 @@ (scripted-responder (list (list (make-wtool-call "read" '(("path" . "/tmp")) #f)) - (list (make-wtool-call "read" '(("path" . "/var")) #f)) + (list (make-wtool-call "list" '(("path" . "/var")) #f)) (list (make-wtool-call "read" '(("path" . "/etc")) #f)) (list (make-wtool-call "edit" (list (cons "path" target)