tipi 0.41 → 0.42

data/test/test_http_server.rb

@@ -9,33 +9,6 @@ class String
   end
 end
 
-class IO
-  # Creates two mockup sockets for simulating server-client communication
-  def self.server_client_mockup
-    server_in, client_out = IO.pipe
-    client_in, server_out = IO.pipe
-
-    server_connection = mockup_connection(server_in, server_out, client_out)
-    client_connection = mockup_connection(client_in, client_out, server_out)
-
-    [server_connection, client_connection]
-  end
-
-  def self.mockup_connection(input, output, output2)
-    eg(
-      :read        => ->(*args) { input.read(*args) },
-      :read_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :recv_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :readpartial => ->(*args) { input.readpartial(*args) },
-      :recv        => ->(*args) { input.readpartial(*args) },
-      :<<          => ->(*args) { output.write(*args) },
-      :write       => ->(*args) { output.write(*args) },
-      :close       => -> { output.close },
-      :eof?        => -> { output2.closed? }
-    )
-  end
-end
-
 class HTTP1ServerTest < MiniTest::Test
   def teardown
     @server&.interrupt if @server&.alive?

data/test/test_request.rb

@@ -9,33 +9,6 @@ class String
   end
 end
 
-class IO
-  # Creates two mockup sockets for simulating server-client communication
-  def self.server_client_mockup
-    server_in, client_out = IO.pipe
-    client_in, server_out = IO.pipe
-
-    server_connection = mockup_connection(server_in, server_out, client_out)
-    client_connection = mockup_connection(client_in, client_out, server_out)
-
-    [server_connection, client_connection]
-  end
-
-  def self.mockup_connection(input, output, output2)
-    eg(
-      :read        => ->(*args) { input.read(*args) },
-      :read_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :recv_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :readpartial => ->(*args) { input.readpartial(*args) },
-      :recv        => ->(*args) { input.readpartial(*args) },
-      :<<          => ->(*args) { output.write(*args) },
-      :write       => ->(*args) { output.write(*args) },
-      :close       => -> { output.close },
-      :eof?        => -> { output2.closed? }
-    )
-  end
-end
-
 class RequestHeadersTest < MiniTest::Test
   def teardown
     @server&.interrupt if @server&.alive?
@@ -65,7 +38,7 @@ class RequestHeadersTest < MiniTest::Test
     assert_kind_of Qeweney::Request, req
     assert_equal 'blah.com', req.headers['host']
     assert_equal 'bar', req.headers['foo']
-    assert_equal ['1', '3', '2'], req.headers['hi']
+    assert_equal ['1', '2', '3'], req.headers['hi']
     assert_equal 'get', req.headers[':method']
     assert_equal '/titi', req.headers[':path']
   end

data/tipi.gemspec

@@ -20,24 +20,25 @@ Gem::Specification.new do |s|
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.64'
-  s.add_runtime_dependency      'qeweney',            '~>0.11'
+  s.add_runtime_dependency      'polyphony',          '~>0.69'
+  s.add_runtime_dependency      'qeweney',            '~>0.14'
+  s.add_runtime_dependency      'extralite',          '~>1.2'
   
-  s.add_runtime_dependency      'http_parser.rb',     '~>0.6.0'
-  s.add_runtime_dependency      'http-2',             '~>0.10.0'
+  s.add_runtime_dependency      'http-2',             '~>0.11'
   s.add_runtime_dependency      'rack',               '>=2.0.8', '<2.3.0'
   s.add_runtime_dependency      'websocket',          '~>1.2.8'
   s.add_runtime_dependency      'acme-client',        '~>2.0.8'
+  s.add_runtime_dependency      'localhost',          '~>1.1.4'
 
   # for digital fabric
   s.add_runtime_dependency      'msgpack',            '~>1.4.2'
 
   s.add_development_dependency  'rake-compiler',        '1.1.1'
   s.add_development_dependency  'rake',               '~>12.3.3'
-  s.add_development_dependency  'localhost',          '~>1.1.4'
   s.add_development_dependency  'minitest',           '~>5.11.3'
   s.add_development_dependency  'minitest-reporters', '~>1.4.2'
   s.add_development_dependency  'simplecov',          '~>0.17.1'
 
   s.add_development_dependency  'cuba',               '~>3.9.3'
+  s.add_development_dependency  'http_parser.rb',     '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.41'
+  version: '0.42'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.69'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.69'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: http_parser.rb
+  name: extralite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: http-2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.8
+- !ruby/object:Gem::Dependency
+  name: localhost
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -156,20 +170,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: localhost
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +226,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.3
+- !ruby/object:Gem::Dependency
+  name: http_parser.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: 
 email: sharon@noteflakes.com
 executables:
@@ -244,6 +258,9 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- benchmarks/bm_http1_parser.rb
+- bin/benchmark
+- bin/h1pd
 - bin/tipi
 - df/agent.rb
 - df/etc_benchmark.rb
@@ -258,8 +275,8 @@ files:
 - df/ws_page.html
 - docs/README.md
 - docs/tipi-logo.png
-- examples/automatic_certificate.rb
 - examples/cuba.ru
+- examples/full_service.rb
 - examples/hanami-api.ru
 - examples/hello.ru
 - examples/http1_parser.rb
@@ -284,6 +301,7 @@ files:
 - examples/rack_server_https.rb
 - examples/rack_server_https_forked.rb
 - examples/routing_server.rb
+- examples/servername_cb.rb
 - examples/websocket_client.rb
 - examples/websocket_demo.rb
 - examples/websocket_secure_server.rb
@@ -295,6 +313,8 @@ files:
 - ext/tipi/http1_parser.h
 - ext/tipi/tipi_ext.c
 - lib/tipi.rb
+- lib/tipi/acme.rb
+- lib/tipi/cli.rb
 - lib/tipi/config_dsl.rb
 - lib/tipi/configuration.rb
 - lib/tipi/digital_fabric.rb
@@ -307,17 +327,18 @@ files:
 - lib/tipi/digital_fabric/service.rb
 - lib/tipi/handler.rb
 - lib/tipi/http1_adapter.rb
-- lib/tipi/http1_adapter_new.rb
 - lib/tipi/http2_adapter.rb
 - lib/tipi/http2_stream.rb
 - lib/tipi/rack_adapter.rb
 - lib/tipi/response_extensions.rb
 - lib/tipi/version.rb
 - lib/tipi/websocket.rb
+- security/http1.rb
 - test/coverage.rb
 - test/eg.rb
 - test/helper.rb
 - test/run.rb
+- test/test_http1_parser.rb
 - test/test_http_server.rb
 - test/test_request.rb
 - tipi.gemspec

data/examples/automatic_certificate.rb

@@ -1,193 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'tipi'
-require 'openssl'
-require 'acme-client'
-
-# ::Exception.__disable_sanitized_backtrace__ = true
-
-class CertificateManager
-  def initialize(store:, challenge_handler:)
-    @store = store
-    @challenge_handler = challenge_handler
-    @workers = {}
-    @contexts = {}
-  end
-
-  def [](name)
-    worker = worker_for_name(name)
-    p worker: worker
-  
-    worker << Fiber.current
-    # cancel_after(30) { receive }
-    receive.tap { |ctx| p got_ctx: ctx }
-  rescue Exception => e
-    p e
-    puts e.backtrace.join("\n")
-    nil
-  end
-  
-  def worker_for_name(name)
-    @workers[name] ||= spin { worker_loop(name) }
-  end
-  
-  def worker_loop(name)
-    while (client = receive)
-      puts "get request for #{name} from #{client.inspect}"
-      ctx = get_context(name)
-      client << ctx rescue nil
-    end
-  end
-
-  def get_context(name)
-    @contexts[name] ||= setup_context(name)
-  end
-
-  CERTIFICATE_REGEXP = /(-----BEGIN CERTIFICATE-----\n[^-]+-----END CERTIFICATE-----\n)/.freeze
-
-  def setup_context(name)
-    certificate = get_certificate(name)
-    ctx = OpenSSL::SSL::SSLContext.new
-    chain = certificate.scan(CERTIFICATE_REGEXP).map { |p|  OpenSSL::X509::Certificate.new(p.first) }
-    cert = chain.shift
-    puts "Certificate expires: #{cert.not_after.inspect}"
-    ctx.add_certificate(cert, private_key, chain)
-    Polyphony::Net.setup_alpn(ctx, Tipi::ALPN_PROTOCOLS)
-    ctx
-  end
-  
-  def get_certificate(name)
-    @store[name] ||= provision_certificate(name)
-  end
-
-  def private_key
-    @private_key ||= OpenSSL::PKey::RSA.new(4096)
-  end
-
-  ACME_DIRECTORY = 'https://acme-staging-v02.api.letsencrypt.org/directory'
-
-  def acme_client
-    @acme_client ||= setup_acme_client
-  end
-
-  def setup_acme_client
-    client = Acme::Client.new(
-      private_key: private_key,
-      directory: ACME_DIRECTORY
-    )
-    p client: client
-    account = client.new_account(
-      contact: 'mailto:info@noteflakes.com',
-      terms_of_service_agreed: true
-    )
-    p account: account.kid
-    client
-  end
-
-  def provision_certificate(name)
-    order = acme_client.new_order(identifiers: [name])
-    p order: true
-    authorization = order.authorizations.first
-    p authorization: authorization
-    challenge = authorization.http
-    p challenge: challenge
-  
-    @challenge_handler.add(challenge)
-    challenge.request_validation
-    p challenge_status: challenge.status
-    while challenge.status == 'pending'
-      sleep(1)
-      challenge.reload
-      p challenge_status: challenge.status
-    end
-  
-    csr = Acme::Client::CertificateRequest.new(private_key: @private_key, subject: { common_name: name })
-    p csr: csr
-    order.finalize(csr: csr)
-    p order_status: order.status
-    while order.status == 'processing'
-      sleep(1)
-      order.reload
-      p order_status: order.status
-    end
-    order.certificate.tap { |c| p certificate: c } # => PEM-formatted certificate
-  end
-end
-
-class AcmeHTTPChallengeHandler
-  def initialize
-    @challenges = {}
-  end
-
-  def add(challenge)
-    path = "/.well-known/acme-challenge/#{challenge.token}"
-    @challenges[path] = challenge
-  end
-
-  def call(req)
-    # handle incoming request
-    challenge = @challenges[req.path]
-    return req.respond(nil, ':status' => 400) unless challenge
-
-    req.respond(challenge.file_content, 'content-type' => challenge.content_type)
-    @challenges.delete(req.path)
-  end
-end
-
-challenge_handler = AcmeHTTPChallengeHandler.new
-certificate_manager = CertificateManager.new(
-  store: {},
-  challenge_handler: challenge_handler
-)
-
-http_handler = Tipi.route do |r|
-  r.on('/.well-known/acme-challenge') { challenge_handler.call(r) }
-  r.default { r.redirect "https://#{r.host}#{r.path}" }
-end
-
-https_handler = ->(r) { r.respond('Hello, world!') }
-
-http_listener = spin do
-  opts = {
-    reuse_addr:  true,
-    dont_linger: true,
-  }
-  puts 'Listening for HTTP on localhost:10080'
-  Tipi.serve('0.0.0.0', 10080, opts, &http_handler)
-end
-
-https_listener = spin do
-  ctx = OpenSSL::SSL::SSLContext.new
-  ctx.servername_cb = proc { |_, name| p name: name; certificate_manager[name] }
-  opts = {
-    reuse_addr:     true,
-    dont_linger:    true,
-    secure_context: ctx,
-    alpn_protocols: Tipi::ALPN_PROTOCOLS
-  }
-
-  puts 'Listening for HTTPS on localhost:10443'
-  server = Polyphony::Net.tcp_listen('0.0.0.0', 10443, opts)
-  server.accept_loop do |client|
-    spin do
-      service.incr_connection_count
-      Tipi.client_loop(client, opts) { |req| service.http_request(req) }
-    ensure
-      service.decr_connection_count
-    end
-  rescue Exception => e
-    puts "HTTPS accept_loop error: #{e.inspect}"
-    puts e.backtrace.join("\n")
-  end
-end
-
-begin
-  Fiber.await(http_listener, https_listener)
-rescue Interrupt
-  puts "Got SIGINT, terminating"
-rescue Exception => e
-  puts '*' * 40
-  p e
-  puts e.backtrace.join("\n")
-end