lib/chook/server.rb in chook-1.1.0 vs lib/chook/server.rb in chook-1.1.1

@@ -23,14 +23,15 @@
 ###
 ###
 
 require 'sinatra/base'
 require 'sinatra/custom_logger'
-# require 'haml'
+require 'haml'
 require 'openssl'
 require 'chook/event_handling'
 require 'chook/server/log'
+require 'chook/server/auth'
 require 'chook/server/routes'
 
 module Chook
 
   # The chook server is a basic sinatra server running on
@@ -38,81 +39,57 @@
   class Server < Sinatra::Base
 
     DEFAULT_PORT = 80
     DEFAULT_SSL_PORT = 443
     DEFAULT_CONCURRENCY = true
+    DEFAULT_SESSION_EXPIRE = 24 * 60 * 60 # one day
 
     # set defaults in config
     Chook.config.port ||= Chook.config.use_ssl ? DEFAULT_SSL_PORT : DEFAULT_PORT
+    Chook.config.admin_session_expires ||= DEFAULT_SESSION_EXPIRE
 
     # can't use ||= here cuz nil and false have different meanings
     Chook.config.concurrency = DEFAULT_CONCURRENCY if Chook.config.concurrency.nil?
 
     # Run the server
     ###################################
     def self.run!(log_level: nil)
-      log_level ||= Chook.config.log_level
-      @log_level = Chook::Procs::STRING_TO_LOG_LEVEL.call log_level
+      prep_to_run
 
-      configure do
-        set :logger, Log.startup(@log_level)
-        set :server, :thin
-        set :bind, '0.0.0.0'
-        set :port, Chook.config.port
-        set :show_exceptions, :after_handler if development?
-        set :root, "#{File.dirname __FILE__}/server"
-        enable :static
-        enable :lock unless Chook.config.concurrency
-      end # configure
-
-      Chook::HandledEvent::Handlers.load_handlers
-
       if Chook.config.use_ssl
         super do |server|
           server.ssl = true
           server.ssl_options = {
             cert_chain_file: Chook.config.ssl_cert_path.to_s,
             private_key_file: Chook.config.ssl_private_key_path.to_s,
             verify_peer: false
           }
         end # super do
-      else
+
+      else # no ssl
         super
       end # if use ssl
     end # self.run
 
-    # Learn the client password, if we're using basic auth
-    ###################################
-    def self.webhooks_user_pw
-      return @webhooks_user_pw if @webhooks_user_pw
-      return nil unless Chook.config.webhooks_user_pw
+    def self.prep_to_run
+      log_level ||= Chook.config.log_level
+      @log_level = Chook::Procs::STRING_TO_LOG_LEVEL.call log_level
 
-      setting = Chook.config.webhooks_user_pw
+      configure do
+        set :logger, Log.startup(@log_level)
+        set :server, :thin
+        set :bind, '0.0.0.0'
+        set :port, Chook.config.port
+        set :show_exceptions, :after_handler if development?
+        set :root, "#{File.dirname __FILE__}/server"
+        enable :static
+        enable :sessions
+        set :sessions, expire_after: Chook.config.admin_session_expires if Chook.config.admin_user
+        enable :lock unless Chook.config.concurrency
+      end # configure
 
-      @webhooks_user_pw =
-        if setting.end_with? '|'
-          # if the path ends with a pipe, its a command that will
-          # return the desired password, so remove the pipe,
-          # execute it, and return stdout from it.
-          cmd = setting.chomp '|'
-          output = `#{cmd} 2>&1`.chomp
-          raise "Can't get webhooks user password: #{output}" unless $CHILD_STATUS.exitstatus.zero?
-          output
-
-        else
-          # otherwise its a file path, and read the pw from the contents
-          file = Pathname.new setting
-          return nil unless file.file?
-          stat = file.stat
-          mode = format('%o', stat.mode)
-          raise 'Password file for webhooks user has insecure mode, must be 0600.' unless mode.end_with?('0600')
-          raise "Password file for webhooks user has insecure owner, must be owned by UID #{Process.euid}." unless stat.owned?
-
-          # chomping an empty string removes all trailing \n's and \r\n's
-          file.read.chomp('')
-
-        end # if else
-    end # self.webhooks_user_pw
+      Chook::HandledEvent::Handlers.load_handlers
+    end # prep to run
 
   end # class server
 
 end # module