satorix-rails 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d1f056ae46c1a30b11c11a567472d7b254cef1f
-  data.tar.gz: 2ac2d811653c9bbccde23798c2a95e5b168fe178
+  metadata.gz: 4876a5e6ee331480036e881d9f29f53bafe511f3
+  data.tar.gz: 564f4cde3b91cb9f722d54c1b87eb1ca410c9139
 SHA512:
-  metadata.gz: 0fb99f81039e25fcc45cec5a6a3eea40f81c627572f4d0530fdda5005616a04b0ae62fa086b03173d6b1b8bb5fad797fc656a218d5b5d04006ae51fca026b09d
-  data.tar.gz: 86f4beb0bb36105bc144778137776dddd93c74f97bd5d3cf59d39b23cdbfd8597cfb4b92e8505f83604da7d52d23d393257258027035698cb4477a60df80a437
+  metadata.gz: dedd5c9ac27adeacf3c2b003f028afdddbcc6a11b0f229f9abe4b9d1d4a762452b9418fa15f113ace2b24317d9b767492843786a1b9f24b46f940bbecf17c03b
+  data.tar.gz: 4ba09535c6e545f1271dade019f2abc3985944ade2f886943744badd09a97faa2f22ab525d60a3b03d47820a300e57113d31da9e8320b0686d49fe7040758b34

data/.gitignore

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

data/.gitlab-ci.yml

@@ -14,10 +14,10 @@ cache:
     - 'tmp/satorix/cache' # To cache buildpack gems between runs.
 
 
-#rspec:
-#  before_script:
-#    - sed -i -e 's/add_development_dependency/add_dependency/g' satorix-rails.gemspec # To avoid an application dependency, but still be available for CI
-#  <<: *satorix
+rspec:
+  before_script:
+    - sed -i -e 's/add_development_dependency/add_dependency/g' satorix-rails.gemspec # To avoid an application dependency, but still be available for CI
+  <<: *satorix
 
 
 # This is a custom job, defined at satorix/CI/deploy/ie_gem_server.rb

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/custom_ci_job/satorix/CI/test/bare_bones.rb

@@ -12,7 +12,7 @@ module Satorix
         # You can add your own logic to do whatever you want.
         def go
           # Uncomment the line below if you want to execute in the context of the app's buildpack.
-          # Satorix::CI::Test::Shared::Buildpack.go
+          # Satorix::CI::Test::Shared::BuildpackManager.go
           puts "\n\nRunning BareBones#go..."
         end
 

data/lib/rails/generators/templates/custom_ci_job/satorix/CI/test/info.rb

@@ -13,7 +13,7 @@ module Satorix
         # You can add your own logic to do whatever you want.
         def go
           # Uncomment the line below if you want to execute in the context of the app's buildpack.
-          # Satorix::CI::Test::Shared::Buildpack.go
+          # Satorix::CI::Test::Shared::BuildpackManager.go
 
           log_bench('Describing logging...') do
             describe_log

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.1.0'
+      VERSION = '1.1.5'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satorix-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - Internet Exposure
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: passenger
@@ -93,7 +93,7 @@ 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

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

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