satorix-rails 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea69f318d33aa1f658b2189bfe2027a407657d67
-  data.tar.gz: 931a8ed3d24b835e268c740ae3aaf9aaa2eb6403
+  metadata.gz: 0d4ef84ca0df1a11113cc1263bbf189175407c5d
+  data.tar.gz: 6a34c381ffa8b434a6f353739d9051e902caf1ad
 SHA512:
-  metadata.gz: 32e46008825d1d80ad6d2e0e8f3623d4a6536902047067674b53943e5c27f7f10528989f5fb93e0932bf32a07d06ee44df6159168b4326484007239216c4a4f0
-  data.tar.gz: 8ef2a83b2998fcacefe60d9a0712349ceab7f7c401b268ff703944937203ed19f738528a55196e560515faf3098aefe033f3c9240cbadde2d1b748d4aa0a12e9
+  metadata.gz: 2aa290ad8cd46ee7696287c1daf79e987c66ea8aff2d2ed6ebcb055585f1edbca268624251d11689b87b7e70308e11b095dc92819f56c70e8fafd2103ba0b663
+  data.tar.gz: a4b6cd6a753369c3e176eee0ba3b120349970ba1cde599dbc66bb7c14d2cb2a15559c0048dc93f14f0e12a652c427564afec44ea4325afb437c45c2ff967310a

data/.gitignore

@@ -7,3 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+# Rubymine files
+/.idea
+/config/initializers/rubymine_passenger_debug.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/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/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.2'
+      VERSION = '1.1.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satorix-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Internet Exposure
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-24 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.