Skip to content

Commit

Permalink
Merge pull request #2854 from DataDog/fix-appsec-component-not-loaded…
Browse files Browse the repository at this point in the history
…-error-on-remote-component

Check if `:appsec` setting is present before accessing it in remote component
  • Loading branch information
GustavoCaso authored May 17, 2023
2 parents 7303a3f + 2d7e5f3 commit 55556b5
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 37 deletions.
2 changes: 1 addition & 1 deletion lib/datadog/core/remote/client/capabilities.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def initialize(settings)
private

def register(settings)
if settings.appsec.enabled
if settings.respond_to?(:appsec) && settings.appsec.enabled
register_capabilities(Datadog::AppSec::Remote.capabilities)
register_products(Datadog::AppSec::Remote.products)
register_receivers(Datadog::AppSec::Remote.receivers)
Expand Down
92 changes: 56 additions & 36 deletions spec/datadog/core/remote/client/capabilities_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,54 +11,74 @@
capabilities
end

context 'when no component enabled' do
let(:settings) do
appsec_settings = Datadog::AppSec::Configuration::Settings.new
dsl = Datadog::AppSec::Configuration::DSL.new
dsl.enabled = false
appsec_settings.merge(dsl)
context 'AppSec component' do
context 'when disabled' do
let(:settings) do
appsec_settings = Datadog::AppSec::Configuration::Settings.new
dsl = Datadog::AppSec::Configuration::DSL.new
dsl.enabled = false
appsec_settings.merge(dsl)

settings = Datadog::Core::Configuration::Settings.new
expect(settings).to receive(:appsec).at_least(:once).and_return(appsec_settings)
settings = Datadog::Core::Configuration::Settings.new
expect(settings).to receive(:appsec).at_least(:once).and_return(appsec_settings)

settings
end
settings
end

it 'does not register any capabilities, products, and receivers' do
expect(capabilities.capabilities).to be_empty
expect(capabilities.products).to be_empty
expect(capabilities.receivers).to be_empty
end
it 'does not register any capabilities, products, and receivers' do
expect(capabilities.capabilities).to be_empty
expect(capabilities.products).to be_empty
expect(capabilities.receivers).to be_empty
end

describe '#base64_capabilities' do
it 'returns an empty string' do
expect(capabilities.base64_capabilities).to eq('')
describe '#base64_capabilities' do
it 'returns an empty string' do
expect(capabilities.base64_capabilities).to eq('')
end
end
end
end

context 'when a component enabled' do
let(:settings) do
appsec_settings = Datadog::AppSec::Configuration::Settings.new
dsl = Datadog::AppSec::Configuration::DSL.new
dsl.enabled = true
appsec_settings.merge(dsl)
context 'when not present' do
let(:settings) do
double(Datadog::Core::Configuration)
end

settings = Datadog::Core::Configuration::Settings.new
expect(settings).to receive(:appsec).and_return(appsec_settings)
it 'does not register any capabilities, products, and receivers' do
expect(capabilities.capabilities).to be_empty
expect(capabilities.products).to be_empty
expect(capabilities.receivers).to be_empty
end

settings
describe '#base64_capabilities' do
it 'returns an empty string' do
expect(capabilities.base64_capabilities).to eq('')
end
end
end

it 'register capabilities, products, and receivers' do
expect(capabilities.capabilities).to_not be_empty
expect(capabilities.products).to_not be_empty
expect(capabilities.receivers).to_not be_empty
end
context 'when enabled' do
let(:settings) do
appsec_settings = Datadog::AppSec::Configuration::Settings.new
dsl = Datadog::AppSec::Configuration::DSL.new
dsl.enabled = true
appsec_settings.merge(dsl)

settings = Datadog::Core::Configuration::Settings.new
expect(settings).to receive(:appsec).and_return(appsec_settings)

settings
end

it 'register capabilities, products, and receivers' do
expect(capabilities.capabilities).to_not be_empty
expect(capabilities.products).to_not be_empty
expect(capabilities.receivers).to_not be_empty
end

describe '#base64_capabilities' do
it 'returns binary capabilities' do
expect(capabilities.base64_capabilities).to eq('/A==')
describe '#base64_capabilities' do
it 'returns binary capabilities' do
expect(capabilities.base64_capabilities).to eq('/A==')
end
end
end
end
Expand Down

0 comments on commit 55556b5

Please sign in to comment.