From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.8 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: yahns-public@yhbt.net Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 17D1820423; Sat, 20 Feb 2016 03:33:56 +0000 (UTC) Date: Sat, 20 Feb 2016 03:33:56 +0000 From: Eric Wong To: yahns-public@yhbt.net Subject: [PATCH] https: ensure SERVER_PORT defaults to 443 Message-ID: <20160220033356.GA31676@dcvr.yhbt.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline List-Id: This helps Rack::Request#url and similar methods generate proper URLs instead of the obviously wrong: "https://example.com:80/" Note: we don't track the actual port the listener is bound to, and it may not be worth it since the use of the Host: header is long-established and Host: headers include the port number if non-standard. --- lib/yahns/http_client.rb | 11 ++++++++++- test/test_ssl.rb | 5 +++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb index c300742..272db85 100644 --- a/lib/yahns/http_client.rb +++ b/lib/yahns/http_client.rb @@ -206,8 +206,17 @@ def app_call(input) end end + env.merge!(k.app_defaults) + + # workaround stupid unicorn_http parser behavior when it parses HTTP_HOST + if env['HTTPS'] == 'on'.freeze && + env['HTTP_HOST'] && + env['SERVER_PORT'] == '80'.freeze + env['SERVER_PORT'] = '443'.freeze + end + # run the rack app - status, headers, body = k.app.call(env.merge!(k.app_defaults)) + status, headers, body = k.app.call(env) return :ignore if app_hijacked?(env, body) if status.to_i == 100 rv = http_100_response(env) and return rv diff --git a/test/test_ssl.rb b/test/test_ssl.rb index fe7e09e..5fc2b52 100644 --- a/test/test_ssl.rb +++ b/test/test_ssl.rb @@ -71,7 +71,7 @@ def test_ssl_basic cfg.instance_eval do ru = lambda do |env| case path_info = env['PATH_INFO'] - when '/rack.url_scheme', '/HTTPS' + when '/rack.url_scheme', '/HTTPS', '/SERVER_PORT' s = env[path_info[1..-1]] # remove leading slash s = s.inspect if s.nil? [ 200, { @@ -100,7 +100,8 @@ def test_ssl_basic buf = ''.dup { '/' => 'HI', '/rack.url_scheme' => 'https', - '/HTTPS' => 'on' + '/HTTPS' => 'on', + '/SERVER_PORT' => '443', }.each do |path, exp| client.write("GET #{path} HTTP/1.1\r\nHost: example.com\r\n\r\n") buf.clear -- EW