Skip to content

fix: avoid possible data leak while rendering #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alekseysotnikov wants to merge 1 commit into from
Closed

fix: avoid possible data leak while rendering #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 22 additions & 28 deletions src/hyper/server.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,7 @@
"Drain queued execute-script effects and send them over SSE.
Returns true/nil on success, false when the channel is closed."
[pending-scripts* tab-id channel br-out br-stream]
(let [scripts (let [ss @pending-scripts*]
(reset! pending-scripts* [])
ss)]
(let [[scripts _] (swap-vals! pending-scripts* (constantly []))]
(try
(when (seq scripts)
(send-sse! channel br-out br-stream
Expand Down Expand Up @@ -173,31 +171,27 @@
(.acquire semaphore)
(.drainPermits semaphore)
(when-not (realized? shutdown-renderer*)
(let [current-signals (get-in @app-state* [:tabs tab-id :signals])
sig-patches (when (and current-signals
(not= current-signals last-sent-signals))
(signal/changed-signals last-sent-signals current-signals))
full-render? (let [needed? @full-render-needed*]
(reset! full-render-needed* false)
needed?)
dirty-ids (let [ids @pending-partials*]
(reset! pending-partials* #{})
ids)
sent? (try
(if (and (seq dirty-ids)
(not full-render?)
(not (seq sig-patches)))
(handle-partial-render app-state* tab-id dirty-ids
channel br-out br-stream)
(handle-full-render app-state* session-id tab-id sig-patches
trigger-partial! pending-partials*
channel br-out br-stream))
(catch Throwable e
(t/error! e {:id :hyper.error/renderer
:data {:hyper/tab-id tab-id}})
nil))
script-sent? (drain-pending-scripts! pending-scripts* tab-id
channel br-out br-stream)]
(let [current-signals (get-in @app-state* [:tabs tab-id :signals])
sig-patches (when (and current-signals
(not= current-signals last-sent-signals))
(signal/changed-signals last-sent-signals current-signals))
[full-render? _] (swap-vals! full-render-needed* (constantly false))
[dirty-ids _] (swap-vals! pending-partials* (constantly #{}))
sent? (try
(if (and (seq dirty-ids)
(not full-render?)
(not (seq sig-patches)))
(handle-partial-render app-state* tab-id dirty-ids
channel br-out br-stream)
(handle-full-render app-state* session-id tab-id sig-patches
trigger-partial! pending-partials*
channel br-out br-stream))
(catch Throwable e
(t/error! e {:id :hyper.error/renderer
:data {:hyper/tab-id tab-id}})
nil))
script-sent? (drain-pending-scripts! pending-scripts* tab-id
channel br-out br-stream)]
;; sent? is true (ok), nil (no render-fn or error), false (channel closed)
;; script-sent? follows the same convention
(when-not (or (false? sent?) (false? script-sent?))
Expand Down
Loading