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

Merge pull request #2898 from MikeMcQuaid/sandbox-all-taps

Browse Source 
sandbox: sandbox all taps by default.
This commit is contained in:
Mike McQuaid 2017-07-30 16:02:36 +01:00 committed by GitHub
commit 3821132f9e
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/sandbox.rb
View File

@ -3,18 +3,14 @@ require "tempfile"
class Sandbox
SANDBOX_EXEC = "/usr/bin/sandbox-exec".freeze
SANDBOXED_TAPS = %w[
homebrew/core
].freeze
def self.available?
OS.mac? && OS::Mac.version >= "10.6" && File.executable?(SANDBOX_EXEC)
end
def self.formula?(formula)
def self.formula?(_formula)
return false unless available?
return false if ARGV.no_sandbox?
ARGV.sandbox? || SANDBOXED_TAPS.include?(formula.tap.to_s)
!ARGV.no_sandbox?
end
def self.test?

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

@ -12,15 +12,7 @@ describe Sandbox do
specify "#formula?" do
f = formula { url "foo-1.0" }
f2 = formula { url "bar-1.0" }
allow(f2).to receive(:tap).and_return(Tap.fetch("test/tap"))
ENV["HOMEBREW_SANDBOX"] = "1"
expect(described_class).to be_formula(f), "Formulae should be sandboxed if --sandbox was passed."
ENV.delete("HOMEBREW_SANDBOX")
expect(described_class).to be_formula(f), "Formulae should be sandboxed if in a sandboxed tap."
expect(described_class).not_to be_formula(f2), "Formulae should not be sandboxed if not in a sandboxed tap."
expect(described_class).to be_formula(f), "Formulae should be sandboxed."
end
specify "#test?" do