admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

sandbox: fallback to tput for winsize

Browse Source
This commit is contained in:
Bo Anderson 2021-09-01 16:06:07 +01:00
parent 008296f6b3
commit 9e42ddb011
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/sandbox.rb
View File

@ -101,8 +101,21 @@ class Sandbox
command = [SANDBOX_EXEC, "-f", seatbelt.path, *args] command = [SANDBOX_EXEC, "-f", seatbelt.path, *args]
# Start sandbox in a pseudoterminal to prevent access of the parent terminal. # Start sandbox in a pseudoterminal to prevent access of the parent terminal.
T.unsafe(PTY).spawn(*command) do |r, w, pid| T.unsafe(PTY).spawn(*command) do |r, w, pid|
old_winch = trap(:WINCH) { w.winsize = $stdout.winsize if $stdout.tty? } # Set the PTY's window size to match the parent terminal.
w.winsize = $stdout.winsize if $stdout.tty? # Some formula tests are sensitive to the terminal size and fail if this is not set.
winch = proc do |_sig|
w.winsize = if $stdout.tty?
# We can only use IO#winsize if the IO object is a TTY.
$stdout.winsize
else
# Otherwise, default to tput, if available.
# This relies on ncurses rather than the system's ioctl.
[Utils.popen_read("tput", "lines").to_i, Utils.popen_read("tput", "cols").to_i]
end
end
# Update the window size whenever the parent terminal's window size changes.
old_winch = trap(:WINCH, &winch)
winch.call(nil)
$stdin.raw! if $stdin.tty? $stdin.raw! if $stdin.tty?
stdin_thread = Thread.new { IO.copy_stream($stdin, w) } stdin_thread = Thread.new { IO.copy_stream($stdin, w) }

6
Library/Homebrew/test/sandbox_spec.rb
View File

@ -34,7 +34,8 @@ describe Sandbox, :needs_macos do
it "complains on failure" do it "complains on failure" do
ENV["HOMEBREW_VERBOSE"] = "1" ENV["HOMEBREW_VERBOSE"] = "1"
expect(Utils).to receive(:popen_read).and_return("foo") allow(Utils).to receive(:popen_read).and_call_original
allow(Utils).to receive(:popen_read).with("syslog", any_args).and_return("foo")
expect { sandbox.exec "false" } expect { sandbox.exec "false" }
.to raise_error(ErrorDuringExecution) .to raise_error(ErrorDuringExecution)
@ -49,7 +50,8 @@ describe Sandbox, :needs_macos do
Mar 17 02:55:06 sandboxd[342]: Python(49765) deny file-write-unlink /System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/errors.pyc Mar 17 02:55:06 sandboxd[342]: Python(49765) deny file-write-unlink /System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/errors.pyc
bar bar
EOS EOS
expect(Utils).to receive(:popen_read).and_return(with_bogus_error) allow(Utils).to receive(:popen_read).and_call_original
allow(Utils).to receive(:popen_read).with("syslog", any_args).and_return(with_bogus_error)
expect { sandbox.exec "false" } expect { sandbox.exec "false" }
.to raise_error(ErrorDuringExecution) .to raise_error(ErrorDuringExecution)