tipi 0.45 → 0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6abb7798a69adc36e18dda822f7ff025f9f9e286eba50ccaf3905a74f29ef32
-  data.tar.gz: 41ee73bf589d2d4bd764aa58cb71e43477bc52caae708bd05ae4ae6372275415
+  metadata.gz: e174ac4f391f2a5d8a6bc023c8dbe800cb28c7c6ab6ce0f5b30a5a741adfbba3
+  data.tar.gz: 20f4e08c4295e43b4e530005894573170d11488e33ffdb7bd7ac863ea9b24d10
 SHA512:
-  metadata.gz: b23c0bfe27b9e6ff203508ab1a24ecbf10d954996ce9af2045a7d427ccec5746e9ef9df146353e4c134a56c12c4f2518141b46fe342123613c3da713a086a90f
-  data.tar.gz: a2f0fdc533ab39a23dad733535a9371a44a5809485c04114d0e054f4cb4bcb47b0cb27a266d5d58a7e01b8db06daf79a3aa944151de50e61da33f824e4651e43
+  metadata.gz: 44824970035774527e456959c6e8249bd697696ef942e2229b4fc9faa192ab2433c7e78f714af3ac98a4d21fc1e764de718ecd41c9e1374a9d06ab090230ab2f
+  data.tar.gz: 46549f1ae238fc25fe878bb59258da44757ed05e84177f113a40f00d962f43947d9bbd44f78f1e97be386001d34fadfba8679a5d0a6c647f4dca618769a8116d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.46 2022-02-01
+
+- Allow setting valid hosts
+- Change interface of Qeweney apps to use #run (#15)
+- Close server listener before terminating connections
+
 ## 0.45 2021-10-25
 
 - Remove `http_parser.rb` dependency (#14) - thanks @SwagDevOps

data/Gemfile.lock

@@ -11,18 +11,18 @@ PATH
 PATH
   remote: ../polyphony
   specs:
-    polyphony (0.71)
+    polyphony (0.73.1)
 
 PATH
   remote: ../qeweney
   specs:
-    qeweney (0.14)
+    qeweney (0.16)
       escape_utils (~> 1.2.1)
 
 PATH
   remote: .
   specs:
-    tipi (0.45)
+    tipi (0.46)
       acme-client (~> 2.0.8)
       ever (~> 0.1)
       extralite (~> 1.2)
@@ -44,32 +44,36 @@ GEM
       rack (>= 1.6.0)
     docile (1.4.0)
     escape_utils (1.2.1)
-    extralite (1.4)
-    faraday (1.8.0)
+    extralite (1.11)
+    faraday (1.9.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     http-2 (0.11.0)
     json (2.5.1)
     localhost (1.1.9)
     memory_profiler (1.0.0)
     minitest (5.11.3)
-    msgpack (1.4.2)
+    msgpack (1.4.4)
     multipart-post (2.1.1)
     rack (2.2.3)
     rake (13.0.6)
@@ -97,4 +101,4 @@ DEPENDENCIES
   tipi!
 
 BUNDLED WITH
-   2.1.4
+   2.3.3

data/examples/hello.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-def app
-  ->(req) { req.respond('Hello, world!', 'Content-Type' => 'text/plain') }
-end
+run { |req|
+  req.respond('Hello, world!')
+}

data/examples/hello.ru

@@ -2,8 +2,8 @@
 
 run lambda { |env|
   [
-        200,
-        {"Content-Type" => "text/plain"},
-        ["Hello, world!"]
+    200,
+    {"Content-Type" => "text/plain"},
+    ["Hello, world!"]
   ]
 }

data/lib/tipi/acme.rb

@@ -10,10 +10,11 @@ module Tipi
     end
 
     class CertificateManager
-      def initialize(master_ctx:, store:, challenge_handler:)
+      def initialize(master_ctx:, store:, challenge_handler:, valid_hosts:)
         @master_ctx = master_ctx
         @store = store
         @challenge_handler = challenge_handler
+        @valid_hosts = valid_hosts
         @contexts = {}
         @requests = Polyphony::Queue.new
         @worker = spin { run }
@@ -41,6 +42,10 @@ module Tipi
       def get_ctx(name)
         state = { ctx: nil }
 
+        if @valid_hosts
+          return nil unless @valid_hosts.include?(name)
+        end
+
         ready_ctx = @contexts[name]
         return ready_ctx if ready_ctx
         return @master_ctx if name =~ IP_REGEXP

data/lib/tipi/controller/extensions.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'tipi'
+
+module Kernel
+  def run(app = nil, &block)
+    Tipi.app = app || block
+  end
+end
+
+module Tipi
+  class << self
+    attr_writer :app
+
+    def app
+      return @app if @app
+      
+      raise 'No app define. The app to run should be set using `Tipi.app = ...`'
+    end
+
+    def run_sites(site_map)
+      sites = site_map.each_with_object({}) { |(k, v), h| h[k] = v.to_proc }
+      valid_hosts = sites.keys
+
+      @app = ->(req) {
+        handler = sites[req.host]
+        if handler
+          handler.call(req)
+        else
+          req.respond(nil, ':status' => Qeweney::Status::NOT_FOUND)
+        end
+      }
+
+      @app.define_singleton_method(:valid_hosts) { valid_hosts }
+    end
+  end
+end

data/lib/tipi/controller/web_polyphony.rb

@@ -2,6 +2,7 @@
 
 require 'tipi'
 require 'localhost/authority'
+require_relative './extensions'
 
 module Tipi
   class Controller
@@ -89,7 +90,7 @@ module Tipi
     def tipi_service
       puts "Loading Tipi app from #{@path}"
       require(@path)
-      app = Object.send(:app)
+      app = Tipi.app
       web_service(app)
       # proc { spin { Object.run } }
     end
@@ -200,7 +201,8 @@ module Tipi
         certificate_manager = Tipi::ACME::CertificateManager.new(
           master_ctx: ctx,
           store: certificate_store,
-          challenge_handler: challenge_handler
+          challenge_handler: challenge_handler,
+          valid_hosts: app.respond_to?(:valid_hosts) ? app.valid_hosts : nil
         )
         http_app = certificate_manager.challenge_routing_app(redirect_app)
 
@@ -277,8 +279,8 @@ module Tipi
 
     def finalize_listener(server)
       fiber  = Fiber.current
-      gracefully_terminate_conections(fiber) if fiber.graceful_shutdown?
       server.close
+      gracefully_terminate_conections(fiber) if fiber.graceful_shutdown?
     rescue Polyphony::BaseException
       raise
     rescue Exception => e

data/lib/tipi/controller/web_stock.rb

@@ -5,6 +5,7 @@ require 'localhost/authority'
 require 'http/parser'
 require 'qeweney'
 require 'tipi/rack_adapter'
+require_relative './extensions'
 
 module Tipi
   class Listener
@@ -360,7 +361,10 @@ module Tipi
     def tipi_service
       puts "Loading Tipi app from #{@path}"
       require(@path)
-      app = Object.send(:app)
+      app = Tipi.app
+      if !app
+        raise "No app define. The app to run should be set using `Tipi.app = ...`"
+      end
       web_service(app)
     end
 

data/lib/tipi/http2_stream.rb

@@ -6,7 +6,6 @@ require 'qeweney/request'
 module Tipi
   # Manages an HTTP 2 stream
   class HTTP2StreamHandler
-    attr_accessor :__next__
     attr_reader :conn
 
     def initialize(adapter, stream, conn, first, &block)

data/lib/tipi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tipi
-  VERSION = '0.45'
+  VERSION = '0.46'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.45'
+  version: '0.46'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -240,7 +240,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.3
-description: 
+description:
 email: sharon@noteflakes.com
 executables:
 - tipi
@@ -319,6 +319,7 @@ files:
 - lib/tipi/controller.rb
 - lib/tipi/controller/bare_polyphony.rb
 - lib/tipi/controller/bare_stock.rb
+- lib/tipi/controller/extensions.rb
 - lib/tipi/controller/stock_http1_adapter.rb
 - lib/tipi/controller/web_polyphony.rb
 - lib/tipi/controller/web_stock.rb
@@ -351,7 +352,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/digital-fabric/tipi
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - tipi
@@ -370,8 +371,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Tipi - the All-in-one Web Server for Ruby Apps
 test_files: []