mirror of
https://github.com/basecamp/once-campfire.git
synced 2026-08-29 10:02:37 +09:00
Jeremy Daer
7d5bb50b9b
- Resolve the guarded endpoint IP lazily inside WebPush::Notification#deliver (on the bounded delivery worker) instead of eagerly when the notification is built on the serial enqueue path, so a slow resolver can't stall the push job before any delivery starts. resolved_endpoint_ip only reads the already-loaded endpoint attribute, so it is safe off the AR connection. - Pin the delivery socket with an explicit nil proxy address so http_proxy/ https_proxy can't route the request through a proxy that re-resolves the host and defeats the ipaddr pin. - Revalidate an existing subscription on re-registration so a row predating endpoint validation gets the same 422 as a fresh create instead of being kept alive by touch. - Regression tests: resolution deferred to delivery, pin survives proxy env, legacy invalid row rejected with 422.
63 lines
2.3 KiB
Ruby
63 lines
2.3 KiB
Ruby
require "web-push"
|
|
require "web_push/pool"
|
|
require "web_push/notification"
|
|
|
|
Rails.application.configure do
|
|
config.x.web_push_pool = WebPush::Pool.new(
|
|
invalid_subscription_handler: ->(subscription_id) do
|
|
Rails.application.executor.wrap do
|
|
Rails.logger.info "Destroying push subscription: #{subscription_id}"
|
|
Push::Subscription.find_by(id: subscription_id)&.destroy
|
|
end
|
|
end
|
|
)
|
|
|
|
at_exit { config.x.web_push_pool.shutdown }
|
|
end
|
|
|
|
module WebPush::PersistentRequest
|
|
def perform
|
|
if endpoint_ip = @options[:endpoint_ip]
|
|
# Pin the connection to the public IP resolved (and guarded) by
|
|
# Push::Subscription so delivery can't be rebound to a private address
|
|
# between resolution and connect. Bypasses the shared persistent pool,
|
|
# which would re-resolve the host itself.
|
|
#
|
|
# The explicit nil proxy address disables proxy discovery from
|
|
# http_proxy/https_proxy. An egress proxy would open the TCP connection
|
|
# itself and re-resolve the endpoint host, so http.ipaddr would no longer
|
|
# pin the destination and the DNS-rebinding guarantee would be lost. This
|
|
# path is already committed to a direct connection (it bypasses the pool);
|
|
# push delivery to public vendor endpoints goes direct.
|
|
http = Net::HTTP.new(uri.host, uri.port, nil)
|
|
http.ipaddr = endpoint_ip
|
|
http.use_ssl = true
|
|
http.ssl_timeout = @options[:ssl_timeout] unless @options[:ssl_timeout].nil?
|
|
http.open_timeout = @options[:open_timeout] unless @options[:open_timeout].nil?
|
|
http.read_timeout = @options[:read_timeout] unless @options[:read_timeout].nil?
|
|
elsif @options[:connection]
|
|
http = @options[:connection]
|
|
else
|
|
http = Net::HTTP.new(uri.host, uri.port, *proxy_options)
|
|
http.use_ssl = true
|
|
http.ssl_timeout = @options[:ssl_timeout] unless @options[:ssl_timeout].nil?
|
|
http.open_timeout = @options[:open_timeout] unless @options[:open_timeout].nil?
|
|
http.read_timeout = @options[:read_timeout] unless @options[:read_timeout].nil?
|
|
end
|
|
|
|
req = Net::HTTP::Post.new(uri.request_uri, headers)
|
|
req.body = body
|
|
|
|
if http.is_a?(Net::HTTP::Persistent)
|
|
response = http.request uri, req
|
|
else
|
|
resp = http.request(req)
|
|
verify_response(resp)
|
|
end
|
|
|
|
resp
|
|
end
|
|
end
|
|
|
|
WebPush::Request.prepend WebPush::PersistentRequest
|