tipi 0.43 → 0.45

data/lib/tipi/acme.rb

@@ -35,32 +35,41 @@ module Tipi
       IP_REGEXP = /^\d+\.\d+\.\d+\.\d+$/
 
       def setup_sni_callback
-        @master_ctx.servername_cb = proc do |_socket, name|
-          p servername_cb: name
-          state = { ctx: nil }
-
-          if name =~ IP_REGEXP
-            @master_ctx
-          else
-            @requests << [name, state]
-            wait_for_ctx(state)
-            p name: name, error: state if state[:error]
-            # Eventually we might want to return an error returned in
-            # state[:error]. For the time being we handle errors by returning the
-            # master context
-            state[:ctx] || @master_ctx
-          end
-        end
+        @master_ctx.servername_cb = proc { |_socket, name| get_ctx(name) }
       end
-    
+
+      def get_ctx(name)
+        state = { ctx: nil }
+
+        ready_ctx = @contexts[name]
+        return ready_ctx if ready_ctx
+        return @master_ctx if name =~ IP_REGEXP
+
+        @requests << [name, state]
+        wait_for_ctx(state)
+        # Eventually we might want to return an error returned in
+        # state[:error]. For the time being we handle errors by returning the
+        # master context
+        state[:ctx] || @master_ctx
+      rescue => e
+        @master_ctx
+      end
+
+      MAX_WAIT_FOR_CTX_DURATION = 30
+
       def wait_for_ctx(state)
+        t0 = Time.now
         period = 0.00001
         while !state[:ctx] && !state[:error]
           orig_sleep period
-          period *= 2 if period < 0.1
+          if period < 0.1
+            period *= 2
+          elsif Time.now - t0 > MAX_WAIT_FOR_CTX_DURATION
+            raise "Timeout waiting for certificate provisioning"
+          end
         end
       end
-      
+
       def run
         loop do
           name, state = @requests.shift
@@ -69,13 +78,13 @@ module Tipi
           state[:error] = e if state
         end
       end
-    
+
       LOCALHOST_REGEXP = /\.?localhost$/.freeze
 
       def get_context(name)
         @contexts[name] = setup_context(name)
       end
-    
+
       def setup_context(name)
         ctx = provision_context(name)
         transfer_ctx_settings(ctx)
@@ -100,7 +109,7 @@ module Tipi
       end
 
       CERTIFICATE_REGEXP = /(-----BEGIN CERTIFICATE-----\n[^-]+-----END CERTIFICATE-----\n)/.freeze
-    
+
       def parse_certificate(certificate)
         certificate
           .scan(CERTIFICATE_REGEXP)
@@ -126,17 +135,17 @@ module Tipi
         @localhost_authority ||= Localhost::Authority.fetch
         @localhost_authority.server_context
       end
-    
+
       def private_key
         @private_key ||= OpenSSL::PKey::RSA.new(4096)
       end
-    
+
       ACME_DIRECTORY = 'https://acme-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,
@@ -148,13 +157,12 @@ module Tipi
         )
         client
       end
-    
+
       def provision_certificate(name)
-        p provision_certificate: name
         order = acme_client.new_order(identifiers: [name])
         authorization = order.authorizations.first
         challenge = authorization.http
-      
+
         @challenge_handler.add(challenge)
         challenge.request_validation
         while challenge.status == 'pending'
@@ -162,8 +170,7 @@ module Tipi
           challenge.reload
         end
         raise ACME::Error, "Invalid CSR" if challenge.status == 'invalid'
-      
-        p challenge_status: challenge.status
+
         private_key = OpenSSL::PKey::RSA.new(4096)
         csr = Acme::Client::CertificateRequest.new(
           private_key: private_key,
@@ -189,33 +196,33 @@ module Tipi
         }
       end
     end
-  
+
     class HTTPChallengeHandler
       def initialize
         @challenges = {}
       end
-    
+
       def add(challenge)
         path = "/.well-known/acme-challenge/#{challenge.token}"
         @challenges[path] = challenge
       end
-    
+
       def remove(challenge)
         path = "/.well-known/acme-challenge/#{challenge.token}"
         @challenges.delete(path)
       end
-    
+
       def call(req)
         challenge = @challenges[req.path]
-    
+
         # 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)
       end
-    end    
-  
+    end
+
     class CertificateStore
       def set(name, private_key:, certificate:, expired_stamp:)
         raise NotImplementedError

data/lib/tipi/cli.rb

@@ -2,29 +2,92 @@
 
 require 'tipi'
 require 'fileutils'
+require 'tipi/supervisor'
+require 'optparse'
 
 module Tipi
+  DEFAULT_OPTS = {
+    app_type: :web,
+    mode: :polyphony,
+    workers: 1,
+    threads: 1,
+    listen: ['http', 'localhost', 1234],
+    path: '.',
+  }
+
+  def self.opts_from_argv(argv)
+    opts = DEFAULT_OPTS.dup
+    parser = OptionParser.new do |o|
+      o.banner = "Usage: tipi [options] path"
+      o.on('-h', '--help', 'Show this help') { puts o; exit }
+      o.on('-wNUM', '--workers NUM', 'Number of worker processes (default: 1)') do |v|
+        opts[:workers] = v
+      end
+      o.on('-tNUM', '--threads NUM', 'Number of worker threads (default: 1)') do |v|
+        opts[:threads] = v
+        opts[:mode] = :stock
+      end
+      o.on('-c', '--compatibility', 'Use compatibility mode') do
+        opts[:mode] = :stock
+      end
+      o.on('-lSPEC', '--listen SPEC', 'Setup HTTP listener') do |v|
+        opts[:listen] = parse_listen_spec('http', v)
+      end
+      o.on('-sSPEC', '--secure SPEC', 'Setup HTTPS listener (for localhost)') do |v|
+        opts[:listen] = parse_listen_spec('https', v)
+      end
+      o.on('-fSPEC', '--full-service SPEC', 'Setup HTTP/HTTPS listeners (with automatic certificates)') do |v|
+        opts[:listen] = parse_listen_spec('full', v)
+      end
+      o.on('-v', '--verbose', 'Verbose output') do
+        opts[:verbose] = true
+      end
+    end.parse!(argv)
+    opts[:path] = argv.shift unless argv.empty?
+    verify_path(opts[:path])
+    opts
+  end
+
+  def self.parse_listen_spec(type, spec)
+    [type, *spec.split(':').map { |s| str_to_native_type(s) }]
+  end
+
+  def self.str_to_native_type(str)
+    case str
+    when /^\d+$/
+      str.to_i
+    else
+      str
+    end
+  end
+
+  def self.verify_path(path)
+    return if File.file?(path) || File.directory?(path)
+
+    puts "Invalid path specified #{opts[:path]}"
+    exit!
+  end
+
   module CLI
-    BANNER = "
-         ooo
-       oo
-     o
-   \\|/    Tipi - a better web server for a better world
-   / \\       
-  /   \\      https://github.com/digital-fabric/tipi
-⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺
-"
-
-    def self.start
-      display_banner
-      require File.expand_path(ARGV[0] || 'app.rb', FileUtils.pwd)
+    BANNER =
+      "\n" +
+      "         ooo\n" +
+      "       oo\n" +
+      "     o\n" +
+      "   \\|/    Tipi - a better web server for a better world\n" +
+      "   / \\       \n" +
+      "  /   \\      https://github.com/digital-fabric/tipi\n" +
+      "⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺⎺\n"
+
+    def self.start(argv = ARGV.dup)
+      opts = Tipi.opts_from_argv(argv)
+      display_banner if STDOUT.tty? && !opts[:silent]
+
+      Tipi::Supervisor.run(opts)
     end
 
     def self.display_banner
       puts BANNER
-      puts
     end
   end
 end
-
-__END__

data/lib/tipi/config_dsl.rb

@@ -4,28 +4,28 @@ module Tipi
   module Configuration
     class Interpreter
       # make_blank_slate
-      
+
       def initialize(assembler)
         @assembler = assembler
       end
-      
+
       def gzip_response
         @assembler.emit 'req = Tipi::GZip.wrap(req)'
       end
-      
+
       def log(out)
         @assembler.wrap_current_frame 'logger.log_request(req) do |req|'
       end
-        
+
       def error(&block)
         assembler.emit_exception_handler &block
       end
-        
+
       def match(pattern, &block)
         @assembler.emit_conditional "if req.path =~ #{pattern.inspect}", &block
       end
     end
-      
+
     class Assembler
       def self.from_source(code)
         new.from_source code
@@ -36,7 +36,7 @@ module Tipi
         @app_procs = {}
         @interpreter = Interpreter.new self
         @interpreter.instance_eval code
-        
+
         loop do
           frame = @stack.pop
           return assemble_app_proc(frame).join("\n") if @stack.empty?
@@ -51,7 +51,7 @@ module Tipi
           body: []
         }
       end
-        
+
       def add_frame(&block)
         @stack.push new_frame
         yield
@@ -67,20 +67,20 @@ module Tipi
         @stack.push wrapper
         @stack.push frame
       end
-        
+
       def emit(code)
         @stack.last[:body] << code
       end
-      
+
       def emit_prelude(code)
         @stack.last[:prelude] << code
       end
-      
+
       def emit_exception_handler(&block)
         proc_id = add_app_proc block
         @stack.last[:rescue_proc_id] = proc_id
       end
-      
+
       def emit_block(conditional, &block)
         proc_id = add_app_proc block
         @stack.last[:branched] = true
@@ -93,7 +93,7 @@ module Tipi
         @app_procs[id] = proc
         id
       end
-      
+
       def assemble_frame(frame)
         indent = 0
         lines = []

data/lib/tipi/configuration.rb

@@ -12,7 +12,7 @@ module Tipi
           old_runner&.stop
         end
       end
-      
+
       def run(config)
         start_listeners(config)
         config[:forked] ? forked_supervise(config) : simple_supervise(config)
@@ -29,7 +29,7 @@ module Tipi
         suspend
         # supervise(restart: true)
       end
-      
+
       def forked_supervise(config)
         config[:forked].times do
           spin { Polyphony.watch_process { simple_supervise(config) } }

data/lib/tipi/controller/bare_stock.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Tipi
+  module Apps
+    module Bare
+      def start(opts)
+      end
+    end
+  end
+end

data/lib/tipi/controller/stock_http1_adapter.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'tipi/http1_adapter'
+
+module Tipi
+  class StockHTTP1Adapter < HTTP1Adapter
+    def initialize(conn, opts)
+      super(conn, opts)
+
+    end
+
+    def each(&block)
+    end
+  end
+end