satorix-rails 1.0.11 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5dbf0b5018c9ce918066276a1dba71c041a7a2f
-  data.tar.gz: 3d9c9065c8f8d85945f8f5a81be09c295f25d9fc
+  metadata.gz: 01a18abd3627753df2a9aaac68f8bc574cd0ccdb
+  data.tar.gz: 310355613e9144c5571635be5546eb295940d62a
 SHA512:
-  metadata.gz: 2b8e13947ba20ba173d173af8097bfcd602edce3f5ceac950627baf9489b5fabff1376f3da52811a8787438fad2b997177661427486b31dbb6e96a85ca3b4dd3
-  data.tar.gz: 50872269ddd8cc9f68f35ac4458da9c87643270d21abc68a7f466faebcaa2385495a3ffa377d480d99deaf62169dfefa9462e275df66e8a6c5fbe54f0feb6d8e
+  metadata.gz: 632a8f3486f73c152c2630078629ed251d37783e4579e4a52ba7fe66c3567d5ea8aba20ad62805ee00cdd79dba833dd2724948d264978120e133d0587ffe552e
+  data.tar.gz: 1bd6430f4d16fcd362fc61c0ed9431b39b1d3a67b25c5266261d0905666e680567d1abca0109a95cceb6f219dc018dbf00e0f8359c9fa3f30c567314e6a045f2

data/.gitignore

@@ -7,3 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+# Rubymine files
+/.idea
+/config/initializers/rubymine_passenger_debug.rb

data/.gitlab-ci.yml

@@ -21,7 +21,7 @@ rspec:
 
 
 # This is a custom job, defined at satorix/CI/deploy/ie_gem_server.rb
-deploy_to_ie_gem_server:
+deploy_to_rubygems:
   environment:
     name: $CI_COMMIT_REF_NAME
     url: 'http://gems.iexposure.com/gems/satorix-rails'

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.1
+ruby-2.4.5

data/Gemfile

@@ -1,4 +1,4 @@
-ruby File.open("#{ File.dirname(__FILE__) }/.ruby-version", &:gets).strip[/ruby-(.+)/i, 1]
+ruby "#{ File.open("#{ File.dirname(__FILE__) }/.ruby-version", &:gets).strip[/ruby-(.+)/i, 1] }"
 
 source 'https://rubygems.org'
 

data/lib/rails/generators/satorix/install_generator.rb

@@ -13,7 +13,7 @@ module Satorix
 
         template 'install/config/passenger_standalone/nginx.conf.erb', 'config/passenger_standalone/nginx.conf.erb'
 
-        template 'install/config/passenger_standalone/includes/htpasswd', 'config/passenger_standalone/includes/htpasswd'
+        template 'install/config/passenger_standalone/includes/htpasswd_source.erb', 'config/passenger_standalone/includes/htpasswd_source.erb'
         template 'install/config/passenger_standalone/includes/authentication.erb', 'config/passenger_standalone/includes/authentication.erb'
         template 'install/config/passenger_standalone/includes/page_level_redirects.erb', 'config/passenger_standalone/includes/page_level_redirects.erb'
         template 'install/config/passenger_standalone/includes/proxy_configuration.erb', 'config/passenger_standalone/includes/proxy_configuration.erb'

data/lib/rails/generators/templates/install/Procfile

@@ -1,6 +1,6 @@
 # This Procfile defines the types of process that Flynn will run.
 # For more information, please see the documentation at http://gitlab.iexposure.com/satorix/satorix
 
-web: bundle exec passenger start -p $PORT --nginx-config-template config/passenger_standalone/nginx.conf.erb --max-pool-size 3
+web: bundle exec passenger start -p $PORT --nginx-config-template config/passenger_standalone/nginx.conf.erb --log-file /dev/stdout
 # worker: rake jobs:work
 # clock: bundle exec clockwork config/clock.rb

data/lib/rails/generators/templates/install/config/passenger_standalone/includes/authentication.erb

@@ -1,14 +1,28 @@
-
 # Authentication
 #
 #   Allow listed networks to access without auth, otherwise require password
+<%%
+  password_files = {}
+
+  # Write out htpasswd file(s), from source files in config/passenger_standalone/includes
+  # to allow dynamically generated htpasswd file(s), most likely from env vars.
+  %w[htpasswd].each do |password_file|
+    passenger_standalone_includes = File.expand_path(__dir__)
+    password_files[password_file] = File.join( passenger_standalone_includes, password_file )
+    contents = include_passenger_custom_template("#{ password_file }_source.erb")
+    File.open(password_files[password_file], 'w') {|f| f.write(contents) }
+  end
+%>
 
-satisfy any;
-<%% ENV['SATORIX_AUTHENTICATION_ALLOWED_IPS'].to_s.split(' ').each do |target| %>
+location / {
+  satisfy any;
+<%% ENV['SATORIX_AUTHENTICATION_ALLOWED_IPS'].to_s.split(' ').each do |target| -%>
   allow <%%= target %>;
-<%% end %>
-deny  all;
-auth_basic           "Please Log In";
-auth_basic_user_file /app/config/passenger_standalone/includes/htpasswd;
+<%% end -%>
+  deny  all;
+  auth_basic "Please Log In";
+  auth_basic_user_file <%%= password_files['htpasswd'] %>;
+}
+
 
 # End Authentication

data/lib/rails/generators/templates/install/config/passenger_standalone/includes/htpasswd_source.erb

@@ -0,0 +1,6 @@
+<%%# This value should include hashed username/password combinations, separated by whitespace -%>
+<%%# These can be generated using the htpasswd application, or an online tool like http://www.htaccesstools.com/htpasswd-generator/ -%>
+<%%# For more info, see: https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-http-basic-authentication/ -%>
+<%%= ENV['SATORIX_AUTHENTICATION_HTPASSWDS'].to_s.split.join("\n") %>
+
+

data/lib/rails/generators/templates/install/config/passenger_standalone/includes/page_level_redirects.erb

@@ -1,15 +1,15 @@
-
 # Page-level Redirects
 #
+# Prevent Nginx from adding the internal app port to the rewrite, aka port 8080
+
+port_in_redirect off;
+
 #   Define your own custom page-level redirects below.
 #
 #   Examples:
 #     Standard single page redirects:
-#       location = /old-page-1 { return 301 $scheme://$server_name/new-page-1; }
-#       location = /old-page-2 { return 301 $scheme://$server_name/new-page-2; }
-#     Do not work:
-#       # Redirects to port 8080
-#       location = /asdf2 { return 301 /process; }
+#       location = /old-page-1 { return 301 /new-page-1; }
+#       location = /old-page-2 { return 301 /new-page-2; }
 
 
 

data/lib/rails/generators/templates/install/config/passenger_standalone/includes/proxy_configuration.erb

@@ -21,7 +21,7 @@
 <%% end %>
 
 # Use the internal Flynn network set X-Forwarded-For header for access IPs.
-set_real_ip_from 100.100.0.0/16;
+set_real_ip_from <%%= ENV['SATORIX_REAL_IP_FROM'].presence? || '100.100.0.0/16' %>;
 real_ip_header X-Forwarded-For;
 
 # End Proxy Configuration

data/lib/rails/generators/templates/install/config/passenger_standalone/nginx.conf.erb

@@ -1,6 +1,3 @@
-#  passenger start --nginx-config-template config/passenger_standalone/nginx.conf.erb --debug-nginx-config
-
-
 ##########################################################################
 #  Passenger Standalone is built on the same technology that powers
 #  Passenger for Nginx, so any configuration option supported by Passenger
@@ -8,13 +5,12 @@
 #  this by direct editing the Nginx configuration template that is used by
 #  Passenger Standalone.
 #
-#  This file is the original template. DO NOT EDIT THIS FILE DIRECTLY.
-#  Instead, make a copy of this file and pass the `--nginx-config-template`
-#  parameter to Passenger Standalone.
-#
 #  Learn more about using the Nginx configuration template at:
 #  https://www.phusionpassenger.com/library/config/standalone/intro.html#nginx-configuration-template
 #
+#  To test this configuration template run:
+#    passenger start --nginx-config-template config/passenger_standalone/nginx.conf.erb --debug-nginx-config
+#
 #  *** NOTE ***
 #  If you customize the template file, make sure you keep an eye on the
 #  original template file and merge any changes. New Phusion Passenger
@@ -22,8 +18,17 @@
 ##############################################################
 
 <%%
-  def include_passenger_custom_template(template)
-    ERB.new(File.read( File.join( File.dirname(__FILE__), 'includes', template ) )).result(binding)
+  def include_passenger_custom_template(template, indent = 0, the_binding = get_binding)
+    path = File.join(File.dirname(__FILE__), 'includes', template)
+    erb = ERB.new(File.read(path), nil, "-", next_eoutvar)
+    erb.filename = path
+    result = erb.result(the_binding)
+
+    # Set indenting
+    result.gsub!(/^/, " " * indent)
+    result.gsub!(/\A +/, '')
+
+    result
   end
 
   def use_canonical?
@@ -108,9 +113,9 @@ http {
         <%%= include_passenger_internal_template('server.erb', 8, true, binding) %>
         <%%= include_passenger_internal_template('rails_asset_pipeline.erb', 8, false) %>
 
-        <%%= include_passenger_custom_template('page_level_redirects.erb') %>
-        <%%= include_passenger_custom_template('proxy_configuration.erb') %>
-        <%%= include_passenger_custom_template('authentication.erb') %>
+        <%%= include_passenger_custom_template('page_level_redirects.erb', 8, binding) %>
+        <%%= include_passenger_custom_template('proxy_configuration.erb', 8, binding) %>
+        <%%= include_passenger_custom_template('authentication.erb', 8, binding) %>
 
         ### BEGIN your own configuration options ###
         # This is a good place to put your own config options.

data/lib/satorix/rails/version.rb

@@ -1,7 +1,7 @@
 module Satorix
   module Rails
     module Version
-      VERSION = '1.0.11'
+      VERSION = '1.1.4'
     end
   end
 end

data/satorix/CI/deploy/rubygems.rb

@@ -0,0 +1,133 @@
+module Satorix
+  module CI
+    module Deploy
+      module Rubygems
+
+
+        require 'fileutils'
+
+
+        include Satorix::Shared::Console
+
+
+        extend self
+
+
+        def go
+          log_bench('Generating rubygems.org configuration_file...') { generate_rubygems_configuration_file }
+          log_bench('Preparing gem build directory...') { prepare_gem_build_directory }
+          log_bench('Building gem...') { build_gem }
+          built_gems.each { |gem| log_bench("Publishing #{ File.basename gem }...") { publish_gem gem } }
+        end
+
+
+        private ########################################################################################################
+
+
+        def build_gem
+          run_command 'rake build'
+        end
+
+
+        def built_gems
+          Dir.glob(File.join(gem_build_directory, '*.gem')).select { |e| File.file? e }
+        end
+
+
+        def gem_build_directory
+          File.join Satorix.app_root, 'pkg'
+        end
+
+
+        def generate_rubygems_configuration_file
+          path = File.join(Dir.home, '.gem')
+          FileUtils.mkdir_p(path) unless File.exist?(path)
+
+          file = File.join(path, 'credentials')
+          File.open(file, 'w') { |f| f.write rubygems_configuration_file_contents }
+          FileUtils.chmod 0600, file
+        end
+
+
+        def prepare_gem_build_directory
+          run_command "rm -rf #{ gem_build_directory }"
+          FileUtils.mkdir_p gem_build_directory
+        end
+
+
+        def publish_gem(gem)
+          run_command "gem push #{ gem } --config-file #{ File.join(Dir.home, '.gem', 'credentials') }"
+        rescue RuntimeError
+          # To prevent the display of an ugly stacktrace.
+          abort "\nGem was not published!"
+        end
+
+
+        def rubygems_api_key
+          ENV['SATORIX_CI_RUBYGEMS_API_KEY']
+        end
+
+
+        def rubygems_configuration_file_contents
+          "---\n:rubygems_api_key: #{ rubygems_api_key }"
+        end
+
+
+        # To be used for rake release - START
+
+
+        def configure_git
+          run_command 'git config user.name Satorix'
+          run_command 'git config user.email satorix@iexposure.com'
+          run_command 'git config push.default simple'
+        end
+
+
+        def configure_ssh
+          run_command 'whoami'
+          run_command 'printenv'
+
+          path = File.join(Dir.home, '.ssh')
+          FileUtils.mkdir_p(path) unless File.exist?(path)
+
+          public_key_file = File.join(path, 'id_rsa.pub')
+          File.open(public_key_file, 'w') { |f| f.write ssh_public_key }
+          FileUtils.chmod 0600, public_key_file
+          run_command "cat #{ public_key_file }"
+
+          private_key_file = File.join(path, 'id_rsa')
+          File.open(private_key_file, 'w') { |f| f.write ssh_private_key }
+          FileUtils.chmod 0600, private_key_file
+
+          config_file = File.join(path, 'config')
+          File.open(config_file, 'w') { |f| f.write "IdentityFile #{ private_key_file }" }
+          FileUtils.chmod 0600, config_file
+          run_command "cat #{ config_file }"
+
+          system 'eval `ssh-agent -s`'
+          run_command "ssh-add #{ private_key_file }"
+        end
+
+
+        def rake_release
+          run_command 'bundle exec rake release'
+        end
+
+
+        def ssh_private_key
+          ENV['SATORIX_CI_SSH_PRIVATE_KEY']
+        end
+
+
+        def ssh_public_key
+          ENV['SATORIX_CI_SSH_PUBLIC_KEY']
+        end
+
+
+        # To be used for rake release - END
+
+
+      end
+    end
+  end
+end

data/satorix/custom.rb

@@ -2,7 +2,7 @@ module Satorix
   module Custom
 
 
-    require_relative 'CI/deploy/ie_gem_server.rb'
+    require_relative 'CI/deploy/rubygems.rb'
 
 
     extend self
@@ -11,7 +11,7 @@ module Satorix
     def available_jobs
       {
         deploy: {
-          deploy_to_ie_gem_server: Satorix::CI::Deploy::IeGemServer
+          deploy_to_rubygems: Satorix::CI::Deploy::Rubygems
         }
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satorix-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.1.4
 platform: ruby
 authors:
 - Internet Exposure
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: passenger
@@ -93,14 +93,14 @@ files:
 - lib/rails/generators/templates/install/.gitlab-ci.yml
 - lib/rails/generators/templates/install/Procfile
 - lib/rails/generators/templates/install/config/passenger_standalone/includes/authentication.erb
-- lib/rails/generators/templates/install/config/passenger_standalone/includes/htpasswd
+- lib/rails/generators/templates/install/config/passenger_standalone/includes/htpasswd_source.erb
 - lib/rails/generators/templates/install/config/passenger_standalone/includes/page_level_redirects.erb
 - lib/rails/generators/templates/install/config/passenger_standalone/includes/proxy_configuration.erb
 - lib/rails/generators/templates/install/config/passenger_standalone/nginx.conf.erb
 - lib/satorix/rails.rb
 - lib/satorix/rails/version.rb
 - satorix-rails.gemspec
-- satorix/CI/deploy/ie_gem_server.rb
+- satorix/CI/deploy/rubygems.rb
 - satorix/custom.rb
 homepage: https://www.satorix.com
 licenses: []
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Satorix in Rails

data/lib/rails/generators/templates/install/config/passenger_standalone/includes/htpasswd

@@ -1 +0,0 @@
-iestaging:$apr1$b4UNgid/$jVoc0rRDzUfmldUp9.DK8.

data/satorix/CI/deploy/ie_gem_server.rb

@@ -1,80 +0,0 @@
-module Satorix
-  module CI
-    module Deploy
-      module IeGemServer
-
-
-        require 'fileutils'
-
-
-        include Satorix::Shared::Console
-
-
-        extend self
-
-
-        def go
-          log_bench('Installing the geminabox gem...') { install_geminabox_gem }
-          log_bench('Preparing gem build directory...') { prepare_gem_build_directory }
-          log_bench('Building gem...') { build_gem }
-          built_gems.each { |gem| log_bench("Publishing #{ File.basename gem }...") { publish_gem gem } }
-        end
-
-
-        private ########################################################################################################
-
-
-        def build_gem
-          run_command 'rake build'
-        end
-
-
-        def built_gems
-          Dir.glob(File.join(gem_build_directory, '*.gem')).select { |e| File.file? e }
-        end
-
-
-        def gem_build_directory
-          File.join Satorix.app_root, 'pkg'
-        end
-
-
-        def ie_gem_server_host
-          "https://#{ ie_gem_server_user_name }:#{ ie_gem_server_password }@gems.iexposure.com"
-        end
-
-
-        def ie_gem_server_password
-          ENV['SATORIX_CI_IE_GEM_SERVER_PASSWORD']
-        end
-
-
-        def ie_gem_server_user_name
-          ENV['SATORIX_CI_IE_GEM_SERVER_USER_NAME']
-        end
-
-
-        def install_geminabox_gem
-          run_command 'gem install geminabox --source https://gems.iexposure.com --no-document'
-        end
-
-
-        def prepare_gem_build_directory
-          run_command "rm -rf #{ gem_build_directory }"
-          FileUtils.mkdir_p gem_build_directory
-        end
-
-
-        def publish_gem(gem)
-          run_command "gem inabox #{ gem } --host #{ ie_gem_server_host }",
-                      filtered_text: [ie_gem_server_user_name, ie_gem_server_password]
-        rescue RuntimeError
-          # To prevent the display of an ugly stacktrace.
-          abort "\nGem was not published!"
-        end
-
-
-      end
-    end
-  end
-end