satorix-rails 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4876a5e6ee331480036e881d9f29f53bafe511f3
-  data.tar.gz: 564f4cde3b91cb9f722d54c1b87eb1ca410c9139
+  metadata.gz: 76063a9ea77ea0c60f4e2ba46697056f10bb0614
+  data.tar.gz: f47562d65c50acf5d26d4be62e3713491bf0cd4f
 SHA512:
-  metadata.gz: dedd5c9ac27adeacf3c2b003f028afdddbcc6a11b0f229f9abe4b9d1d4a762452b9418fa15f113ace2b24317d9b767492843786a1b9f24b46f940bbecf17c03b
-  data.tar.gz: 4ba09535c6e545f1271dade019f2abc3985944ade2f886943744badd09a97faa2f22ab525d60a3b03d47820a300e57113d31da9e8320b0686d49fe7040758b34
+  metadata.gz: f698b2fbd9da5c59efd44c2c1eaba9348624b2c2792f5f5bcb12e5e08e8ca0f641f4a7484283d628483dd41d1700adf736af5397067926162d33092a1809a7aa
+  data.tar.gz: 3fe8f1912029819edd3d9828723db5ab517b155628cb10fbb83f22fee49b878476272deca0416816d413310c10e5e588ca1d23d43720858b54128829de1e4a0f

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_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,28 +1,41 @@
 # 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) }
+<%%-
+  # 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 |file_name, 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;
-<%% ENV['SATORIX_AUTHENTICATION_ALLOWED_IPS'].to_s.split(' ').each do |target| -%>
+  deny all;
+<%% allowed_without_auth.each do |target| -%>
   allow <%%= target %>;
 <%% end -%>
-  deny  all;
+<%% if File.file?(password_file_location('htpasswd')) -%>
   auth_basic "Please Log In";
-  auth_basic_user_file <%%= password_files['htpasswd'] %>;
+  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 <%%= ENV['SATORIX_REAL_IP_FROM'].presence? || '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/satorix/rails/version.rb

@@ -1,7 +1,7 @@
 module Satorix
   module Rails
     module Version
-      VERSION = '1.1.5'
+      VERSION = '1.1.6'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satorix-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Internet Exposure
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-11 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_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_source.erb

@@ -1,6 +0,0 @@
-<%%# 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") %>
-
-