smart_proxy_dynflow_core 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe1b9027d6be956e15fb935a09a4c605af906509
-  data.tar.gz: 541d1bded54dc876f331dabcf44e89ae35996e15
+  metadata.gz: ae526e7d72f4b4ee46d8bcfa40e64f6790491ff1
+  data.tar.gz: 5ed7ee98098fd949f9619465cc7362fbce43b157
 SHA512:
-  metadata.gz: 2f51f45104e278ce3c23f566018cd80bfb972cb6c62c58606d5c8926c7f738381e11f170b888339b582ad0274c6551de5e643bb749d29cd3b86c90940ef7f9cc
-  data.tar.gz: c860021c0d3a466a5dd630edfeedb1b1ed3e17844f591ad471426ee703e473a0adf2b93aaea0199f23e976f01fe5325fb83ddfb48607e8ab20eb67158169578e
+  metadata.gz: 1eeaf64c14cdba89b6a787082c603aca475e941935e8307b695ab4bef84bcb258907453cb368a6d5992565217921c8bed405968191bc773cd50f99ee0bde603c
+  data.tar.gz: b1aa187080d29a83a79a014afe9434b3876bdc31e55c9e50f1227eb0f429d66075f4387d9746808a5d18e4bc6eb5e9649a8bc8defbb6258df9fac6e799a32183

data/config/settings.yml.example

@@ -28,6 +28,12 @@
 # :ssl_private_key: ssl/localhost.pem
 # :ssl_certificate: ssl/certs/localhost.pem
 
+# Use this option only if you need to disable certain cipher suites.
+# Note: we use the OpenSSL suite name, take a look at:
+# https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-SUITE-NAMES
+# for more information.
+#:ssl_disabled_ciphers: [CIPHER-SUITE-1, CIPHER-SUITE-2]
+
 # File to log to, leave empty for logging to STDOUT
 # :log_file: /var/log/foreman-proxy/smart_proxy_dynflow_core.log
 

data/deploy/smart_proxy_dynflow_core.init

@@ -15,6 +15,7 @@ SMART_PROXY_DYNFLOW_CORE_USER=${SMART_PROXY_DYNFLOW_CORE_USER:-foreman-proxy}
 
 start() {
     echo -n $"Starting $prog: "
+    ulimit -n 65536
     daemon --user ${SMART_PROXY_DYNFLOW_CORE_USER} /usr/bin/smart_proxy_dynflow_core -d -p $SMART_PROXY_DYNFLOW_CORE_PID > /dev/null
     RETVAL=$?
     if [ $RETVAL = 0 ]

data/deploy/smart_proxy_dynflow_core.service

@@ -8,6 +8,7 @@ Type=forking
 User=foreman-proxy
 PIDFile=/var/run/foreman-proxy/smart_proxy_dynflow_core.pid
 ExecStart=/usr/bin/smart_proxy_dynflow_core -d -p /var/run/foreman-proxy/smart_proxy_dynflow_core.pid
+LimitNOFILE=65536
 
 [Install]
 WantedBy=multi-user.target

data/lib/smart_proxy_dynflow_core/launcher.rb

@@ -1,6 +1,7 @@
 require 'webrick/https'
 require 'smart_proxy_dynflow_core/bundler_helper'
 require 'smart_proxy_dynflow_core/settings'
+require 'smart_proxy_dynflow_core/webrick-patch'
 module SmartProxyDynflowCore
   class Launcher
 
@@ -11,6 +12,7 @@ module SmartProxyDynflowCore
     def start(options)
       load_settings!(options)
       Settings.instance.standalone = true
+      install_usr1_trap
       Rack::Server.new(rack_settings).start
     end
 
@@ -42,6 +44,12 @@ module SmartProxyDynflowCore
       end
     end
 
+    def install_usr1_trap
+      trap(:USR1) do
+        Log.instance.roll_log
+      end
+    end
+
     private
 
     def rack_settings
@@ -66,10 +74,11 @@ module SmartProxyDynflowCore
         :app => app,
         :Host => Settings.instance.listen,
         :Port => Settings.instance.port,
-        :AccessLog => [[Log.log_file, WEBrick::AccessLog::COMMON_LOG_FORMAT]],
+        :AccessLog => [[Log.instance, WEBrick::AccessLog::COMMON_LOG_FORMAT]],
         :Logger => Log.instance,
         :daemonize => Settings.instance.daemonize,
-        :pid => Settings.instance.pid_file
+        :pid => Settings.instance.pid_file,
+        :server => :webrick
       }
     end
 

data/lib/smart_proxy_dynflow_core/log.rb

@@ -8,7 +8,7 @@ module SmartProxyDynflowCore
     class << self
       def instance
         if @logger.nil?
-          @logger = Logger.new log_file
+          @logger = self.new log_file
           @logger.level = log_level
         end
         @logger
@@ -40,6 +40,30 @@ module SmartProxyDynflowCore
       end
     end
 
+    def initialize(file, *rest)
+      @file = file
+      @fd = @file.kind_of?(IO) ? @file : File.open(@file, 'a')
+      @fd.sync = true
+      super(@fd, rest)
+    end
+
+    def add(*args)
+      handle_log_rolling if @roll_log
+      super(*args)
+    end
+
+    def roll_log
+      @roll_log = true
+    end
+
+    def handle_log_rolling
+      @roll_log = false
+      unless @file.kind_of? IO
+        @fd.reopen @file, 'a'
+        @fd.sync = true
+      end
+    end
+
     class ProxyAdapter < ::Dynflow::LoggerAdapters::Simple
       def initialize(logger, level = Logger::DEBUG, formatters = [::Dynflow::LoggerAdapters::Formatters::Exception])
         @logger           = logger

data/lib/smart_proxy_dynflow_core/settings.rb

@@ -30,6 +30,7 @@ module SmartProxyDynflowCore
         :ssl_ca_file => nil,
         :ssl_private_key => nil,
         :ssl_certificate => nil,
+        :ssl_disabled_ciphers => [],
         :foreman_ssl_ca => nil,
         :foreman_ssl_key => nil,
         :foreman_ssl_cert => nil,
@@ -44,7 +45,7 @@ module SmartProxyDynflowCore
 
     PROXY_SETTINGS = [:ssl_ca_file, :ssl_certificate, :ssl_private_key, :foreman_url,
                       :foreman_ssl_ca, :foreman_ssl_cert, :foreman_ssl_key,
-                      :log_file, :log_level]
+                      :log_file, :log_level, :ssl_disabled_ciphers]
     PLUGIN_SETTINGS = [:database, :core_url, :console_auth]
 
     def initialize(settings = {})

data/lib/smart_proxy_dynflow_core/version.rb

@@ -1,3 +1,3 @@
 module SmartProxyDynflowCore
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/smart_proxy_dynflow_core/webrick-patch.rb

@@ -0,0 +1,37 @@
+require 'webrick/https'
+
+CIPHERS = ['ECDHE-RSA-AES128-GCM-SHA256','ECDHE-RSA-AES256-GCM-SHA384',
+           'ECDHE-RSA-AES128-CBC-SHA','ECDHE-RSA-AES256-CBC-SHA',
+           'AES128-GCM-SHA256','AES256-GCM-SHA384','AES128-SHA256',
+           'AES256-SHA256','AES128-SHA','AES256-SHA']
+
+module WEBrick
+  class GenericServer
+    def setup_ssl_context(config) # :nodoc:
+      unless config[:SSLCertificate]
+        cn = config[:SSLCertName]
+        comment = config[:SSLCertComment]
+        cert, key = Utils::create_self_signed_cert(1024, cn, comment)
+        config[:SSLCertificate] = cert
+        config[:SSLPrivateKey] = key
+      end
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.set_params
+      ctx.ciphers = (CIPHERS - SmartProxyDynflowCore::Settings.instance.ssl_disabled_ciphers).join(':')
+      ctx.key = config[:SSLPrivateKey]
+      ctx.cert = config[:SSLCertificate]
+      ctx.client_ca = config[:SSLClientCA]
+      ctx.extra_chain_cert = config[:SSLExtraChainCert]
+      ctx.ca_file = config[:SSLCACertificateFile]
+      ctx.ca_path = config[:SSLCACertificatePath]
+      ctx.cert_store = config[:SSLCertificateStore]
+      ctx.tmp_dh_callback = config[:SSLTmpDhCallback]
+      ctx.verify_mode = config[:SSLVerifyClient]
+      ctx.verify_depth = config[:SSLVerifyDepth]
+      ctx.verify_callback = config[:SSLVerifyCallback]
+      ctx.timeout = config[:SSLTimeout]
+      ctx.options |= config[:SSLOptions] unless config[:SSLOptions].nil?
+      ctx
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow_core
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,8 +206,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      Use the Dynflow inside Foreman smart proxy
+description: "    Use the Dynflow inside Foreman smart proxy\n"
 email:
 - inecas@redhat.com
 executables:
@@ -232,6 +231,7 @@ files:
 - lib/smart_proxy_dynflow_core/settings.rb
 - lib/smart_proxy_dynflow_core/testing.rb
 - lib/smart_proxy_dynflow_core/version.rb
+- lib/smart_proxy_dynflow_core/webrick-patch.rb
 - smart_proxy_dynflow_core.gemspec
 homepage: https://github.com/theforeman/smart_proxy_dynflow
 licenses:
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy