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

Jump to bottom

Appveyor fixes #1538

Merged
merged 3 commits into from Mar 20, 2018
Merged

Appveyor fixes #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb6e6ae
apveyor.yml
MSP-Greg Mar 17, 2018
da8f7ce
minissl.rb
MSP-Greg Mar 17, 2018
ba1ff10
test_puma_server_ssl.rb
MSP-Greg Mar 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 33 additions & 9 deletions appveyor.yml
View file
Open in desktop
@@ -1,35 +1,57 @@
# cache cleanup 2018-03-16
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this comment referring to? Is it extra?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a note I left in for my fork testing. With Appveyor, there is no way of resetting a project's cache from the web ui, so, over time, the cache may contain old gem dependencies, etc. I can delete the line if you'd like.


init:
- set PATH=C:\ruby%ruby_version%\bin;C:\Program Files\7-Zip;C:\Program Files\AppVeyor\BuildAgent;C:\Program Files\Git\cmd;C:\Windows\system32
# Download current trunk, install OpenSSL via trunk_pkgs.cmd file
- if %ruby_version%==_trunk (
appveyor DownloadFile https://ci.appveyor.com/api/projects/MSP-Greg/ruby-loco/artifacts/ruby_trunk.7z -FileName C:\ruby_trunk.7z &
7z x C:\ruby_trunk.7z -oC:\ruby_trunk &
C:\ruby_trunk\trunk_pkgs.cmd
)

install:
# Download RI OpenSSL Knapsack package
# Install ragel
- if "%ri_file%"=="x64_2" ( C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-x86_64-ragel )
- if "%ri_file%"=="x86_2" ( C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-i686-ragel )

# Install ragel & download RI OpenSSL Knapsack package
# RI DevKit is only installed in Ruby23 and Ruby23-x64 folders
# RI2 MSYS2/MinGW OpenSSL package is standard Appveyor item
- if "%ri_file%"=="x86" (
appveyor DownloadFile https://dl.bintray.com/oneclick/OpenKnapsack/x86/openssl-1.0.2j-x86-windows.tar.lzma &
7z e openssl-1.0.2j-x86-windows.tar.lzma &
7z x -y openssl-1.0.2j-x86-windows.tar -oC:\ruby23\DevKit\mingw &
set b_config="--with-ssl-dir=C:/ruby23/DevKit/mingw --with-opt-include=C:/ruby23/DevKit/mingw/include" &
set SSL_CERT_FILE=C:/ruby24-x64/ssl/cert.pem
set SSL_CERT_FILE=C:/ruby24-x64/ssl/cert.pem &
C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-x86_64-ragel &
set PATH=%PATH%;C:\msys64\ming32\bin
)
- if "%ri_file%"=="x64" (
appveyor DownloadFile https://dl.bintray.com/oneclick/OpenKnapsack/x64/openssl-1.0.2j-x64-windows.tar.lzma &
7z e openssl-1.0.2j-x64-windows.tar.lzma &
7z x -y openssl-1.0.2j-x64-windows.tar -oC:\ruby23-x64\DevKit\mingw &
set b_config="--with-ssl-dir=C:/ruby23-x64/DevKit/mingw --with-opt-include=C:/ruby23-x64/DevKit/mingw/include" &
set SSL_CERT_FILE=C:/ruby24-x64/ssl/cert.pem
set SSL_CERT_FILE=C:/ruby24-x64/ssl/cert.pem &
C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-i686-ragel &
set PATH=%PATH%;C:\msys64\ming64\bin
)
- RAKEOPT:
- APPVEYOR: true
- ruby --version
- gem --version
- bundle --version
- bundle install --without documentation --path av_bundle/%ruby_version%
- bundle install --without documentation --path C:/av_bundle

# Download & install current OpenSSL package for later RubyInstaller2 version(s)
- set openssl=mingw-w64-x86_64-openssl-1.1.0.g-1-any.pkg.tar.xz
- set dl_uri=https://dl.bintray.com/msp-greg/ruby_trunk
- if %ruby_version%==25-x64 (
C:\msys64\usr\bin\bash -lc "pacman-key -r 77D8FA18 --keyserver na.pool.sks-keyservers.net && pacman-key -f 77D8FA18 && pacman-key --lsign-key 77D8FA18" &
appveyor DownloadFile %dl_uri%/%openssl% -FileName C:\%openssl% &
appveyor DownloadFile %dl_uri%/%openssl%.sig -FileName C:\%openssl%.sig &
C:\msys64\usr\bin\pacman -Rdd --noconfirm mingw-w64-x86_64-openssl &
C:\msys64\usr\bin\pacman -Udd --noconfirm --force C:\%openssl%
)

build_script:
- bundle exec rake -rdevkit compile -- %b_config%
Expand All @@ -45,10 +67,16 @@ environment:
matrix:
- ruby_version: _trunk
b_config: "--use-system-libraries"
ri_file: x64_2
- ruby_version: 25-x64
b_config: "--use-system-libraries"
ri_file: x64_2
- ruby_version: 24
b_config: "--use-system-libraries"
ri_file: x86_2
- ruby_version: 24-x64
b_config: "--use-system-libraries"
ri_file: x64_2
- ruby_version: 23
ri_file: x86
- ruby_version: 23-x64
Expand All @@ -57,13 +85,9 @@ environment:
ri_file: x86
- ruby_version: 22-x64
ri_file: x64
- ruby_version: 21
DISABLE_SSL: true
- ruby_version: 21-x64
DISABLE_SSL: true

cache:
- av_bundle
- C:\av_bundle

branches:
only:
Expand Down
2 changes: 1 addition & 1 deletion lib/puma/minissl.rb
View file
Open in desktop
Expand Up @@ -249,7 +249,7 @@ def accept_nonblock
end

def close
@socket.close
@socket.close unless @socket.closed? # closed? call is for Windows
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

end
end
end
Expand Down
89 changes: 53 additions & 36 deletions test/test_puma_server_ssl.rb
View file
Open in desktop
Expand Up @@ -22,36 +22,43 @@ class TestPumaServerSSL < Minitest::Test

def setup
return if DISABLE_SSL
@port = 3212
@host = "127.0.0.1"
port = 3212
host = "127.0.0.1"

@app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }
app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }

@ctx = Puma::MiniSSL::Context.new
ctx = Puma::MiniSSL::Context.new

if Puma.jruby?
@ctx.keystore = File.expand_path "../../examples/puma/keystore.jks", __FILE__
@ctx.keystore_pass = 'blahblah'
ctx.keystore = File.expand_path "../../examples/puma/keystore.jks", __FILE__
ctx.keystore_pass = 'blahblah'
else
@ctx.key = File.expand_path "../../examples/puma/puma_keypair.pem", __FILE__
@ctx.cert = File.expand_path "../../examples/puma/cert_puma.pem", __FILE__
ctx.key = File.expand_path "../../examples/puma/puma_keypair.pem", __FILE__
ctx.cert = File.expand_path "../../examples/puma/cert_puma.pem", __FILE__
end

@ctx.verify_mode = Puma::MiniSSL::VERIFY_NONE
ctx.verify_mode = Puma::MiniSSL::VERIFY_NONE

@events = SSLEventsHelper.new STDOUT, STDERR
@server = Puma::Server.new @app, @events
@server.add_ssl_listener @host, @port, @ctx
@server = Puma::Server.new app, @events
@ssl_listener = @server.add_ssl_listener host, port, ctx
@server.run

@http = Net::HTTP.new @host, @port
@http = Net::HTTP.new host, port
@http.use_ssl = true
@http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@no_teardown = false
end

def teardown
return if DISABLE_SSL
return if DISABLE_SSL || @no_teardown
@http.finish if @http.started?
@server.stop(true)
ensure
if windows? && @ssl_listener && !@ssl_listener.closed?
@ssl_listener.close
@ssl_listener = nil
end
end

def test_url_scheme_for_https
Expand Down Expand Up @@ -115,7 +122,14 @@ def test_ssl_v3_rejection
end
end
unless Puma.jruby?
assert_match("wrong version number", @events.error.message) if @events.error
assert_match(/wrong version number|no protocols available/, @events.error.message) if @events.error
end
if windows?
@http.finish if @http.started?
@http = nil
@server.thread.kill
@server = nil
@no_teardown = true
end
end

Expand All @@ -125,38 +139,38 @@ def test_ssl_v3_rejection
class TestPumaServerSSLClient < Minitest::Test

def assert_ssl_client_error_match(error, subject=nil, &blk)
@port = 3212
@host = "127.0.0.1"
port = 3212
host = "127.0.0.1"

@app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }
app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }

@ctx = Puma::MiniSSL::Context.new
ctx = Puma::MiniSSL::Context.new
if Puma.jruby?
@ctx.keystore = File.expand_path "../../examples/puma/client-certs/keystore.jks", __FILE__
@ctx.keystore_pass = 'blahblah'
ctx.keystore = File.expand_path "../../examples/puma/client-certs/keystore.jks", __FILE__
ctx.keystore_pass = 'blahblah'
else
@ctx.key = File.expand_path "../../examples/puma/client-certs/server.key", __FILE__
@ctx.cert = File.expand_path "../../examples/puma/client-certs/server.crt", __FILE__
@ctx.ca = File.expand_path "../../examples/puma/client-certs/ca.crt", __FILE__
ctx.key = File.expand_path "../../examples/puma/client-certs/server.key", __FILE__
ctx.cert = File.expand_path "../../examples/puma/client-certs/server.crt", __FILE__
ctx.ca = File.expand_path "../../examples/puma/client-certs/ca.crt", __FILE__
end
@ctx.verify_mode = Puma::MiniSSL::VERIFY_PEER | Puma::MiniSSL::VERIFY_FAIL_IF_NO_PEER_CERT
ctx.verify_mode = Puma::MiniSSL::VERIFY_PEER | Puma::MiniSSL::VERIFY_FAIL_IF_NO_PEER_CERT

events = SSLEventsHelper.new STDOUT, STDERR
@server = Puma::Server.new @app, events
@server.add_ssl_listener @host, @port, @ctx
@server.run
server = Puma::Server.new app, events
ssl_listener = server.add_ssl_listener host, port, ctx
server.run

@http = Net::HTTP.new @host, @port
@http.use_ssl = true
@http.verify_mode = OpenSSL::SSL::VERIFY_NONE
http = Net::HTTP.new host, port
http.use_ssl = true
http.verify_mode = OpenSSL::SSL::VERIFY_NONE

blk.call(@http)
blk.call(http)

client_error = false
begin
@http.start do
http.start do
req = Net::HTTP::Get.new "/", {}
@http.request(req)
http.request(req)
end
rescue OpenSSL::SSL::SSLError
client_error = true
Expand All @@ -168,11 +182,14 @@ def assert_ssl_client_error_match(error, subject=nil, &blk)
# messages here
unless Puma.jruby?
assert_match error, events.error.message if error
assert_equal @host, events.addr if error
assert_equal host, events.addr if error
assert_equal subject, events.cert.subject.to_s if subject
end
ensure
@server.stop(true)

server.stop(true)
if windows? && ssl_listener && !ssl_listener.closed?
ssl_listener.close
end
end

def test_verify_fail_if_no_client_cert
Expand Down