Fixes #25293 - Support Puma

bin/smart-proxy

@@ -3,4 +3,5 @@
 $LOAD_PATH.unshift(*Dir[File.expand_path('../lib', __dir__), File.expand_path('../modules', __dir__)])
 
 require 'smart_proxy_main'
+require 'proxy/launcher'
 Proxy::Launcher.new.launch

config.ru

@@ -1,5 +1,7 @@
-$LOAD_PATH.unshift *Dir[File.expand_path('lib', __dir__), File.expand_path('modules', __dir__)]
+$LOAD_PATH.unshift(*Dir[File.expand_path('lib', __dir__), File.expand_path('modules', __dir__)])
 
 require 'smart_proxy_main'
-::Proxy::PluginInitializer.new(::Proxy::Plugins.instance).initialize_plugins
-::Proxy::Plugins.instance.select { |p| p[:state] == :running && p[:https_enabled] }.each { |p| instance_eval(p[:class].https_rackup) }
+require 'proxy/app'
+plugins = ::Proxy::Plugins.instance
+::Proxy::PluginInitializer.new(plugins).initialize_plugins
+run ::Proxy::App.new(plugins)

lib/proxy/app.rb

@@ -0,0 +1,29 @@
+module Proxy
+  class App
+    def initialize(plugins)
+      @apps = {}
+
+      http_plugins = plugins.select { |p| p[:state] == :running && p[:http_enabled] }
+      if http_plugins.any?
+        @apps['http'] = Rack::Builder.new do
+          http_plugins.each { |p| instance_eval(p[:class].http_rackup) }
+        end
+      end
+
+      https_plugins = plugins.select { |p| p[:state] == :running && p[:https_enabled] }
+      if https_plugins.any?
+        @apps['https'] = Rack::Builder.new do
+          https_plugins.each { |p| instance_eval(p[:class].https_rackup) }
+        end
+      end
+    end
+
+    def call(env)
+      # TODO: Respect X-Forwarded-Proto?
+      scheme = env['rack.url_scheme']
+      app = @apps[scheme]
+      fail "Unsupported URL scheme #{scheme}" unless app
+      app.call(env)
+    end
+  end
+end

lib/proxy/launcher.rb

@@ -0,0 +1,106 @@
+require 'proxy/log'
+require 'proxy/settings'
+require 'proxy/signal_handler'
+require 'proxy/log_buffer/trace_decorator'
+
+CIPHERS = ['ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES256-GCM-SHA384',
+           'AES128-GCM-SHA256', 'AES256-GCM-SHA384', 'AES128-SHA256',
+           'AES256-SHA256', 'AES128-SHA', 'AES256-SHA'].freeze
+
+module Proxy
+  class Launcher
+    include ::Proxy::Log
+
+    attr_reader :settings
+
+    def initialize(settings = ::Proxy::SETTINGS)
+      @settings = settings
+    end
+
+    def pid_path
+      settings.daemon_pid
+    end
+
+    def http_enabled?
+      !settings.http_port.nil?
+    end
+
+    def https_enabled?
+      settings.ssl_private_key && settings.ssl_certificate && settings.ssl_ca_file
+    end
+
+    def plugins
+      ::Proxy::Plugins.instance
+    end
+
+    def pid_status
+      return :exited unless File.exist?(pid_path)
+      pid = ::File.read(pid_path).to_i
+      return :dead if pid == 0
+      Process.kill(0, pid)
+      :running
+    rescue Errno::ESRCH
+      :dead
+    rescue Errno::EPERM
+      :not_owned
+    end
+
+    def check_pid
+      case pid_status
+      when :running, :not_owned
+        logger.error "A server is already running. Check #{pid_path}"
+        exit(2)
+      when :dead
+        File.delete(pid_path)
+      end
+    end
+
+    def write_pid
+      FileUtils.mkdir_p(File.dirname(pid_path)) unless File.exist?(pid_path)
+      File.open(pid_path, ::File::CREAT | ::File::EXCL | ::File::WRONLY) { |f| f.write(Process.pid.to_s) }
+      at_exit { File.delete(pid_path) if File.exist?(pid_path) }
+    rescue Errno::EEXIST
+      check_pid
+      retry
+    end
+
+    def ciphers
+      CIPHERS - settings.ssl_disabled_ciphers
+    end
+
+    def launch
+      raise Exception.new("Both http and https are disabled, unable to start.") unless http_enabled? || https_enabled?
+
+      if settings.daemon
+        check_pid
+        Process.daemon
+        write_pid
+      end
+
+      ::Proxy::PluginInitializer.new(plugins).initialize_plugins
+
+      case settings.http_server_type
+      when 'webrick'
+        require 'proxy/launcher/webrick'
+        launcher = ::Launcher::Webrick.new(self)
+      when 'puma'
+        require 'proxy/launcher/puma'
+        launcher = ::Launcher::Puma.new(self)
+      else
+        fail "Unknown http_server_type: #{settings.http_server_type}"
+      end
+
+      launcher.launch
+    rescue SignalException => e
+      logger.debug("Caught #{e}. Exiting")
+      raise
+    rescue SystemExit
+      # do nothing. This is to prevent the exception handler below from catching SystemExit exceptions.
+      raise
+    rescue Exception => e
+      logger.error "Error during startup, terminating", e
+      puts "Errors detected on startup, see log for details. Exiting: #{e}"
+      exit(1)
+    end
+  end
+end

lib/proxy/launcher/puma.rb

@@ -0,0 +1,87 @@
+require 'puma'
+require 'puma/configuration'
+require 'proxy/app'
+
+module Launcher
+  class Puma
+    attr_reader :launcher
+
+    def initialize(launcher)
+      @launcher = launcher
+    end
+
+    def launch
+      ::Puma::Launcher.new(conf).run
+    end
+
+    private
+
+    def conf
+      ::Puma::Configuration.new do |user_config|
+        user_config.environment('production')
+        user_config.app(app)
+
+        if launcher.http_enabled?
+          bind_hosts do |host|
+            user_config.bind "tcp://#{host}:#{settings.http_port}"
+          end
+        end
+
+        if launcher.https_enabled?
+          ssl_options = {
+            key: settings.ssl_private_key,
+            cert: settings.ssl_certificate,
+            ca: settings.ssl_ca_file,
+            ssl_cipher_filter: launcher.ciphers.join(':'),
+            verify_mode: 'peer',
+            no_tlsv1: true,
+            no_tlsv1_1: true,
+          }
+
+          bind_hosts do |host|
+            user_config.ssl_bind(host, settings.https_port, ssl_options)
+          end
+        end
+
+        user_config.on_restart do
+          ::Proxy::LogBuffer::Decorator.instance.roll_log = true
+        end
+
+        begin
+          user_config.plugin('systemd')
+        rescue ::Puma::UnknownPlugin
+        end
+      end
+    end
+
+    def app
+      ::Proxy::App.new(launcher.plugins)
+    end
+
+    def binds
+    end
+
+    def bind_hosts
+      settings.bind_host.each do |host|
+        if host == '*'
+          yield ipv6_enabled? ? '[::]' : '0.0.0.0'
+        else
+          begin
+            addr = IPAddr.new(host)
+            yield addr.ipv6? ? "[#{addr}]" : addr.to_s
+          rescue IPAddr::InvalidAddressError
+            yield host
+          end
+        end
+      end
+    end
+
+    def settings
+      launcher.settings
+    end
+
+    def ipv6_enabled?
+      File.exist?('/proc/net/if_inet6') || (RUBY_PLATFORM =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
+    end
+  end
+end