@@ -26,6 +26,10 @@ module Sinatra rescue EOFError, Errno::ESPIPE self.GET end + + def secure? + (@env['HTTP_X_FORWARDED_PROTO'] || @env['rack.url_scheme']) == 'https' + end end # The response object. See Rack::Response and Rack::ResponseHelpers for lib/sinatra/base.rb @@ -15,4 +15,19 @@ class RequestTest < Test::Unit::TestCase ) assert_equal 'bar', request.params['foo'] end + + it 'is secure when the url scheme is https' do + request = Sinatra::Request.new('rack.url_scheme' => 'https') + assert request.secure? + end + + it 'is not secure when the url scheme is http' do + request = Sinatra::Request.new('rack.url_scheme' => 'http') + assert !request.secure? + end + + it 'respects X-Forwarded-Proto header for proxied SSL' do + request = Sinatra::Request.new('HTTP_X_FORWARDED_PROTO' => 'https') + assert request.secure? + end end test/request_test.rb 8ab1690064495723055c714f35ca9f41098c7ff2 Adam Wiggins adam@heroku.com http://github.com/bmizerany/sinatra/commit/0f030b6d1ff1d3b6b73a9bd4b995516627c8cb41 0f030b6d1ff1d3b6b73a9bd4b995516627c8cb41 2009-08-18T04:48:46-07:00 2009-08-14T14:51:58-07:00 request.secure? to check for ssl encrypted connection Signed-off-by: Simon Rozet <simon@rozet.name> e384d23fbd98ef7505d8e16311eac4e90f940f3f Simon Rozet simon@rozet.name