Fixed rails integration tests and missing random logs

Author: ndbroadbent

Taskfile.rails.yml

@@ -9,7 +9,11 @@ tasks:
     desc: Run Rails integration tests (override with RAILS_VERSION=...)
     cmds:
       - cmd: RAILS_VERSION={{.RAILS_VERSION}} ./scripts/rails_tests.sh
-        dir: .
+
+  test:force:
+    desc: Run Rails integration tests with force recreation of test app (override with RAILS_VERSION=...)
+    cmds:
+      - cmd: RAILS_VERSION={{.RAILS_VERSION}} FORCE_RECREATE=true ./scripts/rails_tests.sh
 
   test:matrix:
     desc: Run Rails integration tests for supported versions (7.1.5 and 8.0.1)

docs/lib/log-generation/sample-data.ts

@@ -198,6 +198,8 @@ export const SampleByLogField: Readonly<Record<LogField, (gen: RandomGen) => unk
   [LogField.View]: (gen: RandomGen) => gen.randomFloat(0, 200),
   [LogField.Params]: (_gen: RandomGen) => ({}),
   [LogField.BlockedHosts]: (_gen: RandomGen) => ['malicious.example.com'],
+  [LogField.AllowedHosts]: (_gen: RandomGen) => ['example.com', 'trusted.com'],
+  [LogField.AllowIpHosts]: (_gen: RandomGen) => false,
   [LogField.ClientIp]: SampleHelpers.ip,
   [LogField.XForwardedFor]: (_gen: RandomGen) => '203.0.113.1, 70.41.3.18',
   [LogField.To]: SampleHelpers.emailArray,

rails_test_app/create_app.rb

@@ -331,14 +331,23 @@ def copy_template(file, target_path = nil)
   content = File.read(test_env_path)
   # Remove previous blanket clearing if present
   content.gsub!(/^\s*config\.hosts\.clear\s*\n/, "")
+  # Remove old appending style if present
+  content.gsub!(/^\s*# Allow test hostnames for integration tests\s*\n/, "")
+  content.gsub!(/^\s*config\.hosts << "www\.example\.com"\s*\n/, "")
+  content.gsub!(/^\s*config\.hosts << "127\.0\.0\.1"\s*\n/, "")
+  content.gsub!(/^\s*config\.hosts << "localhost"\s*\n/, "")
+  content.gsub!(/^\s*config\.hosts << \/\.\*\\z\/\s*\n/, "")
+
   insert = <<~RUBY
-    # Allow test hostnames for integration tests
-    config.hosts << "www.example.com"
-    config.hosts << "127.0.0.1"
-    config.hosts << "localhost"
-    config.hosts << /.*\z/
+    # Host authorization for tests - allow .localhost subdomains, IPs, and www.example.com
+    config.hosts = [
+      ".localhost",
+      "www.example.com",
+      IPAddr.new("0.0.0.0/0"), # IPv4
+      IPAddr.new("::/0"),      # IPv6
+    ]
   RUBY
-  unless content.include?("config.hosts << \"www.example.com\"")
+  unless content.include?("config.hosts = [")
     content.sub!("Rails.application.configure do", "Rails.application.configure do\n#{insert}")
   end
   File.write(test_env_path, content)