tttls1.3 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89ddf39b7273edf08fbe46e3b043e3407e6858448643558c79e2d745956bb73a
-  data.tar.gz: d3c67e1558ecf55ea64c6e1b7cf2ae8f76c52e25b02efd23161149532a0b35a9
+  metadata.gz: a88e723a99666a675766294bcd4693baad9d49f9d8d2c95e2c9361d74ea74e0a
+  data.tar.gz: e7c18f7242cf74229ae99232366d18854c898ce18e9f5805af8ca5694666e7bc
 SHA512:
-  metadata.gz: 859ba8321cda498360389cc0fdb0cba509cec245f9b822855341e5a50bfcfd9ac38d69b976a55923aaa7026a0973b0d3349d5a1d25826ad70d73074904af0bf0
-  data.tar.gz: 03a828102121e5bc70bdfc39e27e382355f0bc4d8ac9f3f925940d496dc845ec03c2e4c23d097de2a82f1edc3e3110ea4852d098f80239d9c0fa3e94b67fe63d
+  metadata.gz: a36f3a4f8dc7884a3927572285773390e0076ff6f154366aeb85dbda10ed1edbdb0964ab2201b236b77f1b7c862cd61796a5eae9574883790da83b5e2c52c375
+  data.tar.gz: 88688015bd166a0c93bf2c6663eda3649719362228c496a7662bf162e236f1a0a04d7f5aa18d477cb18a3986c97fe9e7cab89fd7c04ba09caa1dd92c70441433

data/.github/workflows/main.yml

@@ -0,0 +1,25 @@
+name: workflow
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-ruby@v1
+      - uses: thekuwayama/openssl@master
+        with:
+          ruby-version: '2.6.x'
+      - run: gem install bundler
+      - run: bundle install
+      - run: docker pull thekuwayama/openssl
+      - run: bundle exec rake
+      - run: bundle exec rake interop:client
+      - run: bundle exec rake interop:server

data/.rubocop.yml

@@ -21,3 +21,7 @@ Metrics/BlockLength:
     - 'Rakefile'
     - 'spec/*.rb'
     - 'interop/*.rb'
+
+Metrics/LineLength:
+  Exclude:
+    - 'tttls1.3.gemspec'

data/README.md

@@ -1,7 +1,7 @@
 # tttls1.3
 
 [![Gem Version](https://badge.fury.io/rb/tttls1.3.svg)](https://badge.fury.io/rb/tttls1.3)
-[![Build Status](https://travis-ci.org/thekuwayama/tttls1.3.svg?branch=master)](https://travis-ci.org/thekuwayama/tttls1.3)
+[![Actions Status](https://github.com/thekuwayama/tttls1.3/workflows/workflow/badge.svg)](https://github.com/thekuwayama/tttls1.3/actions?query=workflow=.github/workflows/main.yml)
 [![Maintainability](https://api.codeclimate.com/v1/badges/47f3c267d9cfd2c8e388/maintainability)](https://codeclimate.com/github/thekuwayama/tttls1.3/maintainability)
 
 tttls1.3 is Ruby implementation of [TLS 1.3](https://tools.ietf.org/html/rfc8446) protocol.

data/example/helper.rb

@@ -21,17 +21,15 @@ def simple_http_request(hostname, path = '/')
 end
 
 def simple_http_response(body)
-  s = <<~RESPONSE
+  h = <<~RESPONSE_HEADER_EOS
     HTTP/1.1 200 OK
     Date: #{Time.now.httpdate}
     Content-Type: text/html
     Content-Length: #{body.length}
     Server: tttls1.3/examples
+  RESPONSE_HEADER_EOS
 
-    #{body}
-  RESPONSE
-
-  s.gsub(WEBrick::LF, WEBrick::CRLF)
+  h.gsub(WEBrick::LF, WEBrick::CRLF) + WEBrick::CRLF + body
 end
 
 def recv_http_response(client)

data/example/https_server.rb

@@ -38,10 +38,10 @@ Etc.nprocessors.times do
         begin
           server.accept
           parser << server.read until server.eof?
-        rescue HTTP::Parser::Error, TTTLS13::Error::ErrorAlerts
-          logger.warn 'Parser Error'
+          server.close
+        rescue StandardError => e
+          logger.warn e
         ensure
-          server.close unless server.eof?
           parser.reset!
         end
       end

data/interop/client_spec.rb

@@ -177,10 +177,10 @@ RSpec.describe Client do
         pid = spawn('docker run ' \
                     + "--volume #{FIXTURES_DIR}:/tmp " \
                     + "--publish #{PORT}:#{PORT} " \
-                    + 'openssl ' + cmd)
+                    + 'thekuwayama/openssl ' + cmd)
         Process.detach(pid)
 
-        wait_to_listen(PORT)
+        wait_to_listen('127.0.0.1', PORT)
       end
 
       let(:client) do

data/interop/helper.rb

@@ -12,6 +12,14 @@ include TTTLS13::Message::Extension
 include TTTLS13::Error
 # rubocop: enable Style/MixinUsage
 
-def wait_to_listen(port)
-  sleep(0.2) while `lsof -ni :#{port}`.empty?
+def wait_to_listen(host, port)
+  loop do
+    s = TCPSocket.open(host, port) # check by TCP handshake
+  rescue # rubocop: disable Style/RescueStandardError
+    sleep(0.2)
+    next
+  else
+    s.close
+    break
+  end
 end

data/interop/server_spec.rb

@@ -176,16 +176,19 @@ RSpec.describe Server do
   ].each do |normal, opt, crt, key, settings|
     context 'server interop' do
       let(:server) do
-        @socket = tcpserver.accept
+        loop do
+          @socket = tcpserver.accept
+          break unless @socket.eof?
+        end
         settings[:crt_file] = crt
         settings[:key_file] = key
         Server.new(@socket, settings)
       end
 
       let(:client) do
-        wait_to_listen(PORT)
-
         ip = Socket.ip_address_list.find(&:ipv4_private?).ip_address
+        wait_to_listen(ip, PORT)
+
         cmd = 'echo -n ping | openssl s_client ' \
               + "-connect local:#{PORT} " \
               + '-tls1_3 ' \
@@ -195,7 +198,7 @@ RSpec.describe Server do
               + opt
         'docker run ' \
         + "--volume #{FIXTURES_DIR}:/tmp " \
-        + "--add-host=local:#{ip} -it openssl " \
+        + "--add-host=local:#{ip} thekuwayama/openssl " \
         + "sh -c \"#{cmd}\" 2>&1 >/dev/null"
       end
 
@@ -216,6 +219,7 @@ RSpec.describe Server do
         it "should NOT accept request from openssl s_client ...#{opt}" do
           spawn(client)
           expect { server.accept }.to raise_error ErrorAlerts
+          expect { server.close }.to_not raise_error
         end
       end
     end

data/lib/tttls1.3/connection.rb

@@ -254,7 +254,7 @@ module TTTLS13
     end
     # rubocop: enable Metrics/CyclomaticComplexity
 
-    # @param wcipher [TTTLS13::Cryptograph::Aead, Passer]
+    # @param cipher [TTTLS13::Cryptograph::Aead, Passer]
     #
     # @return [TTTLS13::Message::Record]
     def recv_record(cipher)

data/lib/tttls1.3/message/extensions.rb

@@ -1,7 +1,8 @@
 # encoding: ascii-8bit
 # frozen_string_literal: true
 
-Dir[File.dirname(__FILE__) + '/extension/*.rb'].each { |f| require f }
+# signature_algorithms_cert.rb needs signature_algorithms.rb so that `sort`
+Dir[File.dirname(__FILE__) + '/extension/*.rb'].sort.each { |f| require f }
 
 module TTTLS13
   using Refinements

data/lib/tttls1.3/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TTTLS13
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

data/tttls1.3.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.version       = TTTLS13::VERSION
   spec.authors       = ['thekuwayama']
   spec.email         = ['thekuwayama@gmail.com']
-  spec.summary       = 'TLS 1.3 implementation in Ruby'
+  spec.summary       = 'TLS 1.3 implementation in Ruby (Tiny Trial TLS1.3 aka tttls1.3)'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/thekuwayama/tttls1.3'
   spec.license       = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tttls1.3
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - thekuwayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,17 +52,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: TLS 1.3 implementation in Ruby
+description: TLS 1.3 implementation in Ruby (Tiny Trial TLS1.3 aka tttls1.3)
 email:
 - thekuwayama@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -75,7 +75,6 @@ files:
 - example/https_client_using_hrr_and_ticket.rb
 - example/https_client_using_ticket.rb
 - example/https_server.rb
-- interop/Dockerfile
 - interop/client_spec.rb
 - interop/helper.rb
 - interop/server_spec.rb
@@ -195,7 +194,7 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: TLS 1.3 implementation in Ruby
+summary: TLS 1.3 implementation in Ruby (Tiny Trial TLS1.3 aka tttls1.3)
 test_files:
 - spec/aead_spec.rb
 - spec/alert_spec.rb

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-
-language: ruby
-
-rvm:
-  - 2.6.3
-  - 2.6.4
-  - 2.7.0-preview1
-
-matrix:
-  allow_failures:
-    - rvm: ruby-2.7.0-preview1
-
-before_install: 
-  - gem install bundler -v 2.0.1
-  - bundle install
-
-script: bundle exec rake

data/interop/Dockerfile

@@ -1,28 +0,0 @@
-FROM ubuntu:18.04
-
-ARG version="1.1.1c"
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        autoconf \
-        bison \
-        build-essential \
-        ca-certificates \
-        curl \
-        gzip \
-        libreadline-dev \
-        patch \
-        pkg-config \
-        sed \
-        zlib1g-dev
-
-RUN mkdir -p /build/openssl
-RUN curl -s https://www.openssl.org/source/openssl-${version}.tar.gz | tar -C /build/openssl -xzf - && \
-        cd /build/openssl/openssl-${version} && \
-        ./Configure \
-        --prefix=/opt/openssl/openssl-${version} \
-        enable-crypto-mdebug enable-crypto-mdebug-backtrace \
-        linux-x86_64 && \
-        make && make install_sw
-
-ENV LD_LIBRARY_PATH /opt/openssl/openssl-${version}/lib
-ENV PATH /opt/openssl/openssl-${version}/bin:$PATH