Skip to content

[Aikido] Add StoredSSRFScanner to libcurl HTTP clients to prevent SSRF bypasses #438

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

Closed
aikido-autofix wants to merge 1 commit into from
Closed

[Aikido] Add StoredSSRFScanner to libcurl HTTP clients to prevent SSRF bypasses #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 25 additions & 4 deletions lib/aikido/zen/sinks/curb.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

require_relative "../scanners/stored_ssrf_scanner"
require_relative "../scanners/ssrf_scanner"

module Aikido::Zen
module Sinks
module Curl
SINK = Sinks.add("curb", "outgoing_http_op", scanners: [
Scanners::StoredSSRFScanner,
Scanners::SSRFScanner
])

Expand Down Expand Up @@ -34,11 +36,20 @@ def self.wrap_response(curl)
Scanners::SSRFScanner::Response.new(status: status, headers: headers)
end

def self.scan(request, connection, operation)
def self.resolve_hostname(hostname)
require "resolv"
Resolv.getaddresses(hostname)
rescue => _error
[]
end

def self.scan(request, connection, operation, hostname: nil, addresses: nil)
SINK.scan(
request: request,
connection: connection,
operation: operation
operation: operation,
hostname: hostname,
addresses: addresses
)
end
end
Expand Down Expand Up @@ -72,7 +83,12 @@ def self.load_sinks!
end
end

Helpers.scan(wrapped_request, connection, "request")
# Resolve the hostname to get IP addresses for StoredSSRFScanner
uri = URI(url)
hostname = uri.hostname
addresses = hostname ? Helpers.resolve_hostname(hostname) : []

Helpers.scan(wrapped_request, connection, "request", hostname: hostname, addresses: addresses)

response = original_call.call

Expand Down Expand Up @@ -104,7 +120,12 @@ def self.load_sinks!

connection = OutboundConnection.from_uri(URI(last_effective_url))

Helpers.scan(last_effective_request, connection, "request")
# Resolve the redirect target hostname for StoredSSRFScanner
redirect_uri = URI(last_effective_url)
redirect_hostname = redirect_uri.hostname
redirect_addresses = redirect_hostname ? Helpers.resolve_hostname(redirect_hostname) : []

Helpers.scan(last_effective_request, connection, "request", hostname: redirect_hostname, addresses: redirect_addresses)
end

response
Expand Down
29 changes: 25 additions & 4 deletions lib/aikido/zen/sinks/patron.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

require_relative "../scanners/stored_ssrf_scanner"
require_relative "../scanners/ssrf_scanner"

module Aikido::Zen
module Sinks
module Patron
SINK = Sinks.add("patron", "outgoing_http_op", scanners: [
Scanners::StoredSSRFScanner,
Scanners::SSRFScanner
])

Expand All @@ -25,11 +27,20 @@ def self.wrap_response(request, response)
end
end

def self.scan(request, connection, operation)
def self.resolve_hostname(hostname)
require "resolv"
Resolv.getaddresses(hostname)
rescue => _error
[]
end

def self.scan(request, connection, operation, hostname: nil, addresses: nil)
SINK.scan(
request: request,
connection: connection,
operation: operation
operation: operation,
hostname: hostname,
addresses: addresses
)
end
end
Expand Down Expand Up @@ -67,7 +78,12 @@ def self.load_sinks!
end
end

Helpers.scan(wrapped_request, connection, "request")
# Resolve the hostname to get IP addresses for StoredSSRFScanner
uri = URI(request.url)
hostname = uri.hostname
addresses = hostname ? Helpers.resolve_hostname(hostname) : []

Helpers.scan(wrapped_request, connection, "request", hostname: hostname, addresses: addresses)

response = original_call.call

Expand All @@ -94,7 +110,12 @@ def self.load_sinks!

connection = OutboundConnection.from_uri(URI(response.url))

Helpers.scan(last_effective_request, connection, "request")
# Resolve the redirect target hostname for StoredSSRFScanner
redirect_uri = URI(response.url)
redirect_hostname = redirect_uri.hostname
redirect_addresses = redirect_hostname ? Helpers.resolve_hostname(redirect_hostname) : []

Helpers.scan(last_effective_request, connection, "request", hostname: redirect_hostname, addresses: redirect_addresses)
end

response
Expand Down
29 changes: 27 additions & 2 deletions lib/aikido/zen/sinks/typhoeus.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
# frozen_string_literal: true

require_relative "../sink"
require_relative "../scanners/stored_ssrf_scanner"

module Aikido::Zen
module Sinks
module Typhoeus
SINK = Sinks.add("typhoeus", "outgoing_http_op", scanners: [
Aikido::Zen::Scanners::StoredSSRFScanner,
Aikido::Zen::Scanners::SSRFScanner
])

module Helpers
def self.resolve_hostname(hostname)
require "resolv"
Resolv.getaddresses(hostname)
rescue => _error
[]
end
end

before_callback = ->(request) {
wrapped_request = Aikido::Zen::Scanners::SSRFScanner::Request.new(
verb: request.options[:method],
Expand All @@ -32,10 +43,17 @@ module Typhoeus
end
end

# Resolve the hostname to get IP addresses for StoredSSRFScanner
uri = URI(request.url)
hostname = uri.hostname
addresses = hostname ? Helpers.resolve_hostname(hostname) : []

SINK.scan(
connection: connection,
request: wrapped_request,
operation: "request"
operation: "request",
hostname: hostname,
addresses: addresses
)

request.on_headers do |response|
Expand Down Expand Up @@ -66,14 +84,21 @@ module Typhoeus

connection = Aikido::Zen::OutboundConnection.from_uri(URI(response.effective_url))

# Resolve the redirect target hostname for StoredSSRFScanner
redirect_uri = URI(response.effective_url)
redirect_hostname = redirect_uri.hostname
redirect_addresses = redirect_hostname ? Helpers.resolve_hostname(redirect_hostname) : []

# In this case, we can't actually stop the request from happening, but
# we can scan again (now that we know another request happened), to
# stop the response from being exposed to the user. This downgrades
# the SSRF into a blind SSRF, which is better than doing nothing.
SINK.scan(
connection: connection,
request: last_effective_request,
operation: "request"
operation: "request",
hostname: redirect_hostname,
addresses: redirect_addresses
)
ensure
context["ssrf.request"] = nil if context
Expand Down
Loading