satorix-rails 1.1.2 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea69f318d33aa1f658b2189bfe2027a407657d67
-  data.tar.gz: 931a8ed3d24b835e268c740ae3aaf9aaa2eb6403
+  metadata.gz: ee5e2a9bca28a5625d0d6c611c585d1d6b32b02a
+  data.tar.gz: 678aed79747a3c59bcdca0a9f2cf435feaa5823a
 SHA512:
-  metadata.gz: 32e46008825d1d80ad6d2e0e8f3623d4a6536902047067674b53943e5c27f7f10528989f5fb93e0932bf32a07d06ee44df6159168b4326484007239216c4a4f0
-  data.tar.gz: 8ef2a83b2998fcacefe60d9a0712349ceab7f7c401b268ff703944937203ed19f738528a55196e560515faf3098aefe033f3c9240cbadde2d1b748d4aa0a12e9
+  metadata.gz: 83da29607fba4219c0377040617fe74a45b4d8c473ced5ad3d07e9e5454c6929b8a23a8fb2339a66ea5a2fa391642123d13d007d83ab7790f640034826ad51eb
+  data.tar.gz: 9ef8a25c787bf82dfa15f7ac41d338209c54cd084c33921797e15f5449f633e40e64a585f3ff066d257f0eba8cee79be51d34b0bc9ca73431d060b220ee0dc36

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,6 @@ 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/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/config/passenger_standalone/includes/authentication.erb

@@ -1,14 +1,41 @@
-
 # Authentication
-#
-#   Allow listed networks to access without auth, otherwise require password
 
-satisfy any;
-<%% ENV['SATORIX_AUTHENTICATION_ALLOWED_IPS'].to_s.split(' ').each do |target| %>
+<%%-
+  # The password_files hash defines which password files will be written out.
+  # The generated password files should be ignored from version control.
+  # Each desired password file should be specified as a key, with the value being a source for the file contents.
+  # The contents 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/
+  password_files = {
+    'htpasswd' => ENV['SATORIX_AUTHENTICATION_HTPASSWDS']
+  }
+
+  def password_file_location(filename)
+    passenger_standalone_includes_location = File.expand_path(__dir__)
+    File.join( passenger_standalone_includes_location, filename )
+  end
+
+  password_files.each do |filename, raw_contents|
+    contents = raw_contents.to_s.split.join("\n")
+    File.open(password_file_location(filename), 'w') {|f| f.write(contents) } unless contents.empty?
+  end
+
+  allowed_without_auth = ENV['SATORIX_AUTHENTICATION_ALLOWED_IPS'].to_s.split
+  allowed_without_auth = ['any'] if allowed_without_auth.empty?
+-%>
+
+# Allow listed networks to access without auth, otherwise require password if defined
+location / {
+  satisfy any;
+  deny all;
+<%% allowed_without_auth.each do |target| -%>
   allow <%%= target %>;
-<%% end %>
-deny  all;
-auth_basic           "Please Log In";
-auth_basic_user_file /app/config/passenger_standalone/includes/htpasswd;
+<%% end -%>
+<%% if File.file?(password_file_location('htpasswd')) -%>
+  auth_basic "Please Log In";
+  auth_basic_user_file <%%= password_file_location('htpasswd') %>;
+<%% end -%>
+}
 
 # End Authentication

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'] || '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.2'
+      VERSION = '1.1.7'
     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.7
 platform: ruby
 authors:
 - Internet Exposure
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: passenger
@@ -93,7 +93,6 @@ 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/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.