Skip to content
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.

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

Ability to define the Gemfile via BUNDLE_GEMFILE #200

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/bundler/audit/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class CLI < ::Thor

def check
update if options[:update]

scanner = Scanner.new
gemfile_lock = ENV['BUNDLE_GEMFILE'] ? ENV['BUNDLE_GEMFILE'] + '.lock' : 'Gemfile.lock'
scanner = Scanner.new gemfile_lock
vulnerable = false

scanner.scan(:ignore => options.ignore) do |result|
Expand Down
14 changes: 4 additions & 10 deletions lib/bundler/audit/scanner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ class Scanner
# @return [Database]
attr_reader :database

# Project root directory
attr_reader :root

# The parsed `Gemfile.lock` from the project
#
# @return [Bundler::LockfileParser]
Expand All @@ -33,17 +30,14 @@ class Scanner
#
# Initializes a scanner.
#
# @param [String] root
# The path to the project root.
#

# @param [String] gemfile_lock
# Alternative name for the `Gemfile.lock` file.
# Alternative path for the `Gemfile.lock` file.
#
def initialize(root=Dir.pwd,gemfile_lock='Gemfile.lock')
@root = File.expand_path(root)
def initialize(gemfile_lock=File.join(Dir.pwd,'Gemfile.lock'))
@database = Database.new
@lockfile = LockfileParser.new(
File.read(File.join(@root,gemfile_lock))
File.read(gemfile_lock)
)
end

Expand Down
10 changes: 10 additions & 0 deletions spec/integration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
end
end

context "when auditing a specific Gemfile using BUNDLE_GEMFILE" do
subject do
sh("BUNDLE_GEMFILE=spec/bundle/secure/Gemfile #{command}")
end

it "should print nothing when everything is fine" do
expect(subject.strip).to eq("No vulnerabilities found")
end
end

describe "update" do

let(:update_command) { "#{command} update" }
Expand Down
25 changes: 12 additions & 13 deletions spec/scanner_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@

describe Scanner do
describe "#scan" do
let(:bundle) { 'unpatched_gems' }
let(:directory) { File.join('spec','bundle',bundle) }
let(:gemfile_lock) { File.join('spec','bundle','unpatched_gems','Gemfile.lock') }

subject { described_class.new(directory) }
subject { described_class.new(gemfile_lock) }

it "should yield results" do
results = []
Expand All @@ -24,9 +23,9 @@
end

context "when auditing a bundle with unpatched gems" do
let(:bundle) { 'unpatched_gems' }
let(:directory) { File.join('spec','bundle',bundle) }
let(:scanner) { described_class.new(directory) }
let(:gemfile_lock) { File.join('spec','bundle','unpatched_gems','Gemfile.lock') }

let(:scanner) { described_class.new(gemfile_lock) }

subject { scanner.scan.to_a }

Expand All @@ -41,16 +40,16 @@

it "should ignore the specified advisories" do
ids = subject.map { |result| result.advisory.id }

expect(ids).not_to include('OSVDB-89026')
end
end
end

context "when auditing a bundle with insecure sources" do
let(:bundle) { 'insecure_sources' }
let(:directory) { File.join('spec','bundle',bundle) }
let(:scanner) { described_class.new(directory) }
let(:gemfile_lock) { File.join('spec','bundle','insecure_sources','Gemfile.lock') }

let(:scanner) { described_class.new(gemfile_lock) }

subject { scanner.scan.to_a }

Expand All @@ -61,9 +60,9 @@
end

context "when auditing a secure bundle" do
let(:bundle) { 'secure' }
let(:directory) { File.join('spec','bundle',bundle) }
let(:scanner) { described_class.new(directory) }
let(:gemfile_lock) { File.join('spec','bundle','secure','Gemfile.lock') }

let(:scanner) { described_class.new(gemfile_lock) }

subject { scanner.scan.to_a }

Expand Down