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.

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

Add RestClient instrumentation for SSRF detection #4424

Merged
merged 14 commits into from
Feb 24, 2025
Merged

Add RestClient instrumentation for SSRF detection #4424

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7b5cb80
Add AppSec RestClient instrumentation for SSRF detection
y9v Feb 19, 2025
9a01e56
Add type signatures for AppSec RestClient integration
y9v Feb 19, 2025
ea7614c
Fix type signatures for excon and faraday AppSec integrations
y9v Feb 19, 2025
d32f93f
Add tests for RestClient AppSec instrumentation
y9v Feb 21, 2025
cc5a023
Extract rest-client-latest appraisal
y9v Feb 21, 2025
43c2d36
[🤖] Lock Dependency: https://github.com/DataDog/dd-trace-rb/actions/r…
y9v Feb 21, 2025
cdfd8a8
[🤖] Lock Dependency: https://github.com/DataDog/dd-trace-rb/actions/r…
TonyCTHsu Feb 21, 2025
7f81eb6
Remove unneeded variable from RestClient SSRF integration test
y9v Feb 21, 2025
8b42300
[🤖] Lock Dependency: https://github.com/DataDog/dd-trace-rb/actions/r…
y9v Feb 21, 2025
fb22f17
Add rest-client gem to rake edge:update task
y9v Feb 24, 2025
8b20539
[🤖] Lock Dependency: https://github.com/DataDog/dd-trace-rb/actions/r…
y9v Feb 24, 2025
49978b9
Rename RequestPatch to RequestSSRFDetectionPatch
y9v Feb 24, 2025
717134b
[🤖] Lock Dependency: https://github.com/DataDog/dd-trace-rb/actions/r…
y9v Feb 24, 2025
a632a16
Disable rubocop warning for RequestSSRFDetectionPatch
y9v Feb 24, 2025
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
5 changes: 4 additions & 1 deletion Matrixfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
'resque2-redis4' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
},
'rest_client' => {
'http' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
'rest-client-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
},
'roda' => {
'contrib' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
Expand Down Expand Up @@ -303,6 +303,9 @@
'appsec:excon' => {
'excon-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
},
'appsec:rest_client' => {
'rest-client-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
},
'di:active_record' => {
'rails61-mysql2' => '❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby',
},
Expand Down
4 changes: 3 additions & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ namespace :spec do
:graphql,
:faraday,
:excon,
:rest_client,
:integration
]

Expand Down Expand Up @@ -314,7 +315,8 @@ namespace :spec do
:devise,
:graphql,
:faraday,
:excon
:excon,
:rest_client
].each do |contrib|
desc '' # "Explicitly hiding from `rake -T`"
RSpec::Core::RakeTask.new(contrib) do |t, args|
Expand Down
2 changes: 1 addition & 1 deletion appraisal/jruby-9.2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@
gem 'ethon', (RUBY_PLATFORM == 'java' ? '< 0.15.0' : '>= 0')
gem 'http', '~> 4' # TODO: Fix test breakage and flakiness for 5+
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -202,6 +201,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday', min: '0.14.0')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli', [2])

Expand Down
2 changes: 1 addition & 1 deletion appraisal/jruby-9.3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@
gem 'ethon'
gem 'http', '~> 4' # TODO: Fix test breakage and flakiness for 5+
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -175,6 +174,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday', min: '0.14.0')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli', [2])

Expand Down
2 changes: 1 addition & 1 deletion appraisal/jruby-9.4.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
gem 'ethon'
gem 'http', '~> 4' # TODO: Completely broken with this JRuby version, this has not be validate on CI
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -79,6 +78,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli', [2])

Expand Down
2 changes: 1 addition & 1 deletion appraisal/ruby-2.5.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@
gem 'ethon'
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -221,6 +220,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday', min: '0.14.0')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli')

Expand Down
2 changes: 1 addition & 1 deletion appraisal/ruby-2.6.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
gem 'ethon'
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -174,6 +173,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday', min: '0.14.0')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli', [2])

Expand Down
2 changes: 1 addition & 1 deletion appraisal/ruby-2.7.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
gem 'ethon'
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -174,6 +173,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday', min: '0.14.0')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli', [2])

Expand Down
2 changes: 1 addition & 1 deletion appraisal/ruby-3.0.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
gem 'ethon'
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -95,6 +94,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli', [2])

Expand Down
2 changes: 1 addition & 1 deletion appraisal/ruby-3.1.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
gem 'ethon'
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -95,6 +94,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli', [2])

Expand Down
2 changes: 1 addition & 1 deletion appraisal/ruby-3.2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
gem 'ethon'
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -95,6 +94,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli', [2])

Expand Down
3 changes: 2 additions & 1 deletion appraisal/ruby-3.3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
gem 'ethon'
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -95,6 +94,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli', [2])

Expand Down Expand Up @@ -191,6 +191,7 @@
gem 'devise', '~> 4.9'
gem 'faraday', '~> 2.0'
gem 'excon', '~> 1.2'
gem 'rest-client'
gem 'rack', '~> 2'
gem 'rack-contrib', '~> 2'
gem 'rack-test' # Dev dependencies for testing rack-based code
Expand Down
2 changes: 1 addition & 1 deletion appraisal/ruby-3.4.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
gem 'ethon'
gem 'http'
gem 'httpclient'
gem 'rest-client'
gem 'typhoeus'
end

Expand All @@ -95,6 +94,7 @@
build_coverage_matrix('elasticsearch', [7])
build_coverage_matrix('faraday')
build_coverage_matrix('excon')
build_coverage_matrix('rest-client')
build_coverage_matrix('mongo', min: '2.1.0')
build_coverage_matrix('dalli', [2])

Expand Down
1 change: 0 additions & 1 deletion gemfiles/jruby_9.2_http.gemfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions gemfiles/jruby_9.2_http.gemfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions gemfiles/jruby_9.2_rest_client_latest.gemfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading